amis-editor 5.2.0-beta.2 → 5.2.1-beta.15

package/esm/tpl/common.js

@@ -1,13 +1,15 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
-import { __assign } from 'tslib';
+import { __assign, __rest } from 'tslib';
 import { setSchemaTpl, defaultValue, getSchemaTpl, tipedLabel, isObject } from 'amis-editor-core';
 import { remarkTpl } from '../component/BaseControl.js';
 import flatten from 'lodash/flatten';
+import _ from 'lodash';
 import { InputComponentName } from '../component/InputComponentName.js';
+import { FormulaDateType } from '../renderer/FormulaControl.js';
 import { i18n } from 'i18n-runtime';
 
 setSchemaTpl('switch', {
@@ -22,7 +24,6 @@ setSchemaTpl('switch', {
 /**
  * 分割线
  */
-
 setSchemaTpl('divider', {
   type: 'divider',
   className: 'mx-0'
@@ -30,7 +31,6 @@ setSchemaTpl('divider', {
 /**
  * 带单位的控件
  */
-
 setSchemaTpl('withUnit', function (config) {
   return {
     type: 'input-group',
@@ -46,37 +46,30 @@ setSchemaTpl('withUnit', function (config) {
 /**
  * 表单项字段name
  */
-
 setSchemaTpl('formItemName', {
   label: i18n("d314558953b3c76adb7e131aaec8bd86"),
   name: 'name',
   type: 'ae-DataBindingControl',
   onBindingChange: function (field, onBulkChange) {
     var _a;
-
     onBulkChange(((_a = field.resolveEditSchema) === null || _a === void 0 ? void 0 : _a.call(field)) || {
       label: field.label
     });
-  } // validations: {
+  }
+  // validations: {
   //     matchRegexp: /^[a-z\$][a-z0-0\-_]*$/i
   // },
   // validationErrors: {
   //     "matchRegexp": "请输入合法的变量名"
   // },
   // validateOnChange: false
-
 });
+
 setSchemaTpl('formItemMode', function (config) {
   return {
     label: i18n("5aefca559c5a41d10078e21e6d616825"),
     name: 'mode',
-    type: 'button-group-select',
-    option: i18n("2dde3029c4170a1c8e961a90766e0194"),
-    horizontal: {
-      left: 2,
-      justify: true
-    },
-    // className: 'w-full',
+    type: 'select',
     pipeIn: defaultValue(''),
     options: [{
       label: i18n("2dd25b8c21efbfee4a198787810d65d8"),
@@ -103,14 +96,15 @@ setSchemaTpl('formItemInline', {
   label: i18n("66670400b1f3e4b6c94cff171d441585"),
   name: 'inline',
   visibleOn: 'data.mode != "inline"',
-  pipeIn: defaultValue(false) // onChange: (value:any, origin:any, item:any, form:any) => form.getValueByName('size') === "full" && form.setValueByName('')
-
+  pipeIn: defaultValue(false)
+  // onChange: (value:any, origin:any, item:any, form:any) => form.getValueByName('size') === "full" && form.setValueByName('')
 });
+
 setSchemaTpl('formItemSize', {
   name: 'size',
   label: i18n("21a1d138166d5d92276d126cf1d6ecac"),
   type: 'select',
-  pipeIn: defaultValue(''),
+  pipeIn: defaultValue('full'),
   // mode: 'inline',
   // className: 'w-full',
   options: [{
@@ -126,11 +120,8 @@ setSchemaTpl('formItemSize', {
     label: i18n("ab18e30c0dc4093ceeda8961fac3d1f4"),
     value: 'lg'
   }, {
-    label: i18n("ffaa96ef7232cb6d8ee4d7e673dbf4ac"),
+    label: i18n("4a12e9b9fc5443e5e9999b5a7c56c19a"),
     value: 'full'
-  }, {
-    label: i18n("18c63459a2c069022c7790430f761214"),
-    value: ''
   }]
 });
 setSchemaTpl('minLength', {
@@ -146,7 +137,6 @@ setSchemaTpl('maxLength', {
 /**
  * 表单项名称label
  */
-
 setSchemaTpl('label', {
   label: i18n("32c65d8d7431e76029678ec7bb73a5ab"),
   name: 'label',
@@ -179,22 +169,19 @@ setSchemaTpl('tabs', function (config) {
     type: 'tabs',
     tabsMode: 'line',
     className: 'editor-prop-config-tabs',
-    linksClassName: 'editor-prop-config-tabs-links',
+    linksClassName: 'editor-prop-config-tabs-links aa',
     contentClassName: 'no-border editor-prop-config-tabs-cont hoverShowScrollBar',
     tabs: config.filter(function (item) {
       return item;
     }).map(function (item) {
       var _a;
-
       var newSchema = __assign(__assign({}, item), {
         body: Array.isArray(item.body) ? flatten(item.body) : [item.body]
-      }); // 新版配置面板空隙在子组件中，兼容一下
-
-
+      });
+      // 新版配置面板空隙在子组件中，兼容一下
       if (((_a = newSchema.body[0]) === null || _a === void 0 ? void 0 : _a.type) === 'collapse-group') {
         newSchema.className = (newSchema.className || '') + ' p-none';
       }
-
       return newSchema;
     })
   };
@@ -279,49 +266,51 @@ setSchemaTpl('labelRemark', remarkTpl({
   labelRemark: i18n("7ad83bbe4646a0011ece7fd338d1e189")
 }));
 setSchemaTpl('valueFormula', function (config) {
-  var _a, _b, _c;
-
-  var curRendererSchema = config === null || config === void 0 ? void 0 : config.rendererSchema;
-
-  if ((config === null || config === void 0 ? void 0 : config.useSelectMode) && curRendererSchema && curRendererSchema.options) {
+  var _a = config || {},
+    rendererSchema = _a.rendererSchema,
+    useSelectMode = _a.useSelectMode,
+    mode = _a.mode,
+    visibleOn = _a.visibleOn,
+    label = _a.label,
+    name = _a.name,
+    rendererWrapper = _a.rendererWrapper,
+    needDeleteProps = _a.needDeleteProps,
+    valueType = _a.valueType,
+    header = _a.header,
+    placeholder = _a.placeholder,
+    DateTimeType = _a.DateTimeType,
+    variables = _a.variables,
+    requiredDataPropsVariables = _a.requiredDataPropsVariables,
+    variableMode = _a.variableMode,
+    rest = __rest(_a, ["rendererSchema", "useSelectMode", "mode", "visibleOn", "label", "name", "rendererWrapper", "needDeleteProps", "valueType", "header", "placeholder", "DateTimeType", "variables", "requiredDataPropsVariables", "variableMode"]);
+  var curRendererSchema = rendererSchema;
+  if (useSelectMode && curRendererSchema && curRendererSchema.options) {
     curRendererSchema = __assign(__assign({}, curRendererSchema), {
       type: 'select'
     });
   }
-
-  if ((config === null || config === void 0 ? void 0 : config.mode) === 'vertical') {
-    // 上下展示，可避免 自定义渲染器 出现挤压
-    return {
-      type: 'group',
-      mode: 'vertical',
-      visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
-      body: [{
-        type: 'ae-formulaControl',
-        label: (_a = config === null || config === void 0 ? void 0 : config.label) !== null && _a !== void 0 ? _a : i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
-        name: (config === null || config === void 0 ? void 0 : config.name) || 'value',
-        rendererSchema: curRendererSchema,
-        rendererWrapper: config === null || config === void 0 ? void 0 : config.rendererWrapper,
-        needDeleteValue: config === null || config === void 0 ? void 0 : config.needDeleteValue,
-        valueType: config === null || config === void 0 ? void 0 : config.valueType,
-        evalMode: (_b = config === null || config === void 0 ? void 0 : config.evalMode) !== null && _b !== void 0 ? _b : false // 默认需要${}包裹变量
-
-      }]
-    };
-  } else {
+  return {
+    type: 'group',
     // 默认左右展示
-    return {
+    // 上下展示，可避免 自定义渲染器 出现挤压
+    mode: mode === 'vertical' ? 'vertical' : 'horizontal',
+    visibleOn: visibleOn,
+    body: [__assign({
       type: 'ae-formulaControl',
-      label: (config === null || config === void 0 ? void 0 : config.label) || i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
-      name: (config === null || config === void 0 ? void 0 : config.name) || 'value',
+      label: label !== null && label !== void 0 ? label : i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
+      name: name || 'value',
+      rendererWrapper: rendererWrapper,
+      needDeleteProps: needDeleteProps,
+      valueType: valueType,
+      header: header,
+      placeholder: placeholder,
       rendererSchema: curRendererSchema,
-      rendererWrapper: config === null || config === void 0 ? void 0 : config.rendererWrapper,
-      needDeleteValue: config === null || config === void 0 ? void 0 : config.needDeleteValue,
-      valueType: config === null || config === void 0 ? void 0 : config.valueType,
-      visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
-      evalMode: (_c = config === null || config === void 0 ? void 0 : config.evalMode) !== null && _c !== void 0 ? _c : false // 默认需要${}包裹变量
-
-    };
-  }
+      variables: variables,
+      requiredDataPropsVariables: requiredDataPropsVariables,
+      variableMode: variableMode,
+      DateTimeType: DateTimeType !== null && DateTimeType !== void 0 ? DateTimeType : FormulaDateType.NotDate
+    }, rest)]
+  };
 });
 setSchemaTpl('inputType', {
   label: i18n("b3e55578af5dd473bab62641bb2f5f8e"),
@@ -392,9 +381,63 @@ setSchemaTpl('selectDateRangeType', {
     value: 'input-year-range'
   }]
 });
+setSchemaTpl('optionsMenuTpl', function (config) {
+  var manager = config.manager,
+    rest = __rest(config, ["manager"]);
+  // 设置 options 中变量集合
+  function getOptionVars(that) {
+    var schema = manager.store.valueWithoutHiddenProps;
+    var children = [];
+    if (schema.labelField) {
+      children.push({
+        label: i18n("7e9c83e86beb612377a94e6e8d1fc644"),
+        value: schema.labelField,
+        tag: typeof schema.labelField
+      });
+    }
+    if (schema.valueField) {
+      children.push({
+        label: i18n("2e01f5f5889e33d003bec7857cd38445"),
+        value: schema.valueField,
+        tag: typeof schema.valueField
+      });
+    }
+    if (schema.options) {
+      var optionItem_1 = _.reduce(schema.options, function (result, item) {
+        return __assign(__assign({}, result), item);
+      }, {});
+      optionItem_1 === null || optionItem_1 === void 0 ? true : delete optionItem_1.$$id;
+      optionItem_1 = _.omit(optionItem_1, _.map(children, function (item) {
+        return item === null || item === void 0 ? void 0 : item.label;
+      }));
+      var otherItem = _.map(_.keys(optionItem_1), function (item) {
+        return {
+          label: item === 'label' ? i18n("891ec6336d4243714c25eecb2f8f774a") : item === 'value' ? i18n("684a0d1aeca4e9acff89221b57826d4d") : item,
+          value: item,
+          tag: typeof optionItem_1[item]
+        };
+      });
+      children.push.apply(children, otherItem);
+    }
+    var variablesArr = [{
+      label: i18n("fb7ea2b05ca7328ee16a562d90c2eb96"),
+      children: children
+    }];
+    return variablesArr;
+  }
+  return __assign({
+    type: 'ae-textareaFormulaControl',
+    mode: 'normal',
+    label: tipedLabel(i18n("1ca87f0171481e27d94e81b477150b7d"), i18n("d6ecb32a380c91887a9346653c2427e9")),
+    name: 'menuTpl',
+    variables: getOptionVars,
+    requiredDataPropsVariables: true
+  }, rest);
+});
 setSchemaTpl('menuTpl', {
-  type: 'ae-formulaControl',
-  label: tipedLabel(i18n("59cf15fe6b8d659c9bd2f86143534a06"), i18n("dc46b7f19799047a26fee668d49be0f3")),
+  type: 'ae-textareaFormulaControl',
+  mode: 'normal',
+  label: tipedLabel(i18n("59cf15fe6b8d659c9bd2f86143534a06"), i18n("d6ecb32a380c91887a9346653c2427e9")),
   name: 'menuTpl'
 });
 setSchemaTpl('expression', {
@@ -403,9 +446,8 @@ setSchemaTpl('expression', {
 });
 setSchemaTpl('icon', {
   label: i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
-  type: 'icon-picker',
+  type: 'icon-select',
   name: 'icon',
-  className: 'fix-icon-picker-overflow',
   placeholder: i18n("b7dee01f2d085d90c47bcb8b490d9055"),
   clearable: true,
   description: ''
@@ -459,27 +501,30 @@ setSchemaTpl('className', function (schema) {
 /**
  * combo 组件样式包装调整
  */
-
 setSchemaTpl('combo-container', function (config) {
-  var _a;
-
+  var _a, _b;
   if (isObject(config)) {
-    var itemsWrapperClassName = ['input-kv', 'combo'].includes(config.type) && 'ae-Combo-items ' + ((_a = config.itemsWrapperClassName) !== null && _a !== void 0 ? _a : '');
-    return __assign(__assign({}, config), itemsWrapperClassName ? {
+    var itemsWrapperClassName = void 0;
+    var itemClassName = void 0;
+    if (['input-kv', 'combo'].includes(config.type)) {
+      itemsWrapperClassName = 'ae-Combo-items ' + ((_a = config.itemsWrapperClassName) !== null && _a !== void 0 ? _a : '');
+      itemClassName = 'ae-Combo-item ' + ((_b = config.itemClassName) !== null && _b !== void 0 ? _b : '');
+    }
+    return __assign(__assign(__assign({}, config), itemsWrapperClassName ? {
       itemsWrapperClassName: itemsWrapperClassName
+    } : {}), itemClassName ? {
+      itemClassName: itemClassName
     } : {});
   }
-
   return config;
 });
 /**
  * 所有组件的状态
  */
-
 setSchemaTpl('status', function (config) {
   return {
     title: i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
-    body: [getSchemaTpl('newVisible'), getSchemaTpl('hidden'), (config === null || config === void 0 ? void 0 : config.readonly) ? getSchemaTpl('readonly') : null, (config === null || config === void 0 ? void 0 : config.disabled) || (config === null || config === void 0 ? void 0 : config.isFormItem) ? getSchemaTpl('disabled') : null, (config === null || config === void 0 ? void 0 : config.isFormItem) ? getSchemaTpl('clearValueOnHidden') : null].filter(Boolean)
+    body: [getSchemaTpl('newVisible'), getSchemaTpl('hidden'), !(config === null || config === void 0 ? void 0 : config.unsupportStatic) && (config === null || config === void 0 ? void 0 : config.isFormItem) ? getSchemaTpl('static') : null, (config === null || config === void 0 ? void 0 : config.readonly) ? getSchemaTpl('readonly') : null, (config === null || config === void 0 ? void 0 : config.disabled) || (config === null || config === void 0 ? void 0 : config.isFormItem) ? getSchemaTpl('disabled') : null, (config === null || config === void 0 ? void 0 : config.isFormItem) ? getSchemaTpl('clearValueOnHidden') : null].filter(Boolean)
   };
 });
 setSchemaTpl('autoFill', {
@@ -506,7 +551,6 @@ setSchemaTpl('required', {
 /**
  * 表单项描述description
  */
-
 setSchemaTpl('description', {
   name: 'description',
   type: 'textarea',
@@ -536,15 +580,22 @@ setSchemaTpl('visible', {
   mode: 'normal',
   name: 'visible',
   expressionName: 'visibleOn'
-}); // 新版配置面板兼容 [可见] 状态
-
+});
+setSchemaTpl('static', {
+  type: 'ae-StatusControl',
+  label: i18n("04f5f12c49c2a6fdc43da049591328ad"),
+  mode: 'normal',
+  name: 'static',
+  expressionName: 'staticOn'
+});
+// 新版配置面板兼容 [可见] 状态
 setSchemaTpl('newVisible', {
   type: 'ae-StatusControl',
   label: i18n("4d681c4aa93c8d005ec2ca2370618d6e"),
   mode: 'normal',
   name: 'visible',
   expressionName: 'visibleOn',
-  visibleOn: "data.visible || data.visible === false || data.visibleOn !== undefined"
+  visibleOn: 'data.visible || data.visible === false || data.visibleOn !== undefined'
 });
 setSchemaTpl('hidden', {
   type: 'ae-StatusControl',
@@ -589,12 +640,6 @@ setSchemaTpl('numberSwitchDefaultValue', {
     return value ? '' : undefined;
   }
 });
-setSchemaTpl('numberSwitchKeyboard', {
-  type: 'switch',
-  label: tipedLabel(i18n("32f13c9db34f638c2c5cf2bf19326ebf"), i18n("2882b15b04cb47d1497160b5061b9186")),
-  name: 'keyboard',
-  inputClassName: 'is-inline'
-});
 setSchemaTpl('kilobitSeparator', {
   type: 'switch',
   label: i18n("530c4483c7e52dc409509b755eabee11"),
@@ -787,11 +832,11 @@ setSchemaTpl('badge', {
   name: 'badge',
   type: 'ae-badge'
 });
+// 暂未使用
 setSchemaTpl('formulaControl', function (schema) {
   if (schema === void 0) {
     schema = {};
   }
-
   return __assign({
     type: 'ae-formulaControl'
   }, schema);
@@ -799,12 +844,10 @@ setSchemaTpl('formulaControl', function (schema) {
 /**
  * 日期范围快捷键组件
  */
-
 setSchemaTpl('dateShortCutControl', function (schema) {
   if (schema === void 0) {
     schema = {};
   }
-
   return __assign({
     type: 'ae-DateShortCutControl'
   }, schema);
@@ -813,7 +856,6 @@ setSchemaTpl('eventControl', function (schema) {
   if (schema === void 0) {
     schema = {};
   }
-
   return __assign({
     type: 'ae-eventControl',
     mode: 'normal'
@@ -834,39 +876,75 @@ setSchemaTpl('app-page', {
   options: []
 });
 setSchemaTpl('app-page-args', {
-  type: 'ae-DataMappingControl',
+  type: 'combo',
   name: 'params',
   label: i18n("0b72392143e4038e98128cb0f6f679b3"),
-  schema: {
-    "type": "object",
-    "properties": {}
+  multiple: true,
+  removable: true,
+  addable: true,
+  strictMode: false,
+  canAccessSuperData: true,
+  size: 'lg',
+  mode: 'horizontal',
+  items: [{
+    name: 'key',
+    type: 'input-text',
+    placeholder: i18n("c068b579db3bf0a553bd0af4f81cc14f"),
+    source: '${__pageInputSchema}',
+    labelField: 'label',
+    valueField: 'value',
+    required: true
   },
-  mode: 'horizontal'
+  /*
+   {
+    name: 'val',
+    type: 'input-formula',
+    placeholder: '参数值',
+    variables: '${variables}',
+    evalMode: false,
+    variableMode: 'tabs',
+    inputMode: 'input-group'
+  }
+   */
+  {
+    name: 'val',
+    type: 'ae-formulaControl',
+    variables: '${variables}',
+    placeholder: i18n("bfed4943c5f487de1b63a82f7230cce2")
+  }]
 });
 setSchemaTpl('iconLink', function (schema) {
   var name = schema.name,
-      visibleOn = schema.visibleOn;
-  return {
+    visibleOn = schema.visibleOn,
+    label = schema.label;
+  return getSchemaTpl('icon', {
     name: name,
     visibleOn: visibleOn,
-    label: i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
-    type: 'icon-picker',
-    className: 'fix-icon-picker-overflow',
+    label: label !== null && label !== void 0 ? label : i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
     placeholder: i18n("b7dee01f2d085d90c47bcb8b490d9055"),
     clearable: true,
     description: ''
-  };
+  });
 });
-setSchemaTpl('iconLink', function (schema) {
-  var name = schema.name,
-      visibleOn = schema.visibleOn;
-  return {
-    name: name,
-    visibleOn: visibleOn,
-    label: i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
-    type: 'icon-picker',
-    placeholder: i18n("b7dee01f2d085d90c47bcb8b490d9055"),
-    clearable: true,
-    description: ''
-  };
+setSchemaTpl('virtualThreshold', {
+  name: 'virtualThreshold',
+  type: 'input-number',
+  min: 1,
+  step: 1,
+  precision: 0,
+  label: tipedLabel(i18n("03bfb834c8a5fef58d885e448a4e13b4"), i18n("50437e080edc71ab624c93d419472919")),
+  pipeOut: function (value) {
+    return value || undefined;
+  }
+});
+setSchemaTpl('virtualItemHeight', {
+  name: 'itemHeight',
+  type: 'input-number',
+  min: 1,
+  step: 1,
+  precision: 0,
+  label: tipedLabel(i18n("02b9880e1d2df8a07e90e9878080c739"), i18n("a3f66655c3d2bcfecc6afba0e4424460")),
+  pipeOut: function (value) {
+    return value || undefined;
+  }
 });

package/esm/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -57,7 +57,7 @@ setSchemaTpl('leftRate', {
 });
 setSchemaTpl('horizontal', function (config) {
   return [__assign({
-    type: 'button-group-select',
+    type: 'select',
     label: i18n("73ec114993142f627ab6c3e6706fa3c3"),
     name: 'horizontal',
     options: [{
@@ -74,11 +74,9 @@ setSchemaTpl('horizontal', function (config) {
       if (!v) {
         return 'formHorizontal';
       }
-
       if (v.leftFixed) {
         return 'leftFixed';
       }
-
       return 'leftRate';
     },
     pipeOut: function (v) {
@@ -91,8 +89,8 @@ setSchemaTpl('horizontal', function (config) {
           left: 3,
           right: 9
         }
-      }; // @ts-ignore
-
+      };
+      // @ts-ignore
       return defaultData[v];
     },
     visibleOn: 'this.mode == "horizontal" && this.label !== false'

package/esm/tpl/index.d.ts

@@ -4,4 +4,5 @@ import './api';
 import './options';
 import './validations';
 import './style';
+import './layout';
 export * from './style';

package/esm/tpl/layout.d.ts

@@ -0,0 +1 @@
+export {};