Merge remote-tracking branch 'baidu/master'

baidu · Dec 4, 2024 · bd41fff · bd41fff
2 parents e13a22a + 690a124
commit bd41fff
Show file tree

Hide file tree

Showing 32 changed files with 489 additions and 298 deletions.
diff --git a/docs/zh-CN/components/form/picker.md b/docs/zh-CN/components/form/picker.md
@@ -1211,6 +1211,7 @@ order: 35
 | pickerSchema   | `string`                                                                                     | `{mode: 'list', listItem: {title: '${label}'}}` | 即用 List 类型的渲染，来展示列表信息。更多配置参考 [CRUD](../crud)                          |
 | embed          | `boolean`                                                                                    | `false`                                         | 是否使用内嵌模式                                                                            |
 | overflowConfig | `OverflowConfig`                                                                             | 参考[OverflowConfig](./#overflowconfig)         | 开启最大标签展示数量的相关配置 `3.4.0`                                                      |
+| removable  | `removable`                                                                              | `true`                                          | 用于控制是否显示选中项的删除图标，默认值为 `true`                                           | `6.10.0` |
 
 ### OverflowConfig
 

diff --git a/packages/amis-core/src/renderers/Form.tsx b/packages/amis-core/src/renderers/Form.tsx
@@ -1814,22 +1814,33 @@ export default class Form extends React.Component<FormProps, object> {
 
       return (
         <div className={cx('Form-row')}>
-          {children.map((control, key) =>
-            ~['hidden', 'formula'].indexOf((control as any).type) ||
-            (control as any).mode === 'inline' ? (
+          {children.map((control, key) => {
+            const split = control.colSize?.split('/');
+            const colSize =
+              split?.[0] && split?.[1]
+                ? (split[0] / split[1]) * 100 + '%'
+                : control.colSize;
+            return ~['hidden', 'formula'].indexOf((control as any).type) ||
+              (control as any).mode === 'inline' ? (
               this.renderChild(control, key, otherProps)
             ) : (
               <div
                 key={key}
                 className={cx(`Form-col`, (control as Schema).columnClassName)}
+                style={{
+                  flex:
+                    colSize && !['1', 'auto'].includes(colSize)
+                      ? `0 0 ${colSize}`
+                      : '1'
+                }}
               >
                 {this.renderChild(control, '', {
                   ...otherProps,
                   mode: 'row'
                 })}
               </div>
-            )
-          )}
+            );
+          })}
         </div>
       );
     }

diff --git a/packages/amis-core/src/utils/debug.tsx b/packages/amis-core/src/utils/debug.tsx
@@ -181,7 +181,7 @@ const AMISDebug = observer(({store}: {store: AMISDebugStore}) => {
     }
   }
 
-  const panelRef = useRef(null);
+  const panelRef = useRef<HTMLDivElement>(null);
 
   const [isResizing, setResizing] = useState(false);
 
@@ -220,6 +220,19 @@ const AMISDebug = observer(({store}: {store: AMISDebugStore}) => {
     };
   }, [isResizing]);
 
+  // 避免触发 modal 的 closeOnOutside 逻辑
+  useEffect(() => {
+    const handlePanelMouseUp = (e: Event) => {
+      e.preventDefault();
+    };
+
+    panelRef.current!.addEventListener('mouseup', handlePanelMouseUp);
+
+    return () => {
+      panelRef.current!.removeEventListener('mouseup', handlePanelMouseUp);
+    };
+  }, []);
+
   const handleInputKeyUp = React.useCallback((e: React.KeyboardEvent<any>) => {
     if (e.key === 'Enter') {
       const input = e.target as HTMLInputElement;
@@ -290,7 +303,7 @@ const AMISDebug = observer(({store}: {store: AMISDebugStore}) => {
                 store.tab = 'log';
               }}
             >
-              Log
+              Log({store.logs.length})
             </button>
             <button
               className={cx({active: store.tab === 'inspect'})}
@@ -609,6 +622,10 @@ export function debug(cat: Category, msg: string, ext?: any) {
     ext: ext
   };
   store.logs.push(log);
+  // 不要超过 200 条，担心性能问题
+  if (store.logs.length > 200) {
+    store.logs.splice(0, store.logs.length - 200);
+  }
 }
 
 /**

diff --git a/packages/amis-core/src/utils/labelToString.ts b/packages/amis-core/src/utils/labelToString.ts
@@ -2,6 +2,10 @@ import isPlainObject from 'lodash/isPlainObject';
 
 export function labelToString(label: any): string {
   const type = typeof label;
+  if (type === 'undefined' || label === null) {
+    // render placeholder
+    return '-';
+  }
   if (type === 'string') {
     return label;
   } else if (type === 'number') {

diff --git a/packages/amis-editor-core/src/component/Editor.tsx b/packages/amis-editor-core/src/component/Editor.tsx
@@ -206,6 +206,10 @@ export default class Editor extends Component<EditorProps> {
 
     this.manager = new EditorManager(config, this.store, hostManager);
 
+    this.store.setGlobalEvents(
+      config.actionOptions?.globalEventGetter?.(this.manager) || []
+    );
+
     // 子编辑器不再重新设置 editorStore
     if (!(props.isSubEditor && (window as any).editorStore)) {
       (window as any).editorStore = this.store;
@@ -274,6 +278,14 @@ export default class Editor extends Component<EditorProps> {
     if (props?.amisEnv?.replaceText !== prevProps?.amisEnv?.replaceText) {
       this.store.setAppCorpusData(props?.amisEnv?.replaceText);
     }
+    if (
+      props.actionOptions?.globalEventGetter?.(this.manager) !==
+      prevProps.actionOptions?.globalEventGetter?.(this.manager)
+    ) {
+      this.store.setGlobalEvents(
+        props.actionOptions?.globalEventGetter?.(this.manager) || []
+      );
+    }
   }
 
   componentWillUnmount() {

diff --git a/packages/amis-editor-core/src/component/base/SchemaForm.tsx b/packages/amis-editor-core/src/component/base/SchemaForm.tsx
@@ -4,6 +4,7 @@ import {EditorManager} from '../../manager';
 import {diff, getThemeConfig} from '../../util';
 import {
   createObjectFromChain,
+  createObject,
   extractObjectChain,
   IFormStore,
   render,

diff --git a/packages/amis-editor-core/src/store/editor.ts b/packages/amis-editor-core/src/store/editor.ts
@@ -37,7 +37,8 @@ import {
   ScaffoldForm,
   PopOverForm,
   DeleteEventContext,
-  BaseEventContext
+  BaseEventContext,
+  IGlobalEvent
 } from '../plugin';
 import {
   JSONDuplicate,
@@ -265,7 +266,9 @@ export const MainStore = types
     /** 应用语料 */
     appCorpusData: types.optional(types.frozen(), {}),
     /** 应用多语言状态，用于其它组件进行订阅 */
-    appLocaleState: types.optional(types.number, 0)
+    appLocaleState: types.optional(types.number, 0),
+    /** 全局广播事件 */
+    globalEvents: types.optional(types.frozen<Array<IGlobalEvent>>(), [])
   })
   .views(self => {
     return {
@@ -2348,6 +2351,10 @@ export const MainStore = types
         this.updateAppLocaleState();
       },
 
+      setGlobalEvents(events: IGlobalEvent[]) {
+        self.globalEvents = events;
+      },
+
       beforeDestroy() {
         lazyUpdateTargetName.cancel();
       }

diff --git a/packages/amis-editor/src/plugin/Form/Checkbox.tsx b/packages/amis-editor/src/plugin/Form/Checkbox.tsx
@@ -231,7 +231,6 @@ export class CheckboxControlPlugin extends BasePlugin {
         body: [
           getSchemaTpl('collapseGroup', [
             getSchemaTpl('theme:formItem', {
-              hidSize: true,
               schema: [
                 {
                   type: 'select',

diff --git a/packages/amis-editor/src/plugin/Form/Checkboxes.tsx b/packages/amis-editor/src/plugin/Form/Checkboxes.tsx
@@ -238,7 +238,6 @@ export class CheckboxesControlPlugin extends BasePlugin {
         body: [
           getSchemaTpl('collapseGroup', [
             getSchemaTpl('theme:formItem', {
-              hidSize: true,
               schema: [
                 getSchemaTpl('switch', {
                   label: '一行选项显示',