amis-editor 5.4.1 → 5.6.0-beta.0

package/lib/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -216,7 +216,7 @@ amisEditorCore.setSchemaTpl('layout:justifyContent', function (config) {
   }];
   var configSchema = {
     type: 'select',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel("\u6C34\u5E73\u5BF9\u9F50\u65B9\u5F0F", i18nRuntime.i18n("0a0574baedb8eb2abf7daf25159d8bb1")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("dde193342b8c350ae29795117c0c5b9a"), i18nRuntime.i18n("0a0574baedb8eb2abf7daf25159d8bb1")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.justifyContent',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'flex-start',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -257,7 +257,7 @@ amisEditorCore.setSchemaTpl('layout:alignItems', function (config) {
   }];
   var configSchema = {
     type: 'select',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel("\u5782\u76F4\u5BF9\u9F50\u65B9\u5F0F", i18nRuntime.i18n("5ccc4c05cd41195f202f550a4c307a64")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("5b15af1f73b4f2d5bb152410863602f4"), i18nRuntime.i18n("5ccc4c05cd41195f202f550a4c307a64")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.alignItems',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'stretch',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -378,6 +378,9 @@ amisEditorCore.setSchemaTpl('layout:flex', function (config) {
         // 适配
         form.setValueByName('style.flexGrow', undefined);
         form.setValueByName('style.flexBasis', undefined);
+        form.setValueByName('style.overflowX', undefined);
+        form.setValueByName('style.overflowY', undefined);
+        form.setValueByName('style.overflow', undefined);
         if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
           form.setValueByName('style.height', undefined);
         } else {
@@ -559,7 +562,7 @@ amisEditorCore.setSchemaTpl('layout:overflow-x', function (config) {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("c18457fe4f249f06b48297ccfe6224e8"), i18nRuntime.i18n("c2ed47a1f0f45cf7e2d22bddffc8a732")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.overflowX',
-    value: (config === null || config === void 0 ? void 0 : config.value) || 'auto',
+    value: (config === null || config === void 0 ? void 0 : config.value) || 'visible',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
@@ -690,7 +693,7 @@ amisEditorCore.setSchemaTpl('layout:overflow-y', function (config) {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("ff9e9329fe186be342ef59ee711b9371"), i18nRuntime.i18n("b31c6aaa78f8e24df665ce80ab5301e2")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.overflowY',
-    value: (config === null || config === void 0 ? void 0 : config.value) || 'auto',
+    value: (config === null || config === void 0 ? void 0 : config.value) || 'visible',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,

package/lib/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -128,6 +128,7 @@ amisEditorCore.setSchemaTpl('multiple', function (schema) {
     label: i18nRuntime.i18n("e3be7b8a459a08fec8f378a0660b642b"),
     value: false,
     hiddenOnDefault: true,
+    clearChildValuesOnOff: false,
     formType: 'extend'
   }, schema.patch || {}), {
     form: {
@@ -135,6 +136,24 @@ amisEditorCore.setSchemaTpl('multiple', function (schema) {
     }
   });
 });
+amisEditorCore.setSchemaTpl('strictMode', {
+  type: 'switch',
+  label: i18nRuntime.i18n("98d52b737d6bc171b6d5bad9a42f6e23"),
+  name: 'strictMode',
+  value: false,
+  mode: 'horizontal',
+  horizontal: {
+    justify: true,
+    left: 8
+  },
+  inputClassName: 'is-inline ',
+  labelRemark: {
+    trigger: ['hover', 'focus'],
+    setting: true,
+    title: '',
+    content: i18nRuntime.i18n("fa66d1acaef7cd181f21f5fc2895becc")
+  }
+});
 amisEditorCore.setSchemaTpl('checkAllLabel', {
   type: 'input-text',
   name: 'checkAllLabel',

package/lib/tpl/remark.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -517,7 +517,12 @@ amisEditorCore.setSchemaTpl('theme:size', function (option) {
     options: '${sizesOptions}'
   }, option);
 });
-amisEditorCore.setSchemaTpl('theme:common', function (exclude, include) {
+amisEditorCore.setSchemaTpl('theme:common', function (option) {
+  var _a = option || {},
+    exclude = _a.exclude,
+    include = _a.include,
+    collapsed = _a.collapsed;
+  var curCollapsed = collapsed !== null && collapsed !== void 0 ? collapsed : false; // 默认都展开
   // key统一转换成Kebab case，eg: boxShadow => bos-shadow
   exclude = (exclude ? Array.isArray(exclude) ? exclude : [exclude] : []).map(function (key) {
     return kebabCase__default["default"](key);
@@ -546,6 +551,7 @@ amisEditorCore.setSchemaTpl('theme:common', function (exclude, include) {
   return [{
     header: i18nRuntime.i18n("5aefca559c5a41d10078e21e6d616825"),
     key: 'layout',
+    collapsed: curCollapsed,
     body: [{
       type: 'style-display',
       label: false,
@@ -555,9 +561,11 @@ amisEditorCore.setSchemaTpl('theme:common', function (exclude, include) {
     })
   }, {
     title: i18nRuntime.i18n("f01c3cd99ecb0c534cc47081d3433c9f"),
+    collapsed: curCollapsed,
     body: styles
   }, {
     title: i18nRuntime.i18n("86bf16f0cb7fd8b1fef2e1439e06b632"),
+    collapsed: curCollapsed,
     body: [{
       type: 'theme-cssCode',
       label: false,

package/lib/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/util.d.ts

@@ -1,25 +1,3 @@
-import { ActionConfig } from './renderer/event-control/types';
-/**
- * 获取事件动作面板所需属性配置
- */
-export declare const getEventControlConfig: (manager: EditorManager, context: BaseEventContext) => {
-    showOldEntry: boolean;
-    actions: any;
-    events: any;
-    actionTree: any;
-    commonActions: any;
-    owner: string;
-    addBroadcast: any;
-    removeBroadcast: any;
-    getContextSchemas: (id?: string, withoutSuper?: boolean) => Promise<any>;
-    getComponents: (action: RendererPluginAction) => any;
-    actionConfigInitFormatter: (action: ActionConfig) => {
-        actionType: any;
-    };
-    actionConfigSubmitFormatter: (config: ActionConfig) => {
-        [x: string]: any;
-    };
-};
 /**
  * 布局配置项，数值设置时需要
  */
@@ -34,3 +12,9 @@ export declare const resolveArrayDatasource: ({ data, value, source }: {
 }, defaultSource?: string) => any;
 export declare const schemaToArray: (value: any) => any[];
 export declare const schemaArrayFormat: (value: any) => any;
+/**
+ * 解析选项值类型
+ * @param options
+ * @returns
+ */
+export declare const resolveOptionType: (options: any) => "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";

package/lib/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -7,9 +7,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('tslib');
 var amis = require('amis');
-require('./renderer/event-control/helper.js');
 var isString = require('lodash/isString');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -42,8 +40,27 @@ var schemaToArray = function (value) {
 var schemaArrayFormat = function (value) {
     return value && Array.isArray(value) && value.length === 1 ? value[0] : value;
 };
+/**
+ * 解析选项值类型
+ * @param options
+ * @returns
+ */
+var resolveOptionType = function (options) {
+    var _a;
+    if (!options) {
+        return 'string';
+    }
+    // 默认options内选项是同类型
+    var option = options[0];
+    if (typeof option === 'object') {
+        option = amis.findTree(options, function (item) { return item.value !== undefined; });
+    }
+    var value = (_a = option === null || option === void 0 ? void 0 : option.value) !== null && _a !== void 0 ? _a : option;
+    return value !== undefined ? typeof value : 'string';
+};
 
 exports.isAuto = isAuto;
 exports.resolveArrayDatasource = resolveArrayDatasource;
+exports.resolveOptionType = resolveOptionType;
 exports.schemaArrayFormat = schemaArrayFormat;
 exports.schemaToArray = schemaToArray;

package/lib/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -17,10 +17,10 @@ var Validators = [];
  */
 exports.ValidationGroup = void 0;
 (function (ValidationGroup) {
-  ValidationGroup["Pattern"] = "\u6587\u672C";
-  ValidationGroup["Number"] = "\u6570\u5B57";
-  ValidationGroup["Regex"] = "\u6B63\u5219";
-  ValidationGroup["Others"] = "\u5176\u4ED6";
+  ValidationGroup["Pattern"] = i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb");
+  ValidationGroup["Number"] = i18nRuntime.i18n("55d4790c5d819cd0462cbe89561b0dd4");
+  ValidationGroup["Regex"] = i18nRuntime.i18n("ed3dd0bfa89500c5feb306cd4d9db56c");
+  ValidationGroup["Others"] = i18nRuntime.i18n("0d98c74797e49d00bcc4c17c9d557a2b");
 })(exports.ValidationGroup || (exports.ValidationGroup = {}));
 var ValidTagMatchType;
 (function (ValidTagMatchType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.4.1",
+  "version": "5.6.0-beta.0",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -22,6 +22,7 @@
   "scripts": {
     "test": "echo \"Warnings: no test specified\"",
     "build": "npm run clean-dist && NODE_ENV=production rollup -c ",
+    "build-esm": "npm run clean-dist && NODE_ENV=production rollup -c rollup.esm.config.js",
     "clean-dist": "rimraf lib/** esm/**",
     "i18n:update": "npx i18n update --config=./i18nConfig.js",
     "i18n:translate": "npx i18n translate --config=./i18nConfig.js --l=en-US",

package/esm/renderer/textarea-formula/utils.d.ts

@@ -1,12 +0,0 @@
-/**
- * 从amis数据域中取变量数据
- * @param node
- * @param manager
- * @returns
- */
-export declare function resolveVariablesFromScope(node: any, manager: any): Promise<any[]>;
-/**
- * 整合 props & amis数据域 中的 variables
- * @param that  为组件的实例 this
- **/
-export declare function getVariables(that: any): Promise<any>;

package/esm/renderer/textarea-formula/utils.js

@@ -1,99 +0,0 @@
-/**
- * amis-editor v5.4.0
- * Copyright 2018-2023 @fex
- */
-
-import { __awaiter, __generator, __assign, __spreadArray, __read } from 'tslib';
-import { isExpression, resolveVariableAndFilter } from 'amis-core';
-import { translateSchema } from 'amis-editor-core';
-import { i18n } from 'i18n-runtime';
-
-function resolveVariablesFromScope(node, manager) {
-  var _a, _b;
-  return __awaiter(this, void 0, void 0, function () {
-    var dataPropsAsOptions, variables, systemVarIndex_1;
-    return __generator(this, function (_c) {
-      switch (_c.label) {
-        case 0:
-          return [4 /*yield*/, manager === null || manager === void 0 ? void 0 : manager.getContextSchemas(node)];
-        case 1:
-          _c.sent();
-          return [4 /*yield*/, (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions()];
-        case 2:
-          dataPropsAsOptions = _c.sent();
-          variables = ((_b = manager === null || manager === void 0 ? void 0 : manager.variableManager) === null || _b === void 0 ? void 0 : _b.getVariableFormulaOptions()) || [];
-          if (dataPropsAsOptions) {
-            systemVarIndex_1 = dataPropsAsOptions.findIndex(function (item) {
-              return item.label === i18n("979a50681e278dcc0be18f68459e8217");
-            });
-            if (!!~systemVarIndex_1) {
-              variables.forEach(function (item) {
-                if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
-                  dataPropsAsOptions.splice(systemVarIndex_1, 0, item);
-                }
-              });
-            } else {
-              variables.forEach(function (item) {
-                if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
-                  dataPropsAsOptions.push(item);
-                }
-              });
-            }
-            return [2 /*return*/, dataPropsAsOptions.map(function (item) {
-              return __assign({
-                selectMode: 'tree'
-              }, item);
-            }).filter(function (item) {
-              var _a;
-              return (_a = item.children) === null || _a === void 0 ? void 0 : _a.length;
-            })];
-          }
-          return [2 /*return*/, []];
-      }
-    });
-  });
-}
-/**
- * 整合 props & amis数据域 中的 variables
- * @param that  为组件的实例 this
- **/
-function getVariables(that) {
-  return __awaiter(this, void 0, void 0, function () {
-    var variablesArr, _a, variables, requiredDataPropsVariables, _b, node, manager, vars;
-    return __generator(this, function (_c) {
-      switch (_c.label) {
-        case 0:
-          variablesArr = [];
-          _a = that.props, variables = _a.variables, requiredDataPropsVariables = _a.requiredDataPropsVariables;
-          if (!(!variables || requiredDataPropsVariables)) return [3 /*break*/, 2];
-          _b = that.props.formProps || that.props, node = _b.node, manager = _b.manager;
-          return [4 /*yield*/, resolveVariablesFromScope(node, manager)];
-        case 1:
-          vars = _c.sent();
-          if (Array.isArray(vars)) {
-            if (!that.isUnmount) {
-              variablesArr = vars;
-            }
-          }
-          _c.label = 2;
-        case 2:
-          if (variables) {
-            if (Array.isArray(variables)) {
-              variablesArr = __spreadArray(__spreadArray([], __read(variables), false), __read(variablesArr), false);
-            } else if (typeof variables === 'function') {
-              variablesArr = __spreadArray(__spreadArray([], __read(variables(that)), false), __read(variablesArr), false);
-            } else if (isExpression(variables)) {
-              variablesArr = __spreadArray(__spreadArray([], __read(resolveVariableAndFilter(that.props.variables, that.props.data, '| raw')), false), __read(variablesArr), false);
-            }
-          }
-          // 如果存在应用语言类型，则进行翻译
-          if (that.appLocale && that.appCorpusData) {
-            return [2 /*return*/, translateSchema(variablesArr, that.appCorpusData)];
-          }
-          return [2 /*return*/, variablesArr];
-      }
-    });
-  });
-}
-
-export { getVariables, resolveVariablesFromScope };

package/lib/renderer/textarea-formula/utils.d.ts

@@ -1,12 +0,0 @@
-/**
- * 从amis数据域中取变量数据
- * @param node
- * @param manager
- * @returns
- */
-export declare function resolveVariablesFromScope(node: any, manager: any): Promise<any[]>;
-/**
- * 整合 props & amis数据域 中的 variables
- * @param that  为组件的实例 this
- **/
-export declare function getVariables(that: any): Promise<any>;

package/lib/renderer/textarea-formula/utils.js

@@ -1,104 +0,0 @@
-/**
- * amis-editor v5.4.0
- * Copyright 2018-2023 @fex
- */
-
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var tslib = require('tslib');
-var amisCore = require('amis-core');
-var amisEditorCore = require('amis-editor-core');
-var i18nRuntime = require('i18n-runtime');
-
-function resolveVariablesFromScope(node, manager) {
-  var _a, _b;
-  return tslib.__awaiter(this, void 0, void 0, function () {
-    var dataPropsAsOptions, variables, systemVarIndex_1;
-    return tslib.__generator(this, function (_c) {
-      switch (_c.label) {
-        case 0:
-          return [4 /*yield*/, manager === null || manager === void 0 ? void 0 : manager.getContextSchemas(node)];
-        case 1:
-          _c.sent();
-          return [4 /*yield*/, (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions()];
-        case 2:
-          dataPropsAsOptions = _c.sent();
-          variables = ((_b = manager === null || manager === void 0 ? void 0 : manager.variableManager) === null || _b === void 0 ? void 0 : _b.getVariableFormulaOptions()) || [];
-          if (dataPropsAsOptions) {
-            systemVarIndex_1 = dataPropsAsOptions.findIndex(function (item) {
-              return item.label === i18nRuntime.i18n("979a50681e278dcc0be18f68459e8217");
-            });
-            if (!!~systemVarIndex_1) {
-              variables.forEach(function (item) {
-                if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
-                  dataPropsAsOptions.splice(systemVarIndex_1, 0, item);
-                }
-              });
-            } else {
-              variables.forEach(function (item) {
-                if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
-                  dataPropsAsOptions.push(item);
-                }
-              });
-            }
-            return [2 /*return*/, dataPropsAsOptions.map(function (item) {
-              return tslib.__assign({
-                selectMode: 'tree'
-              }, item);
-            }).filter(function (item) {
-              var _a;
-              return (_a = item.children) === null || _a === void 0 ? void 0 : _a.length;
-            })];
-          }
-          return [2 /*return*/, []];
-      }
-    });
-  });
-}
-/**
- * 整合 props & amis数据域 中的 variables
- * @param that  为组件的实例 this
- **/
-function getVariables(that) {
-  return tslib.__awaiter(this, void 0, void 0, function () {
-    var variablesArr, _a, variables, requiredDataPropsVariables, _b, node, manager, vars;
-    return tslib.__generator(this, function (_c) {
-      switch (_c.label) {
-        case 0:
-          variablesArr = [];
-          _a = that.props, variables = _a.variables, requiredDataPropsVariables = _a.requiredDataPropsVariables;
-          if (!(!variables || requiredDataPropsVariables)) return [3 /*break*/, 2];
-          _b = that.props.formProps || that.props, node = _b.node, manager = _b.manager;
-          return [4 /*yield*/, resolveVariablesFromScope(node, manager)];
-        case 1:
-          vars = _c.sent();
-          if (Array.isArray(vars)) {
-            if (!that.isUnmount) {
-              variablesArr = vars;
-            }
-          }
-          _c.label = 2;
-        case 2:
-          if (variables) {
-            if (Array.isArray(variables)) {
-              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables), false), tslib.__read(variablesArr), false);
-            } else if (typeof variables === 'function') {
-              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables(that)), false), tslib.__read(variablesArr), false);
-            } else if (amisCore.isExpression(variables)) {
-              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(amisCore.resolveVariableAndFilter(that.props.variables, that.props.data, '| raw')), false), tslib.__read(variablesArr), false);
-            }
-          }
-          // 如果存在应用语言类型，则进行翻译
-          if (that.appLocale && that.appCorpusData) {
-            return [2 /*return*/, amisEditorCore.translateSchema(variablesArr, that.appCorpusData)];
-          }
-          return [2 /*return*/, variablesArr];
-      }
-    });
-  });
-}
-
-exports.getVariables = getVariables;
-exports.resolveVariablesFromScope = resolveVariablesFromScope;