amis-editor 6.0.0 → 6.1.0

package/lib/renderer/TplFormulaControl.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';
@@ -150,53 +150,77 @@ var TplFormulaControl = /** @class */function (_super) {
   // 检测用户输入'${}'自动打开表达式弹窗
   TplFormulaControl.prototype.checkOpenFormulaPicker = function (value) {
     var _a;
-    var preLength = ((_a = this.props.value) === null || _a === void 0 ? void 0 : _a.length) || 0;
-    // 删除了文本，无需检测
-    if (value.length < preLength || value === this.props.value) {
-      return;
-    }
-    var left = 0;
-    var right = 0;
-    var length = value.length;
-    while (left < preLength && value.charAt(left) === this.props.value.charAt(left)) {
-      left++;
-    }
-    while (right < preLength && value.charAt(length - 1 - right) === this.props.value.charAt(preLength - 1 - right)) {
-      right++;
-    }
-    if ((preInputLocation === null || preInputLocation === void 0 ? void 0 : preInputLocation.end) !== left) {
-      preInputLocation = null;
-    }
-    var start = preInputLocation ? preInputLocation.start : left;
-    var end = left === length - right ? left + 1 : length - right;
-    var inputText = value.substring(start, end);
-    if (/\$|\{|\}$/.test(inputText)) {
-      if (/\$\{\}/.test(inputText)) {
-        var newValue = value.slice(0, start) + inputText.replace('${}', '') + value.slice(end);
-        this.props.onChange(newValue);
-        var corsur = this.editorPlugin.getCorsur();
-        this.setState({
-          formulaPickerOpen: true,
-          formulaPickerValue: '',
-          expressionBrace: [{
-            line: corsur === null || corsur === void 0 ? void 0 : corsur.line,
-            ch: end - 3
-          }, {
-            line: corsur === null || corsur === void 0 ? void 0 : corsur.line,
-            ch: end
-          }]
-        });
-        preInputLocation = null;
-      } else {
-        preInputLocation = tslib.__assign(tslib.__assign({
-          start: left
-        }, preInputLocation), {
-          end: end
-        });
-      }
-    } else {
-      preInputLocation = null;
-    }
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var preLength, left, right, length, start, end, inputText, newValue, corsur;
+      return tslib.__generator(this, function (_b) {
+        switch (_b.label) {
+          case 0:
+            preLength = ((_a = this.props.value) === null || _a === void 0 ? void 0 : _a.length) || 0;
+            // 删除了文本，无需检测
+            if (value.length < preLength || value === this.props.value) {
+              return [2 /*return*/];
+            }
+            left = 0;
+            right = 0;
+            length = value.length;
+            while (left < preLength && value.charAt(left) === this.props.value.charAt(left)) {
+              left++;
+            }
+            while (right < preLength && value.charAt(length - 1 - right) === this.props.value.charAt(preLength - 1 - right)) {
+              right++;
+            }
+            if ((preInputLocation === null || preInputLocation === void 0 ? void 0 : preInputLocation.end) !== left) {
+              preInputLocation = null;
+            }
+            start = preInputLocation ? preInputLocation.start : left;
+            end = left === length - right ? left + 1 : length - right;
+            inputText = value.substring(start, end);
+            if (!/\$|\{|\}$/.test(inputText)) return [3 /*break*/, 7];
+            if (!/\$\{\}/.test(inputText)) return [3 /*break*/, 5];
+            newValue = value.slice(0, start) + inputText.replace('${}', '') + value.slice(end);
+            this.props.onChange(newValue);
+            _b.label = 1;
+          case 1:
+            _b.trys.push([1, 3,, 4]);
+            return [4 /*yield*/, this.beforeFormulaEditorOpen()];
+          case 2:
+            _b.sent();
+            return [3 /*break*/, 4];
+          case 3:
+            _b.sent();
+            return [3 /*break*/, 4];
+          case 4:
+            corsur = this.editorPlugin.getCorsur();
+            this.setState({
+              formulaPickerOpen: true,
+              formulaPickerValue: '',
+              expressionBrace: [{
+                line: corsur === null || corsur === void 0 ? void 0 : corsur.line,
+                ch: end - 3
+              }, {
+                line: corsur === null || corsur === void 0 ? void 0 : corsur.line,
+                ch: end
+              }]
+            });
+            preInputLocation = null;
+            return [3 /*break*/, 6];
+          case 5:
+            preInputLocation = tslib.__assign(tslib.__assign({
+              start: left
+            }, preInputLocation), {
+              end: end
+            });
+            _b.label = 6;
+          case 6:
+            return [3 /*break*/, 8];
+          case 7:
+            preInputLocation = null;
+            _b.label = 8;
+          case 8:
+            return [2 /*return*/];
+        }
+      });
+    });
   };
   TplFormulaControl.prototype.handleClear = function () {
     var _a;
@@ -208,7 +232,7 @@ var TplFormulaControl = /** @class */function (_super) {
   TplFormulaControl.prototype.beforeFormulaEditorOpen = function () {
     var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var _b, node, manager, data, onFormulaEditorOpen, res, variables, variables, error_1;
+      var _b, node, manager, data, onFormulaEditorOpen, res, variables, variables, error_2;
       return tslib.__generator(this, function (_c) {
         switch (_c.label) {
           case 0:
@@ -245,8 +269,8 @@ var TplFormulaControl = /** @class */function (_super) {
           case 7:
             return [3 /*break*/, 9];
           case 8:
-            error_1 = _c.sent();
-            console.error('[amis-editor] onFormulaEditorOpen failed: ', error_1 === null || error_1 === void 0 ? void 0 : error_1.stack);
+            error_2 = _c.sent();
+            console.error('[amis-editor] onFormulaEditorOpen failed: ', error_2 === null || error_2 === void 0 ? void 0 : error_2.stack);
             return [3 /*break*/, 9];
           case 9:
             this.setState({
@@ -426,4 +450,4 @@ var TplFormulaControl = /** @class */function (_super) {
 })(TplFormulaControl);
 
 exports.TplFormulaControl = TplFormulaControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/TransferTableControl.d.ts

@@ -136,9 +136,7 @@ declare const TransferTableControl: {
                     className: string;
                     wrapWithPanel?: undefined;
                     mode?: undefined;
-                    wrapperComponent?: undefined; /**
-                     * 更新options字段的统一出口
-                     */
+                    wrapperComponent?: undefined;
                     resetAfterSubmit?: undefined;
                     autoFocus?: undefined;
                     preventEnterSubmit?: undefined;

package/lib/renderer/TransferTableControl.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';
@@ -454,4 +454,4 @@ var TransferTableControl = BaseOptionControl(TransferTableOption);
 })(TransferTableControl);
 
 exports["default"] = TransferTableOption;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/TreeOptionControl.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';
@@ -625,4 +625,4 @@ var TreeOptionControl = /** @class */function (_super) {
 })(TreeOptionControl);
 
 exports["default"] = TreeOptionControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/ValidationControl.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';
@@ -372,4 +372,4 @@ var ValidationControl = /** @class */function (_super) {
 })(ValidationControl);
 
 exports["default"] = ValidationControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/ValidationItem.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';
@@ -173,4 +173,4 @@ var ValidationItem = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ValidationItem;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/ValueFormatControl.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 值格式录入控件
+ * - 布尔
+ * - 数字
+ * - 文本
+ */
+import type { FormControlProps } from 'amis';
+export interface valueFormatControlProps extends FormControlProps {
+    supportNumberType: boolean;
+    supportBoolType: boolean;
+    placeholder?: string;
+}
+export type valueType = 'text' | 'boolean' | 'number';
+declare const _default: any;
+export default _default;

package/lib/renderer/ValueFormatControl.js

@@ -0,0 +1,114 @@
+/**
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
+ */
+
+'use strict';
+
+var amis = require('amis');
+var i18nRuntime = require('i18n-runtime');
+
+/**
+ * 值格式录入控件
+ * - 布尔
+ * - 数字
+ * - 文本
+ */
+var getOptionValueType = function (value, supportTypes) {
+  if (typeof value === 'boolean' && supportTypes.supportBoolType !== false) {
+    return 'boolean';
+  }
+  if (typeof value === 'number' && supportTypes.supportNumberType !== false) {
+    return 'number';
+  }
+  return 'text';
+};
+/**
+ * 将当前选项值转换为选择的类型
+ */
+var normalizeOptionValue = function (value, valueType) {
+  if (valueType === 'number') {
+    var convertTo = Number(value);
+    if (isNaN(convertTo)) {
+      return 0;
+    }
+    return convertTo;
+  }
+  if (valueType === 'boolean') {
+    return !value || value === 'false' ? false : true;
+  }
+  return String(value);
+};
+var ValueFormatControl = function (props) {
+  var render = props.render,
+    value = props.value,
+    onChange = props.onChange,
+    placeholder = props.placeholder;
+  return render('body', {
+    type: 'form',
+    wrapWithPanel: false,
+    data: {
+      vType: getOptionValueType(value, props),
+      vValue: value
+    },
+    onChange: function (data) {
+      return onChange(normalizeOptionValue(data.vValue, data.vType));
+    },
+    body: [{
+      type: 'input-group',
+      name: 'input-group',
+      label: false,
+      mode: 'horizontal',
+      body: [{
+        type: 'select',
+        name: 'vType',
+        options: [{
+          label: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb"),
+          value: 'text'
+        }, {
+          label: i18nRuntime.i18n("55d4790c5d819cd0462cbe89561b0dd4"),
+          value: 'number',
+          hidden: props.supportNumberType === false
+        }, {
+          label: i18nRuntime.i18n("97b0b6499334ed889b372513290a2a52"),
+          value: 'boolean',
+          hidden: props.supportBoolType === false
+        }].filter(function (item) {
+          return item.hidden !== true;
+        }),
+        checkAll: false,
+        // pipeIn: (v: valueType) => (v ? v : getOptionValueType(v, props)),
+        onChange: function (value, oldValue, model, form) {
+          var vValue = ((form === null || form === void 0 ? void 0 : form.data) || {}).vValue;
+          form.setValues({
+            vValue: normalizeOptionValue(vValue, value)
+          });
+        }
+      }, {
+        type: 'input-text',
+        placeholder: placeholder,
+        name: 'vValue',
+        value: value,
+        visibleOn: "this.vType !== 'boolean'"
+      }, {
+        type: 'input-text',
+        placeholder: placeholder,
+        name: 'vValue',
+        value: value,
+        visibleOn: "this.vType === 'boolean'",
+        options: [{
+          label: 'true',
+          value: true
+        }, {
+          label: 'false',
+          value: false
+        }]
+      }]
+    }]
+  });
+};
+amis.FormItem({
+  type: 'ae-valueFormat'
+})(ValueFormatControl);
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/crud2-control/AddColumnModal.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';
@@ -264,4 +264,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = amis.themeable(AddColumnModal);
 
 exports["default"] = AddColumnModal$1;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/crud2-control/CRUDColumnControl.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';
@@ -143,12 +143,17 @@ var CRUDColumnControl = /** @class */function (_super) {
         }
         var parent = e.to;
         if (e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
+          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[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 () {
@@ -477,4 +482,4 @@ var CRUDColumnControl = /** @class */function (_super) {
 })(CRUDColumnControl);
 
 exports.CRUDColumnControl = CRUDColumnControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/crud2-control/CRUDFiltersControl.d.ts

@@ -5,7 +5,7 @@
 import React from 'react';
 import type { DSFeatureType, DSBuilderInterface } from '../../builder';
 import type { EditorNodeType } from 'amis-editor-core';
-import type { FormControlProps } from 'amis';
+import type { FormControlProps, PlainObject } from 'amis';
 interface Option {
     label: string;
     value: string;
@@ -39,6 +39,7 @@ export declare class CRUDFiltersControl extends React.Component<CRUDFiltersContr
     componentDidUpdate(prevProps: Readonly<CRUDFiltersControlProps>, prevState: Readonly<CRUDFiltersControlState>, snapshot?: any): void;
     transformOption(option: any): Option | false;
     initOptions(): Promise<void>;
+    setFilterVisible(schema: PlainObject): void;
     updateSimpleQuery(enable: boolean): Promise<void>;
     updateAdvancedQuery(enable: boolean): Promise<void>;
     updateFuzzyQuery(enable: boolean): Promise<void>;

package/lib/renderer/crud2-control/CRUDFiltersControl.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';
@@ -169,6 +169,12 @@ var CRUDFiltersControl = /** @class */function (_super) {
       });
     });
   };
+  CRUDFiltersControl.prototype.setFilterVisible = function (schema) {
+    var _a;
+    if (!('visibleOn' in schema) && schema.type) {
+      schema.visible = ((_a = schema.body) === null || _a === void 0 ? void 0 : _a.length) > 0;
+    }
+  };
   CRUDFiltersControl.prototype.updateSimpleQuery = function (enable) {
     var _a, _b, _c, _d, _e, _f;
     return tslib.__awaiter(this, void 0, void 0, function () {
@@ -212,6 +218,7 @@ var CRUDFiltersControl = /** @class */function (_super) {
               }
               return [key, value];
             });
+            this.setFilterVisible(newFilterSchema);
             targetNode = manager.store.getNodeById(filterSchema.$$id);
             if (targetNode) {
               targetNode.updateSchema(newFilterSchema);
@@ -233,6 +240,7 @@ var CRUDFiltersControl = /** @class */function (_super) {
               }
               return [key, value];
             });
+            this.setFilterVisible(newFilterSchema);
             targetNode = manager.store.getNodeById(filterSchema.$$id);
             if (targetNode) {
               targetNode.updateSchema(newFilterSchema);
@@ -319,6 +327,7 @@ var CRUDFiltersControl = /** @class */function (_super) {
               }
               return [key, value];
             });
+            this.setFilterVisible(newFilterSchema);
             targetNode = manager.store.getNodeById(filterSchema.$$id);
             if (targetNode) {
               targetNode.updateSchema(newFilterSchema);
@@ -340,6 +349,7 @@ var CRUDFiltersControl = /** @class */function (_super) {
               }
               return [key, value];
             });
+            this.setFilterVisible(newFilterSchema);
             targetNode = manager.store.getNodeById(filterSchema.$$id);
             if (targetNode) {
               targetNode.updateSchema(newFilterSchema);
@@ -691,4 +701,4 @@ var CRUDFiltersControl = /** @class */function (_super) {
 })(CRUDFiltersControl);
 
 exports.CRUDFiltersControl = CRUDFiltersControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/crud2-control/CRUDToolbarControl.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';
@@ -416,4 +416,4 @@ var CRUDToolbarControl = /** @class */function (_super) {
 })(CRUDToolbarControl);
 
 exports.CRUDToolbarControl = CRUDToolbarControl;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/event-control/action-config-dialog.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';
@@ -330,4 +330,4 @@ var ActionDialog = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ActionDialog;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/event-control/action-config-panel.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';
@@ -64,4 +64,4 @@ var ActionConfigPanel = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ActionConfigPanel;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/event-control/comp-action-select.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';
@@ -83,4 +83,4 @@ var CmptActionSelect = /** @class */function (_super) {
 
 exports.BASE_ACTION_PROPS = BASE_ACTION_PROPS;
 exports["default"] = CmptActionSelect;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/event-control/helper.d.ts

@@ -18,18 +18,6 @@ export declare const SUPPORT_STATIC_FORMITEM_CMPTS: string[];
 export declare const SUPPORT_DISABLED_CMPTS: string[];
 export declare const ACTION_TYPE_TREE: (manager: any) => RendererPluginAction[];
 export declare const renderCmptSelect: (componentLabel: string, required: boolean, onChange?: ((value: string, oldVal: any, data: any, form: any) => void) | undefined, hideAutoFill?: boolean) => {
-    type: string;
-    name: string;
-    label: string;
-    showIcon: boolean;
-    searchable: boolean;
-    required: boolean;
-    selfDisabledAffectChildren: boolean;
-    size: string;
-    source: string;
-    mode: string;
-    onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
-}[] | {
     type: string;
     name: string;
     label: string;
@@ -41,10 +29,10 @@ export declare const renderCmptSelect: (componentLabel: string, required: boolea
     source: string;
     mode: string;
     autoFill: {
-        __rendererLabel: string;
-        __rendererName: string;
-        __nodeId: string;
-        __nodeSchema: string;
+        __rendererLabel?: string | undefined;
+        __rendererName?: string | undefined;
+        __nodeId?: string | undefined;
+        __nodeSchema?: string | undefined;
         __isScopeContainer: string;
     };
     onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
@@ -60,6 +48,13 @@ export declare const renderCmptActionSelect: (componentLabel: string, required:
     size: string;
     source: string;
     mode: string;
+    autoFill: {
+        __rendererLabel?: string | undefined;
+        __rendererName?: string | undefined;
+        __nodeId?: string | undefined;
+        __nodeSchema?: string | undefined;
+        __isScopeContainer: string;
+    };
     onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
 } | {
     type: string;