amis-editor 6.0.0 → 6.1.0

package/lib/renderer/NavDefaultActive.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -114,4 +114,4 @@ var NavDefaultActiveControl = /** @class */function (_super) {
 })(NavDefaultActiveControl);
 
 exports["default"] = NavDefaultActiveControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/NavSourceControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -749,4 +749,4 @@ var NavSourceControl = /** @class */function (_super) {
 })(NavSourceControl);
 
 exports.NavSourceControl = NavSourceControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/OptionControl.d.ts

@@ -6,7 +6,7 @@ import Sortable from 'sortablejs';
 import type { Option } from 'amis';
 import { FormControlProps } from 'amis-core';
 import type { SchemaApi } from 'amis';
-export type valueType = 'text' | 'boolean' | 'number';
+import { valueType } from './ValueFormatControl';
 export interface PopoverForm {
     optionLabel: string;
     optionValue: any;
@@ -31,24 +31,13 @@ export default class OptionControl extends React.Component<OptionControlProps, O
     drag?: HTMLElement | null;
     target: HTMLElement | null;
     $comp: string;
+    lastOptions: OptionControlProps;
     internalProps: string[];
     constructor(props: OptionControlProps);
     /**
      * 数据更新
      */
     componentWillReceiveProps(nextProps: OptionControlProps): void;
-    /**
-     * 获取当前选项值的类型
-     */
-    getOptionValueType(value: any): valueType;
-    /**
-     * 将当前选项值转换为选择的类型
-     */
-    normalizeOptionValue(value: any, valueType: valueType): string | number | boolean;
-    /**
-     * 处理填入输入框的值
-     */
-    transformOptionValue(value: any): string;
     transformOptions(props: OptionControlProps): {
         hiddenOn?: any;
         hidden?: any;
@@ -93,7 +82,6 @@ export default class OptionControl extends React.Component<OptionControlProps, O
     handleEditLabel(index: number, value: string): void;
     handleHiddenValueChange(index: number, value: string): void;
     handleAdd(): void;
-    handleValueTypeChange(index: number, type: valueType): void;
     handleValueChange(index: number, value: string): void;
     handleBatchAdd(values: {
         batchOption: string;

package/lib/renderer/OptionControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -12,6 +12,7 @@ var tslib = require('tslib');
 var React = require('react');
 var reactDom = require('react-dom');
 var cx = require('classnames');
+var DeepDiff = require('deep-diff');
 var uniqBy = require('lodash/uniqBy');
 var omit = require('lodash/omit');
 var get = require('lodash/get');
@@ -19,7 +20,6 @@ var Sortable = require('sortablejs');
 var amis = require('amis');
 var Select = require('amis-ui/lib/components/Select');
 var amisEditorCore = require('amis-editor-core');
-var amisCore = require('amis-core');
 var debounce = require('lodash/debounce');
 var i18nRuntime = require('i18n-runtime');
 
@@ -27,6 +27,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var DeepDiff__default = /*#__PURE__*/_interopDefaultLegacy(DeepDiff);
 var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
@@ -48,7 +49,7 @@ var OptionControl = /** @class */function (_super) {
       source = /\$\{(.*?)\}/g.test(props.data.source) ? 'variable' : !url.indexOf('api://') ? 'apicenter' : 'api';
     }
     _this.state = {
-      options: _this.transformOptions(props),
+      options: _this.transformOptions(props) || [],
       api: props.data.source,
       labelField: props.data.labelField,
       valueField: props.data.valueField,
@@ -60,57 +61,14 @@ var OptionControl = /** @class */function (_super) {
    * 数据更新
    */
   OptionControl.prototype.componentWillReceiveProps = function (nextProps) {
-    var options = get__default["default"](nextProps, 'data.options') ? this.transformOptions(nextProps) : [];
-    if (JSON.stringify(this.state.options.map(function (item) {
-      return tslib.__assign(tslib.__assign({}, item), {
-        editing: undefined
-      });
-    })) !== JSON.stringify(options)) {
+    var options = get__default["default"](nextProps, 'data.options');
+    // 左侧code手动更新时，同步配置面板
+    if (DeepDiff__default["default"].diff(options, this.lastOptions)) {
       this.setState({
-        options: options
+        options: this.transformOptions(nextProps)
       });
     }
   };
-  /**
-   * 获取当前选项值的类型
-   */
-  OptionControl.prototype.getOptionValueType = function (value) {
-    if (typeof value === 'string') {
-      return 'text';
-    }
-    if (typeof value === 'boolean') {
-      return 'boolean';
-    }
-    if (typeof value === 'number') {
-      return 'number';
-    }
-    return 'text';
-  };
-  /**
-   * 将当前选项值转换为选择的类型
-   */
-  OptionControl.prototype.normalizeOptionValue = function (value, valueType) {
-    if (valueType === 'text') {
-      return String(value);
-    }
-    if (valueType === 'number') {
-      var convertTo = Number(value);
-      if (isNaN(convertTo)) {
-        return 0;
-      }
-      return convertTo;
-    }
-    if (valueType === 'boolean') {
-      return !value || value === 'false' ? false : true;
-    }
-    return '';
-  };
-  /**
-   * 处理填入输入框的值
-   */
-  OptionControl.prototype.transformOptionValue = function (value) {
-    return typeof value === 'undefined' || value === null ? '' : typeof value === 'string' ? value : JSON.stringify(value);
-  };
   OptionControl.prototype.transformOptions = function (props) {
     var ctx = props.data,
       options = props.value;
@@ -157,7 +115,7 @@ var OptionControl = /** @class */function (_super) {
     });
     var value;
     if (!checkedOptions.length) {
-      return '';
+      return undefined;
     }
     if (multiple || multipleProps) {
       value = checkedOptions;
@@ -182,7 +140,9 @@ var OptionControl = /** @class */function (_super) {
    * 更新options字段的统一出口
    */
   OptionControl.prototype.onChange = function () {
-    var source = this.state.source;
+    var _a = this.state,
+      source = _a.source,
+      options = _a.options;
     var onBulkChange = this.props.onBulkChange;
     var defaultValue = this.normalizeValue();
     var data = {
@@ -192,7 +152,6 @@ var OptionControl = /** @class */function (_super) {
       valueField: undefined
     };
     if (source === 'custom') {
-      var options = this.state.options;
       data.options = options.map(function (item) {
         return tslib.__assign(tslib.__assign(tslib.__assign({}, (item === null || item === void 0 ? void 0 : item.badge) ? {
           badge: item.badge
@@ -204,15 +163,17 @@ var OptionControl = /** @class */function (_super) {
         } : {});
       });
       data.value = defaultValue;
+      this.lastOptions = data.options;
     }
     if (source === 'api' || source === 'apicenter' || source === 'variable') {
-      var _a = this.state,
-        api = _a.api,
-        labelField = _a.labelField,
-        valueField = _a.valueField;
+      var _b = this.state,
+        api = _b.api,
+        labelField = _b.labelField,
+        valueField = _b.valueField;
       data.source = api;
       data.labelField = labelField || undefined;
       data.valueField = valueField || undefined;
+      this.lastOptions = data.source;
     }
     onBulkChange && onBulkChange(data);
     return;
@@ -243,15 +204,13 @@ var OptionControl = /** @class */function (_super) {
         }
         // 换回来
         var parent = e.to;
-        if (e.newIndex < e.oldIndex && e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex + 1]);
-        } else if (e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
+        if (e.oldIndex < parent.childNodes.length - 1) {
+          parent.insertBefore(e.item, parent.childNodes[e.oldIndex > e.newIndex ? e.oldIndex + 1 : e.oldIndex]);
         } else {
           parent.appendChild(e.item);
         }
         var options = _this.state.options.concat();
-        options[e.oldIndex] = options.splice(e.newIndex, 1, options[e.oldIndex])[0];
+        options.splice(e.newIndex, 0, options.splice(e.oldIndex, 1)[0]);
         _this.setState({
           options: options
         }, function () {
@@ -382,21 +341,10 @@ var OptionControl = /** @class */function (_super) {
       _this.onChange();
     });
   };
-  OptionControl.prototype.handleValueTypeChange = function (index, type) {
-    var _this = this;
-    var options = this.state.options.concat();
-    options[index].value = this.normalizeOptionValue(options[index].value, type);
-    this.setState({
-      options: options
-    }, function () {
-      return _this.onChange();
-    });
-  };
   OptionControl.prototype.handleValueChange = function (index, value) {
     var _this = this;
     var options = this.state.options.concat();
-    var type = this.getOptionValueType(options[index].value);
-    options[index].value = this.normalizeOptionValue(value, type);
+    options[index].value = value;
     this.setState({
       options: options
     }, function () {
@@ -503,16 +451,14 @@ var OptionControl = /** @class */function (_super) {
       index = props.index,
       editing = props.editing,
       multipleProps = props.multipleProps,
-      closeDefaultCheck = props.closeDefaultCheck;
+      closeDefaultCheck = props.closeDefaultCheck,
+      hiddenOn = props.hiddenOn;
     var _a = this.props,
       render = _a.render,
       ctx = _a.data,
       node = _a.node;
     var isMultiple = (ctx === null || ctx === void 0 ? void 0 : ctx.multiple) === true || multipleProps;
     var i18nEnabled = amisEditorCore.getI18nEnabled();
-    var label = this.transformOptionValue(props.label);
-    var value = this.transformOptionValue(props.value);
-    var valueType = this.getOptionValueType(props.value);
     var showBadge = node.type === 'button-group-select';
     var editDom = editing ? React__default["default"].createElement("div", {
       className: "ae-OptionControlItem-extendMore"
@@ -524,6 +470,7 @@ var OptionControl = /** @class */function (_super) {
         className: 'ae-OptionControlItem-closeBtn',
         label: '×',
         level: 'link',
+        value: checked,
         onClick: function () {
           return _this.toggleEdit(index);
         }
@@ -532,67 +479,25 @@ var OptionControl = /** @class */function (_super) {
         placeholder: i18nRuntime.i18n("b4fdf79b8f54856b072ec3874b830d1f"),
         label: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb"),
         mode: 'horizontal',
-        value: label,
-        name: 'optionLabel',
+        value: props === null || props === void 0 ? void 0 : props.label,
         labelClassName: 'ae-OptionControlItem-EditLabel',
         valueClassName: 'ae-OptionControlItem-EditValue',
         onChange: function (v) {
           return _this.handleEditLabel(index, v);
         }
       }, {
-        type: 'input-group',
-        name: 'input-group',
-        label: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+        type: 'ae-valueFormat',
+        placeholder: i18nRuntime.i18n("f4ab507e2fa2d2bd66bcdeafd9fef797"),
         labelClassName: 'ae-OptionControlItem-EditLabel',
         valueClassName: 'ae-OptionControlItem-EditValue',
-        mode: 'horizontal',
-        body: [{
-          type: 'select',
-          name: 'optionValueType',
-          value: valueType,
-          options: [{
-            label: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb"),
-            value: 'text'
-          }, {
-            label: i18nRuntime.i18n("55d4790c5d819cd0462cbe89561b0dd4"),
-            value: 'number'
-          }, {
-            label: i18nRuntime.i18n("97b0b6499334ed889b372513290a2a52"),
-            value: 'boolean'
-          }],
-          checkAll: false,
-          onChange: function (v) {
-            return _this.handleValueTypeChange(index, v);
-          }
-        }, {
-          type: 'input-text',
-          placeholder: i18nRuntime.i18n("f4ab507e2fa2d2bd66bcdeafd9fef797"),
-          name: 'optionValue',
-          value: value,
-          visibleOn: "this.optionValueType !== 'boolean'",
-          onChange: function (v) {
-            return _this.handleValueChange(index, v);
-          }
-        }, {
-          type: 'input-text',
-          placeholder: i18nRuntime.i18n("f4ab507e2fa2d2bd66bcdeafd9fef797"),
-          name: 'optionValue',
-          value: value,
-          visibleOn: "this.optionValueType === 'boolean'",
-          onChange: function (v) {
-            return _this.handleValueChange(index, v);
-          },
-          options: [{
-            label: 'true',
-            value: true
-          }, {
-            label: 'false',
-            value: false
-          }]
-        }]
+        label: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+        value: props === null || props === void 0 ? void 0 : props.value,
+        onChange: function (v) {
+          return _this.handleValueChange(index, v);
+        }
       }, amisEditorCore.getSchemaTpl('expressionFormulaControl', {
-        name: 'optionHiddenOn',
         label: i18nRuntime.i18n("dce5379cb978a8259ecfca8f08f00817"),
+        value: hiddenOn,
         labelClassName: 'ae-OptionControlItem-EditLabel',
         valueClassName: 'ae-OptionControlItem-EditValue',
         onChange: function (v) {
@@ -605,17 +510,12 @@ var OptionControl = /** @class */function (_super) {
         mode: 'horizontal',
         visible: showBadge,
         value: props === null || props === void 0 ? void 0 : props.badge,
-        name: 'optionBadge',
         labelClassName: 'ae-OptionControlItem-EditLabel',
         valueClassName: 'ae-OptionControlItem-EditValue',
         onChange: function (v) {
           return _this.toggleBadge(index, v);
         }
       }]
-    }, {
-      data: amisCore.createObject(ctx, {
-        option: props
-      })
     })) : null;
     var operationBtn = [{
       type: 'button',
@@ -669,7 +569,7 @@ var OptionControl = /** @class */function (_super) {
     })), amis.render({
       type: i18nEnabled ? 'input-text-i18n' : 'input-text',
       className: 'ae-OptionControlItem-input',
-      value: label,
+      value: props === null || props === void 0 ? void 0 : props.label,
       placeholder: i18nRuntime.i18n("5d26b8a41e805204c9dcd5ea7e23b150"),
       clearable: false,
       onChange: function (value) {
@@ -855,4 +755,4 @@ var OptionControl = /** @class */function (_super) {
 })(OptionControl);
 
 exports["default"] = OptionControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/RangePartsControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -427,4 +427,4 @@ var MarksControl = /** @class */function (_super) {
 
 exports.MarksControl = MarksControl;
 exports.PartsControl = PartsControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/StatusControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -213,4 +213,4 @@ var StatusControl = /** @class */function (_super) {
 })(StatusControl);
 
 exports.StatusControl = StatusControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/SwitchMoreControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -402,4 +402,4 @@ var SwitchMore = /** @class */function (_super) {
 })(SwitchMore);
 
 exports["default"] = SwitchMore;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/TableColumnWidthControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -182,4 +182,4 @@ var TableColumnWidthControl = /** @class */function (_super) {
 })(TableColumnWidthControl);
 
 exports["default"] = TableColumnWidthControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/TimelineItemControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -288,10 +288,8 @@ var TimelineItemControl = /** @class */function (_super) {
         }
         // 换回来
         var parent = e.to;
-        if (e.newIndex < e.oldIndex && e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex + 1]);
-        } else if (e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
+        if (e.oldIndex < parent.childNodes.length - 1) {
+          parent.insertBefore(e.item, parent.childNodes[e.oldIndex > e.newIndex ? e.oldIndex + 1 : e.oldIndex]);
         } else {
           parent.appendChild(e.item);
         }
@@ -535,4 +533,4 @@ var TimelineItemControl = /** @class */function (_super) {
 })(React__default["default"].Component);
 
 exports["default"] = TimelineItemControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/TplFormulaControl.d.ts

@@ -61,7 +61,7 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     closeFormulaPicker(): void;
     handleConfirm(value: any): void;
     handleOnChange(value: any): void;
-    checkOpenFormulaPicker(value: string): void;
+    checkOpenFormulaPicker(value: string): Promise<void>;
     handleClear(): void;
     /**
      * 公式编辑器打开完成一些异步任务的加载