amis-editor 5.6.2 → 5.7.0

package/lib/tpl/horizontal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -259,4 +259,4 @@ amisEditorCore.setSchemaTpl('subFormHorizontal', {
     }
   }]
 });
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/tpl/layout.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -32,20 +32,22 @@ amisEditorCore.setSchemaTpl('layout:position', function (config) {
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
     onChange: function (value, oldValue, model, form) {
       if (value === 'static') {
-        form.setValueByName('style.inset', undefined);
-        form.setValueByName('style.zIndex', undefined);
-        form.setValueByName('originPosition', undefined);
+        form.deleteValueByName('style.inset');
+        form.deleteValueByName('style.zIndex');
+        form.deleteValueByName('originPosition');
       } else if (value === 'fixed' || value === 'absolute') {
-        // 默认使用右下角进行相对定位
+        form.setValueByName('style.zIndex', 1); // 避免被页面其他内容元素遮挡（导致不能选中）
         form.setValueByName('style.inset', 'auto 50px 50px auto');
+        // 默认使用右下角进行相对定位
         form.setValueByName('originPosition', 'right-bottom');
       } else if (value === 'relative') {
+        form.setValueByName('style.zIndex', 1);
         form.setValueByName('style.inset', 'auto');
-        form.setValueByName('originPosition', undefined);
+        form.deleteValueByName('originPosition');
       }
       if (value !== 'sticky') {
         // 非滚动吸附定位
-        form.setValueByName('stickyStatus', undefined);
+        form.deleteValueByName('stickyStatus');
       }
     },
     options: [{
@@ -173,10 +175,10 @@ amisEditorCore.setSchemaTpl('layout:display', function (config) {
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
     onChange: function (value, oldValue, model, form) {
       if (value !== 'flex' && value !== 'inline-flex') {
-        form.setValueByName('style.flexDirection', undefined);
-        form.setValueByName('style.justifyContent', undefined);
-        form.setValueByName('style.alignItems', undefined);
-        form.setValueByName('style.flexWrap', undefined);
+        form.deleteValueByName('style.flexDirection');
+        form.deleteValueByName('style.justifyContent');
+        form.deleteValueByName('style.alignItems');
+        form.deleteValueByName('style.flexWrap');
       }
     }
   };
@@ -363,31 +365,31 @@ amisEditorCore.setSchemaTpl('layout:flex', function (config) {
         // 弹性
         if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
           // form.setValueByName('style.overflowY', 'auto');
-          form.setValueByName('style.height', undefined);
+          form.deleteValueByName('style.height');
         } else {
           // form.setValueByName('style.overflowX', 'auto');
-          form.setValueByName('style.width', undefined);
+          form.deleteValueByName('style.width');
         }
       } else if (value === '0 0 150px') {
         // 固定
-        form.setValueByName('style.flexGrow', undefined);
+        form.deleteValueByName('style.flexGrow');
         form.setValueByName('style.flexBasis', '150px');
         if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
-          form.setValueByName('style.height', undefined);
+          form.deleteValueByName('style.height');
         } else {
-          form.setValueByName('style.width', undefined);
+          form.deleteValueByName('style.width');
         }
       } else if (value === '0 0 auto') {
         // 适配
-        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);
+        form.deleteValueByName('style.flexGrow');
+        form.deleteValueByName('style.flexBasis');
+        form.deleteValueByName('style.overflowX');
+        form.deleteValueByName('style.overflowY');
+        form.deleteValueByName('style.overflow');
         if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
-          form.setValueByName('style.height', undefined);
+          form.deleteValueByName('style.height');
         } else {
-          form.setValueByName('style.width', undefined);
+          form.deleteValueByName('style.width');
         }
       }
     }
@@ -453,11 +455,11 @@ amisEditorCore.setSchemaTpl('layout:isFixedWidth', function (config) {
     onChange: function (value, oldValue, model, form) {
       if (value) {
         // 固定宽度时，剔除最大宽度、最小宽度
-        form.setValueByName('style.maxWidth', undefined);
-        form.setValueByName('style.minWidth', undefined);
+        form.deleteValueByName('style.maxWidth');
+        form.deleteValueByName('style.minWidth');
       } else {
         // 非固定宽度时，剔除宽度数值
-        form.setValueByName('style.width', undefined);
+        form.deleteValueByName('style.width');
       }
       if (config === null || config === void 0 ? void 0 : config.onChange) {
         config.onChange(value);
@@ -607,11 +609,11 @@ amisEditorCore.setSchemaTpl('layout:isFixedHeight', function (config) {
     onChange: function (value, oldValue, model, form) {
       if (value) {
         // 固定高度时，剔除最大高度、最小高度
-        form.setValueByName('style.maxHeight', undefined);
-        form.setValueByName('style.minHeight', undefined);
+        form.deleteValueByName('style.maxHeight');
+        form.deleteValueByName('style.minHeight');
       } else {
         // 非固定高度时，剔除高度数值
-        form.setValueByName('style.height', undefined);
+        form.deleteValueByName('style.height');
       }
       if (config === null || config === void 0 ? void 0 : config.onChange) {
         config.onChange(value);
@@ -763,7 +765,7 @@ amisEditorCore.setSchemaTpl('layout:margin-center', function (config) {
           } else {
             form.setValueByName('style.inset', 'auto 0px auto auto');
           }
-          form.setValueByName('style.transform', undefined);
+          form.deleteValueByName('style.transform');
         } else {
           // 靠左
           if (((_j = form.data) === null || _j === void 0 ? void 0 : _j.sorptionPosition) === 'top') {
@@ -775,11 +777,11 @@ amisEditorCore.setSchemaTpl('layout:margin-center', function (config) {
           } else {
             form.setValueByName('style.inset', 'auto auto auto 0px');
           }
-          form.setValueByName('style.transform', undefined);
+          form.deleteValueByName('style.transform');
         }
       } else {
         // 靠左
-        form.setValueByName('style.transform', undefined);
+        form.deleteValueByName('style.transform');
       }
     }
   };
@@ -869,8 +871,8 @@ amisEditorCore.setSchemaTpl('layout:sticky', {
       form.setValueByName('style.zIndex', 10);
     } else {
       form.setValueByName('style.position', 'static');
-      form.setValueByName('style.inset', undefined);
-      form.setValueByName('style.zIndex', undefined);
+      form.deleteValueByName('style.inset');
+      form.deleteValueByName('style.zIndex');
     }
   }
 });
@@ -986,4 +988,4 @@ amisEditorCore.setSchemaTpl('layout:wrapper-contanier', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn
   };
 });
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/tpl/options.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -318,7 +318,6 @@ amisEditorCore.setSchemaTpl('navControl', {
   type: 'ae-navSourceControl',
   closeDefaultCheck: true // 关闭默认值设置
 });
-
 amisEditorCore.setSchemaTpl('optionControl', {
   label: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
   mode: 'normal',
@@ -643,4 +642,4 @@ amisEditorCore.setSchemaTpl('optionDeleteControl', function (params) {
     }
   }));
 });
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/tpl/remark.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -20,4 +20,4 @@ amisEditorCore.setSchemaTpl('labelRemark', BaseControl.remarkTpl({
   label: i18nRuntime.i18n("3ba265c6b63bde0319822afd6b9a649d"),
   labelRemark: i18nRuntime.i18n("7ad83bbe4646a0011ece7fd338d1e189")
 }));
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/tpl/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -613,4 +613,4 @@ amisEditorCore.setSchemaTpl('theme:common', function (option) {
     return !~exclude.indexOf(item.key || '');
   });
 });
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/tpl/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -493,4 +493,4 @@ amisEditorCore.setSchemaTpl('validationControl', function (value) {
     value: value
   };
 });
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/util.d.ts

@@ -26,3 +26,10 @@ export declare const resolveOptionType: (options: any) => "string" | "number" |
  * @returns 转义后的配置
  */
 export declare function escapeFormula(conf: any, keys?: string[]): any;
+/**
+ * 判断给定的 schema 是否为 model 组件
+ *
+ * @param schema schema 对象
+ * @returns 如果给定的 schema 是 model 组件则返回 true，否则返回 false
+ */
+export declare function _isModelComp(schema: Record<string, any>): boolean;

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -75,11 +75,40 @@ function escapeFormula(conf, keys) {
         return value;
     });
 }
+/**
+ * 判断给定的 schema 是否为 model 组件
+ *
+ * @param schema schema 对象
+ * @returns 如果给定的 schema 是 model 组件则返回 true，否则返回 false
+ */
+function _isModelComp(schema) {
+    var _a, _b;
+    if (!schema) {
+        return false;
+    }
+    if (schema.hasOwnProperty('$$m') &&
+        (((_a = schema.$$m) === null || _a === void 0 ? void 0 : _a.type) === 'list' || ((_b = schema.$$m) === null || _b === void 0 ? void 0 : _b.type) === 'form')) {
+        return true;
+    }
+    var extraEvaluation = ['source', 'api', 'initApi'].some(function (key) {
+        var _a;
+        if ((schema === null || schema === void 0 ? void 0 : schema[key]) && typeof schema[key] === 'string') {
+            return schema === null || schema === void 0 ? void 0 : schema[key].startsWith('model://');
+        }
+        if (((_a = schema === null || schema === void 0 ? void 0 : schema[key]) === null || _a === void 0 ? void 0 : _a.url) && typeof schema[key].url === 'string') {
+            return (schema[key].url.startsWith('model://') &&
+                !schema[key].hasOwnProperty('strategy'));
+        }
+        return false;
+    });
+    return extraEvaluation;
+}
 
+exports._isModelComp = _isModelComp;
 exports.escapeFormula = escapeFormula;
 exports.isAuto = isAuto;
 exports.resolveArrayDatasource = resolveArrayDatasource;
 exports.resolveOptionType = resolveOptionType;
 exports.schemaArrayFormat = schemaArrayFormat;
 exports.schemaToArray = schemaToArray;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.7.0
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -318,4 +318,4 @@ registerValidator.apply(void 0, tslib.__spreadArray([{
 exports.getValidator = getValidator;
 exports.getValidatorsByTag = getValidatorsByTag;
 exports.registerValidator = registerValidator;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.6.2",
+  "version": "5.7.0",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -42,14 +42,14 @@
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "amis-editor-core": "*",
+    "amis-theme-editor-helper": "*",
     "amis-postcss": "1.0.0",
-    "amis-theme-editor": "*",
     "i18n-runtime": "*",
     "lodash": "^4.17.15",
     "mobx-state-tree": "^3.17.3"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.3",
+    "@fortawesome/fontawesome-free": "^6.1.1",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
@@ -102,8 +102,8 @@
     "amis": "*",
     "amis-core": "*",
     "amis-formula": "*",
-    "amis-theme-editor": "*",
     "amis-ui": "*",
+    "amis-theme-editor-helper": "*",
     "i18n-runtime": "*",
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"