amis-editor 6.10.0 → 6.11.0-beta.0

package/esm/renderer/DataPickerControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/DateShortCutControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/ExpressionFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/FeatureControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/FieldSetting.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/FlexSettingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/FormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/FunctionEditorControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/GoConfigControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/InputRangeValueControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/KeyValueMapControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/ListItemControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/MapSourceControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/NavBadgeControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/NavDefaultActive.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/NavSourceControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/OptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/RangePartsControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/StatusControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/SwitchMoreControl.d.ts

@@ -19,10 +19,16 @@ export interface SwitchMoreProps extends FormControlProps {
     overlay?: boolean;
     container?: HTMLElement | (() => HTMLElement);
     target?: React.ReactNode | Function;
-    trueValue?: any;
-    falseValue?: any;
     removable?: boolean;
     hiddenOnDefault?: boolean;
+    /**
+     *
+     * bulk是指extend的内容是和name为平级还是子级，会产生几种情况：
+     * 1. 有name 且bulk为false时，代表这个属性不是一个boolean值，而是一个object，有值=开启，无值=关闭  {kaiguan: {extend: xxx}}
+     * 2. 有name 且bulk为true时，代表这个属性本身是开关，但还有其他同级别相关属性放在扩展中，因此需要bulk更新方式进行批量更新 {kaiguan: true, extend: xxx}
+     * 3. 没有name 且bulk为true时，代表没有属性对应这个开关，开关只是为了表达配置交互层面的收纳含义 {extend: xxx}
+     * 注意：不会出现没有name 且bulk为false的情况
+     */
     bulk?: boolean;
     onRemove?: (e: React.UIEvent<any> | void) => void;
     onClose: (e: React.UIEvent<any> | void) => void;
@@ -34,6 +40,8 @@ export interface SwitchMoreProps extends FormControlProps {
         name?: string;
         bulk?: boolean;
     }) => boolean;
+    trueValue?: any;
+    falseValue?: any;
 }
 interface SwitchMoreState {
     /**
@@ -44,6 +52,10 @@ interface SwitchMoreState {
      * 是否开启编辑
      */
     checked: boolean;
+    /**
+     * 子表单的数据key
+     */
+    childFormNames: string[];
 }
 export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchMoreState> {
     static defaultProps: Pick<SwitchMoreProps, 'container' | 'autoFocus' | 'overlay' | 'rootClose' | 'trueValue' | 'falseValue' | 'formType' | 'bulk' | 'clearChildValuesOnOff'>;
@@ -53,6 +65,7 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
     initState(): {
         checked: boolean;
         show: boolean;
+        childFormNames: any[];
     };
     getFormItemNames(): any[];
     overlayRef(ref: any): void;
@@ -61,6 +74,21 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
     closePopover(): void;
     handleDelete(e: React.UIEvent<any> | void): void;
     handleSwitchChange(checked: boolean): void;
+    /**
+     * 返回子表单的数据，如果是同级，直接返回当前数据域，否则返回当前数据作为子表单
+     */
+    getExtendValues(): any;
+    /**
+     * 打开后，首先遵循默认值设置，之后遵循选中值设置
+     * 当都不设置时，要看是否是object类型，是object类型，需要是空对象
+     *
+     * 关闭后，先遵循关闭值设置，否则一切回归原始删除属性状态
+     */
+    getInitTureValue(): any;
+    /**
+     * 弹窗配置的提交
+     * @param values
+     */
     handleSubmit(values: any): void;
     handleAction(e: React.UIEvent<any> | void, action: Action, data: object, throwErrors?: boolean, delegate?: IScopedContext): void;
     renderActions(): any[] | null;
@@ -87,6 +115,7 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
             formLazyChange: boolean;
             preventEnterSubmit: boolean;
             submitOnChange: boolean;
+            canAccessSuperData: boolean | undefined;
             data: any;
             title: any;
         };
@@ -106,6 +135,7 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         formLazyChange: boolean;
         preventEnterSubmit: boolean;
         submitOnChange: boolean;
+        canAccessSuperData: boolean | undefined;
         data: any;
     };
     renderMoreSection(): React.JSX.Element | null;

package/esm/renderer/SwitchMoreControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 
@@ -30,14 +30,14 @@ var SwitchMore = /** @class */function (_super) {
     var _a = this.props,
       data = _a.data,
       value = _a.value,
-      trueValue = _a.trueValue;
-      _a.falseValue;
-      var name = _a.name,
-      bulk = _a.bulk;
-      _a.hiddenOnDefault;
-      var isChecked = _a.isChecked;
+      trueValue = _a.trueValue,
+      name = _a.name,
+      bulk = _a.bulk,
+      hiddenOnDefault = _a.hiddenOnDefault,
+      isChecked = _a.isChecked;
     var checked = false;
-    var show = false;
+    var formNames = this.getFormItemNames();
+    // 优先用传入的是否选中函数来判断
     if (isChecked && typeof isChecked === 'function') {
       checked = isChecked({
         data: data,
@@ -45,29 +45,29 @@ var SwitchMore = /** @class */function (_super) {
         name: name,
         bulk: bulk
       });
-      show = checked;
     }
-    // 这个开关 无具体属性对应
-    else if (!name) {
-      // 子表单项是组件根属性，遍历看是否有值
-      if (bulk) {
-        var formNames = this.getFormItemNames();
-        checked = some(formNames, function (key) {
-          return data[key] !== undefined;
-        });
-        show = checked;
-      } else {
-        checked = value === trueValue;
-      }
-    } else {
-      checked = !!value === trueValue;
+    // 其次使用trueValue，主要是类似于属性值是disableXX之类的反义但配置要改为可用XX等正向含义时，这里会trueValue为false
+    else if (trueValue != null) {
+      checked = value === trueValue;
+    }
+    // 有属性名，自己本身对应开关
+    else if (name) {
+      checked = data[name] != null && data[name] !== false;
+    }
+    // 这个开关 无具体属性对应, 子表单项任意一个开启表示开
+    else {
+      checked = some(formNames, function (key) {
+        return data[key] !== undefined;
+      });
     }
     // 开关有属性对应
     return {
       checked: checked,
-      show: show
+      show: hiddenOnDefault === true ? false : checked,
+      childFormNames: formNames
     };
   };
+  // 获取子表单项的内容
   SwitchMore.prototype.getFormItemNames = function () {
     var form = this.props.form;
     var formNames = form && Array.isArray(form === null || form === void 0 ? void 0 : form.body) ? form.body.map(function (item) {
@@ -104,34 +104,76 @@ var SwitchMore = /** @class */function (_super) {
       onBulkChange = _a.onBulkChange,
       onChange = _a.onChange,
       bulk = _a.bulk,
-      defaultData = _a.defaultData,
       name = _a.name,
+      defaultData = _a.defaultData,
       trueValue = _a.trueValue,
       falseValue = _a.falseValue,
       clearChildValuesOnOff = _a.clearChildValuesOnOff;
-    this.setState({
-      checked: checked
-    });
-    // 子表单项是组件根属性，用bulk处理所有属性
+    if (name) {
+      var newValue = checked ? this.getInitTureValue() : falseValue !== null && falseValue !== void 0 ? falseValue : undefined;
+      onChange(newValue);
+    }
+    // 子表单项是同级别的需要单独更新一下
     if (bulk) {
-      // 选中后，给一个默认 {} 或 配置的默认值
+      // 选中情况下，值需要进行更新
       if (checked) {
-        var data = defaultData ? __assign({}, defaultData) : {};
-        name && (data[name] = trueValue);
-        onBulkChange && onBulkChange(data);
+        var newValue = defaultData !== null && defaultData !== void 0 ? defaultData : trueValue;
+        newValue && onBulkChange && onBulkChange(newValue);
       }
-      // 取消选中后，将所有字段重置
-      else {
-        var values = clearChildValuesOnOff ? fromPairs(this.getFormItemNames().map(function (i) {
+      // 这个逻辑感觉主要是为了一些本身有默认值的相关配置，不想删除，只是想保留初始
+      else if (clearChildValuesOnOff) {
+        onBulkChange && onBulkChange(fromPairs(this.state.childFormNames.map(function (i) {
           return [i, undefined];
-        })) : {};
-        name && (values[name] = falseValue);
-        onBulkChange && onBulkChange(values);
+        })));
       }
-      return;
     }
-    onChange(checked ? defaultData || true : undefined);
+    this.setState({
+      checked: checked,
+      show: checked
+    });
   };
+  /**
+   * 返回子表单的数据，如果是同级，直接返回当前数据域，否则返回当前数据作为子表单
+   */
+  SwitchMore.prototype.getExtendValues = function () {
+    var _a = this.props,
+      name = _a.name,
+      ctx = _a.data,
+      bulk = _a.bulk;
+    if (!ctx) {
+      return {};
+    }
+    if (bulk) {
+      return ctx;
+    }
+    return name ? ctx[name] : {};
+  };
+  /**
+   * 打开后，首先遵循默认值设置，之后遵循选中值设置
+   * 当都不设置时，要看是否是object类型，是object类型，需要是空对象
+   *
+   * 关闭后，先遵循关闭值设置，否则一切回归原始删除属性状态
+   */
+  SwitchMore.prototype.getInitTureValue = function () {
+    var _a = this.props,
+      bulk = _a.bulk,
+      defaultData = _a.defaultData,
+      trueValue = _a.trueValue;
+    if (defaultData) {
+      return __assign({}, defaultData);
+    }
+    if (trueValue != null) {
+      return trueValue;
+    }
+    if (bulk) {
+      return true;
+    }
+    return {};
+  };
+  /**
+   * 弹窗配置的提交
+   * @param values
+   */
   SwitchMore.prototype.handleSubmit = function (values) {
     var _a = this.props,
       onChange = _a.onChange,
@@ -154,13 +196,12 @@ var SwitchMore = /** @class */function (_super) {
   };
   SwitchMore.prototype.renderActions = function () {
     var _a = this.props,
-      render = _a.render,
       removable = _a.removable,
       disabled = _a.disabled,
       form = _a.form,
       formType = _a.formType,
       hiddenOnDefault = _a.hiddenOnDefault,
-      bulk = _a.bulk;
+      render = _a.render;
     var _b = this.state,
       checked = _b.checked,
       show = _b.show;
@@ -169,7 +210,7 @@ var SwitchMore = /** @class */function (_super) {
     }
     var actions = [];
     if (formType === 'dialog') {
-      actions.push(render('switch-more-form', this.renderDialogMore(), {
+      actions.push(render('switch-more-dialog', this.renderDialogMore(), {
         key: 'edit',
         onSubmit: this.handleSubmit
       }));
@@ -185,7 +226,7 @@ var SwitchMore = /** @class */function (_super) {
         icon: "pencil",
         className: "icon"
       })));
-    } else if (bulk && hiddenOnDefault && formType === 'extend') {
+    } else if (hiddenOnDefault && formType === 'extend') {
       actions.push(React__default.createElement("div", {
         key: "open",
         "data-tooltip": !show ? i18n("311f6d1fa5f13b0e280d7b3c9d40c5be") : undefined,
@@ -215,7 +256,6 @@ var SwitchMore = /** @class */function (_super) {
   };
   SwitchMore.prototype.renderPopover = function () {
     var _a = this.props,
-      render = _a.render,
       popOverclassName = _a.popOverclassName,
       overlay = _a.overlay,
       offset = _a.offset,
@@ -224,7 +264,8 @@ var SwitchMore = /** @class */function (_super) {
       placement = _a.placement,
       rootClose = _a.rootClose,
       style = _a.style,
-      title = _a.title;
+      title = _a.title,
+      render = _a.render;
     return React__default.createElement(Overlay, {
       show: true,
       rootClose: rootClose,
@@ -250,13 +291,9 @@ var SwitchMore = /** @class */function (_super) {
     })));
   };
   SwitchMore.prototype.renderExtend = function () {
-    var _a = this.props,
-      render = _a.render;
-      _a.form;
-      _a.bulk;
-      var hiddenOnDefault = _a.hiddenOnDefault;
+    var render = this.props.render;
     var show = this.state.show;
-    if (hiddenOnDefault && !show) {
+    if (!show) {
       return null;
     }
     return React__default.createElement("div", null, React__default.createElement("div", {
@@ -278,15 +315,11 @@ var SwitchMore = /** @class */function (_super) {
     };
   };
   SwitchMore.prototype.renderForm = function () {
-    var _a;
-    var _b = this.props,
-      form = _b.form,
-      name = _b.name,
-      formType = _b.formType,
-      ctx = _b.data,
-      bulk = _b.bulk,
-      defaultData = _b.defaultData,
-      autoFocus = _b.autoFocus;
+    var _a = this.props,
+      form = _a.form,
+      formType = _a.formType,
+      autoFocus = _a.autoFocus,
+      bulk = _a.bulk;
     return __assign({
       type: 'form',
       wrapWithPanel: false,
@@ -302,7 +335,8 @@ var SwitchMore = /** @class */function (_super) {
       formLazyChange: true,
       preventEnterSubmit: true,
       submitOnChange: ['pop', 'extend'].includes(formType),
-      data: ctx && name && !bulk ? (_a = ctx[name]) !== null && _a !== void 0 ? _a : defaultData : defaultData !== null && defaultData !== void 0 ? defaultData : {}
+      canAccessSuperData: bulk,
+      data: this.getExtendValues()
     }, form);
   };
   SwitchMore.prototype.renderMoreSection = function () {
@@ -362,8 +396,6 @@ var SwitchMore = /** @class */function (_super) {
     // placement: 'left',
     overlay: true,
     rootClose: false,
-    trueValue: true,
-    falseValue: false,
     formType: 'pop',
     bulk: true,
     clearChildValuesOnOff: true

package/esm/renderer/TableColumnWidthControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/TimelineItemControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/TplFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/TransferTableControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/TreeOptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/ValidateApiControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/ValidationControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/ValidationItem.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/ValueFormatControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/crud2-control/AddColumnModal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/esm/renderer/crud2-control/CRUDColumnControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0
- * build time: 2024-12-02
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */