amis-editor 5.7.0 → 6.1.0

package/lib/renderer/ValidationControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/ValidationItem.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+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 v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

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

@@ -1,7 +1,7 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+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 v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

package/lib/renderer/crud2-control/CRUDToolbarControl.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+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 v5.7.0
- * build time: 2023-12-08
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -77,6 +77,7 @@ var ActionDialog = /** @class */function (_super) {
         // 因为不知道动作都有哪些字段，这里只保留基础配置
         var removeKeys = {};
         var groupType = '';
+        var __statusType = '';
         Object.keys(form.data).forEach(function (key) {
           if (!compActionSelect.BASE_ACTION_PROPS.includes(key)) {
             removeKeys[key] = undefined;
@@ -89,10 +90,13 @@ var ActionDialog = /** @class */function (_super) {
           groupType = 'closeDialog';
         }
         if (value === 'visibility' && !['show', 'hidden', 'visibility'].includes(groupType)) {
-          groupType = 'show';
+          groupType = 'static';
+          // 多个动作共用字段需要处理一下默认值，否则设为undefined会导致视觉上勾选，但是value实际为空
+          __statusType = 'show';
         }
         if (value === 'usability' && !['enabled', 'disabled', 'usability'].includes(groupType)) {
-          groupType = 'enabled';
+          groupType = 'static';
+          __statusType = 'enabled';
         }
         var actionNode = helper.findActionNode(actionTree, value);
         form.setValues(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, removeKeys), {
@@ -104,6 +108,7 @@ var ActionDialog = /** @class */function (_super) {
         } : {}), {
           // 切换动作时清空args
           groupType: groupType,
+          __statusType: __statusType,
           __actionDesc: actionNode === null || actionNode === void 0 ? void 0 : actionNode.description,
           __actionSchema: actionNode === null || actionNode === void 0 ? void 0 : actionNode.schema,
           __subActions: actionNode === null || actionNode === void 0 ? void 0 : actionNode.actions,
@@ -129,12 +134,13 @@ var ActionDialog = /** @class */function (_super) {
     return commonUseActions.map(function (action) {
       return {
         type: 'tag',
-        label: action.label,
+        label: i18nRuntime.i18n(action.label),
         displayMode: 'rounded',
         color: 'active',
         style: {
           borderColor: '#2468f2',
-          cursor: 'pointer'
+          cursor: 'pointer',
+          maxWidth: '16%'
         },
         onEvent: {
           click: {
@@ -199,7 +205,7 @@ var ActionDialog = /** @class */function (_super) {
           visibleOn: "".concat(commonUseActionSchema.length),
           items: tslib.__spreadArray([{
             type: 'tpl',
-            tpl: '常用动作：',
+            tpl: i18nRuntime.i18n("d846706b91f99cd12545a78212fa5984"),
             className: 'common-actions-label'
           }], tslib.__read(commonUseActionSchema), false)
         }, {
@@ -324,4 +330,4 @@ var ActionDialog = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ActionDialog;
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+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 v5.7.0
- * build time: 2023-12-08
- * 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:'5.7.0',buildTime:'2023-12-08'};
+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 v5.7.0
- * build time: 2023-12-08
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -10,7 +10,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amis = require('amis');
+var amisCore = require('amis-core');
 var React = require('react');
+var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -19,56 +21,66 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 /**
  * 组件专有动作选择器
  */
-// 动作基本配置项
-var BASE_ACTION_PROPS = [
-    'actionType',
-    '__actionDesc',
-    'preventDefault',
-    'stopPropagation',
-    'expression'
-    // 'outputVar'
+var BASE_ACTION_PROPS = ['actionType', '__actionDesc', 'preventDefault', 'stopPropagation', 'expression'
+// 'outputVar'
 ];
-var CmptActionSelect = /** @class */ (function (_super) {
-    tslib.__extends(CmptActionSelect, _super);
-    function CmptActionSelect() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var CmptActionSelect = /** @class */function (_super) {
+  tslib.__extends(CmptActionSelect, _super);
+  function CmptActionSelect() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  CmptActionSelect.prototype.onChange = function (option) {
+    var formStore = this.props.formStore;
+    var removeKeys = {};
+    // 保留必须字段，其他过滤掉
+    Object.keys(formStore.data).forEach(function (key) {
+      if (!tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(BASE_ACTION_PROPS), false), ['componentId', '__rendererName', '__cmptTreeSource', '__isScopeContainer', '__cmptId'], false).includes(key)) {
+        removeKeys[key] = undefined;
+      }
+    });
+    formStore.setValues(tslib.__assign(tslib.__assign({}, removeKeys), {
+      args: undefined,
+      groupType: option.value,
+      __cmptActionDesc: option.description
+    }));
+    if (formStore.data.actionType === 'component' && formStore.data.groupType === 'setValue') {
+      formStore.setValueByName('args.__containerType', 'all');
+      formStore.setValueByName('args.__comboType', 'all');
     }
-    CmptActionSelect.prototype.onChange = function (option) {
-        var formStore = this.props.formStore;
-        var removeKeys = {};
-        // 保留必须字段，其他过滤掉
-        Object.keys(formStore.data).forEach(function (key) {
-            if (!tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(BASE_ACTION_PROPS), false), [
-                'componentId',
-                '__rendererName',
-                '__cmptTreeSource',
-                '__isScopeContainer',
-                '__cmptId'
-            ], false).includes(key)) {
-                removeKeys[key] = undefined;
-            }
-        });
-        formStore.setValues(tslib.__assign(tslib.__assign({}, removeKeys), { args: undefined, groupType: option.value, __cmptActionDesc: option.description }));
-        if (formStore.data.actionType === 'component' &&
-            formStore.data.groupType === 'setValue') {
-            formStore.setValueByName('args.__containerType', 'all');
-            formStore.setValueByName('args.__comboType', 'all');
-        }
-        this.props.onChange(option.value);
-    };
-    CmptActionSelect.prototype.render = function () {
-        var _a = this.props, data = _a.data, formStore = _a.formStore;
-        // 根据type 从组件树中获取actions
-        var actions = data.pluginActions[data.__rendererName] || [];
-        return (React__default["default"].createElement(amis.Select, { value: formStore.data.groupType, className: "cmpt-action-select", options: actions.map(function (item) { return ({
-                label: item.actionLabel,
-                value: item.actionType,
-                description: item.description
-            }); }), onChange: this.onChange.bind(this), clearable: false }));
-    };
-    return CmptActionSelect;
-}(React__default["default"].Component));
+    this.props.onChange(option.value);
+  };
+  CmptActionSelect.prototype.render = function () {
+    var _a;
+    var _b = this.props,
+      data = _b.data,
+      formStore = _b.formStore;
+    // 根据type 从组件树中获取actions
+    var actions = (data.pluginActions[data.__rendererName] || []).slice();
+    // 表单项类型组件，添加校验动作
+    if ((_a = amisCore.getRendererByName(data.__rendererName)) === null || _a === void 0 ? void 0 : _a.isFormItem) {
+      actions.push({
+        actionLabel: i18nRuntime.i18n("b7579706a363e5f23b1040fecfbcb677"),
+        description: i18nRuntime.i18n("1889907dcbe32f9e8ac2c9df6603f12e"),
+        actionType: 'validateFormItem'
+      });
+    }
+    return React__default["default"].createElement(amis.Select, {
+      value: formStore.data.groupType,
+      className: "cmpt-action-select",
+      options: actions.map(function (item) {
+        return {
+          label: item.actionLabel,
+          value: item.actionType,
+          description: item.description
+        };
+      }),
+      onChange: this.onChange.bind(this),
+      clearable: false
+    });
+  };
+  return CmptActionSelect;
+}(React__default["default"].Component);
 
 exports.BASE_ACTION_PROPS = BASE_ACTION_PROPS;
 exports["default"] = CmptActionSelect;
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+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;