amis-editor 6.0.0 → 6.2.1

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

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -236,4 +236,4 @@ var FormulaPlugin = /** @class */ (function () {
 
 exports.FormulaPlugin = FormulaPlugin;
 exports.editorFactory = editorFactory;
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/api.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -552,4 +552,4 @@ amisEditorCore.setSchemaTpl('loadingConfig', function (patch, _a) {
     }
   });
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/common.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -1434,4 +1434,4 @@ amisEditorCore.setSchemaTpl('deferField', {
   type: 'input-text',
   placeholder: i18nRuntime.i18n("37a3bfd0cf20cc17c53396a1077c0852")
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/horizontal.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -259,4 +259,4 @@ amisEditorCore.setSchemaTpl('subFormHorizontal', {
     }
   }]
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/layout.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -475,7 +475,7 @@ amisEditorCore.setSchemaTpl('layout:width', function (config) {
     label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.width',
     value: (config === null || config === void 0 ? void 0 : config.value) || '300px',
-    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "".concat(config === null || config === void 0 ? void 0 : config.visibleOn, " && data.isFixedWidth") : 'data.isFixedWidth',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "(".concat(config === null || config === void 0 ? void 0 : config.visibleOn, ") && data.isFixedWidth") : 'data.isFixedWidth',
     clearable: true,
     unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -522,7 +522,7 @@ amisEditorCore.setSchemaTpl('layout:max-width', function (config) {
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.maxWidth',
     value: config === null || config === void 0 ? void 0 : config.value,
     min: '${style.minWidth | toInt}',
-    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "".concat(config === null || config === void 0 ? void 0 : config.visibleOn, " && !data.isFixedWidth") : '!data.isFixedWidth',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "(".concat(config === null || config === void 0 ? void 0 : config.visibleOn, ") && !data.isFixedWidth") : '!data.isFixedWidth',
     clearable: true,
     unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -546,7 +546,7 @@ amisEditorCore.setSchemaTpl('layout:min-width', function (config) {
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.minWidth',
     value: config === null || config === void 0 ? void 0 : config.value,
     max: '${style.maxWidth | toInt}',
-    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "".concat(config === null || config === void 0 ? void 0 : config.visibleOn, " && !data.isFixedWidth") : '!data.isFixedWidth',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "(".concat(config === null || config === void 0 ? void 0 : config.visibleOn, ") && !data.isFixedWidth") : '!data.isFixedWidth',
     clearable: true,
     unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -629,7 +629,7 @@ amisEditorCore.setSchemaTpl('layout:height', function (config) {
     label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("c1df04eec5fa0857bc0df2d68d8e953c"),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.height',
     value: (config === null || config === void 0 ? void 0 : config.value) || '300px',
-    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "".concat(config === null || config === void 0 ? void 0 : config.visibleOn, " && data.isFixedHeight") : 'data.isFixedHeight',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "(".concat(config === null || config === void 0 ? void 0 : config.visibleOn, ") && data.isFixedHeight") : 'data.isFixedHeight',
     clearable: true,
     unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -653,7 +653,7 @@ amisEditorCore.setSchemaTpl('layout:max-height', function (config) {
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.maxHeight',
     value: config === null || config === void 0 ? void 0 : config.value,
     min: '${style.minHeight | toInt}',
-    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "".concat(config === null || config === void 0 ? void 0 : config.visibleOn, " && !data.isFixedHeight") : '!data.isFixedHeight',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "(".concat(config === null || config === void 0 ? void 0 : config.visibleOn, ") && !data.isFixedHeight") : '!data.isFixedHeight',
     clearable: true,
     unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -677,7 +677,7 @@ amisEditorCore.setSchemaTpl('layout:min-height', function (config) {
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.minHeight',
     value: config === null || config === void 0 ? void 0 : config.value,
     max: '${style.maxHeight | toInt}',
-    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "".concat(config === null || config === void 0 ? void 0 : config.visibleOn, " && !data.isFixedHeight") : '!data.isFixedHeight',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) ? "(".concat(config === null || config === void 0 ? void 0 : config.visibleOn, ") && !data.isFixedHeight") : '!data.isFixedHeight',
     clearable: true,
     unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -717,7 +717,7 @@ amisEditorCore.setSchemaTpl('layout:overflow-y', function (config) {
     }]
   };
 });
-// 居中显示
+// 对齐方式
 amisEditorCore.setSchemaTpl('layout:margin-center', function (config) {
   var _a;
   return {
@@ -725,7 +725,7 @@ amisEditorCore.setSchemaTpl('layout:margin-center', function (config) {
     size: 'xs',
     label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("d5bc35360607472de4525358af126de4"), i18nRuntime.i18n("052f93928af33d4d7035e7c8e8a73f17")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.margin',
-    value: (config === null || config === void 0 ? void 0 : config.value) || '0',
+    value: config === null || config === void 0 ? void 0 : config.value,
     inputClassName: 'inline-flex justify-between',
     visibleOn: (_a = config === null || config === void 0 ? void 0 : config.visibleOn) !== null && _a !== void 0 ? _a : 'data.isFixedWidth || data.style && data.style.maxWidth',
     options: [{
@@ -738,6 +738,12 @@ amisEditorCore.setSchemaTpl('layout:margin-center', function (config) {
       label: i18nRuntime.i18n("fc0f19e9e47e352d36d36cf6eb653210"),
       value: 'auto 0px auto auto'
     }],
+    pipeIn: (config === null || config === void 0 ? void 0 : config.pipeIn) ? config === null || config === void 0 ? void 0 : config.pipeIn : function (value, data) {
+      var _a, _b, _c, _d;
+      var themeCssValue = (_d = (_c = (_b = (_a = data.data) === null || _a === void 0 ? void 0 : _a.themeCss) === null || _b === void 0 ? void 0 : _b.baseControlClassName) === null || _c === void 0 ? void 0 : _c['padding-and-margin:default']) === null || _d === void 0 ? void 0 : _d.margin;
+      return value || themeCssValue;
+    },
+    pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
     onChange: function (value, oldValue, model, form) {
       var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
       if (((_b = (_a = form === null || form === void 0 ? void 0 : form.data) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.position) === 'fixed' || ((_d = (_c = form === null || form === void 0 ? void 0 : form.data) === null || _c === void 0 ? void 0 : _c.style) === null || _d === void 0 ? void 0 : _d.position) === 'absolute') {
@@ -976,7 +982,9 @@ amisEditorCore.setSchemaTpl('layout:flex-setting', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     direction: config === null || config === void 0 ? void 0 : config.direction,
     justify: config === null || config === void 0 ? void 0 : config.justify,
-    alignItems: config === null || config === void 0 ? void 0 : config.alignItems
+    alignItems: config === null || config === void 0 ? void 0 : config.alignItems,
+    pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
+    pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut
   };
 });
 // 子配置项包裹容器
@@ -988,4 +996,4 @@ amisEditorCore.setSchemaTpl('layout:wrapper-contanier', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn
   };
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/options.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -670,4 +670,4 @@ amisEditorCore.setSchemaTpl('optionDeleteControl', function (params) {
     }
   }));
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/remark.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -20,4 +20,4 @@ amisEditorCore.setSchemaTpl('labelRemark', BaseControl.remarkTpl({
   label: i18nRuntime.i18n("3ba265c6b63bde0319822afd6b9a649d"),
   labelRemark: i18nRuntime.i18n("7ad83bbe4646a0011ece7fd338d1e189")
 }));
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/style.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -613,4 +613,4 @@ amisEditorCore.setSchemaTpl('theme:common', function (option) {
     return !~exclude.indexOf(item.key || '');
   });
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/tpl/validations.js

@@ -1,7 +1,7 @@
 /**
- * amis-editor v6.0.0
- * build time: 2023-12-29
- * Copyright 2018-2023 @fex
+ * amis-editor v6.2.1
+ * build time: 2024-02-29
+ * Copyright 2018-2024 @fex
  */
 
 'use strict';
@@ -72,8 +72,11 @@ amisEditorCore.setSchemaTpl('validations', function () {
     label: i18nRuntime.i18n("6102d474314f27577d89e85b4c6cc4a5"),
     value: 'isZipcode'
   }, {
-    label: i18nRuntime.i18n("84e0cb5d57ed995b0cc04b4ab9a7997b"),
+    label: '身份证号码(18/15位)',
     value: 'isId'
+  }, {
+    label: '身份证号码(18位)',
+    value: 'isId18'
   }, {
     label: i18nRuntime.i18n("8dbec4f0c05be45a8acf6a5ae9d1f880"),
     value: 'isJson'
@@ -493,4 +496,4 @@ amisEditorCore.setSchemaTpl('validationControl', function (value) {
     value: value
   };
 });
-window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};
+window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};

package/lib/util.d.ts

@@ -17,7 +17,7 @@ export declare const schemaArrayFormat: (value: any) => any;
  * @param options
  * @returns
  */
-export declare const resolveOptionType: (schema: any) => "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export declare const resolveOptionType: (schema?: any) => "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
 /**
  * 构建选择器事件参数
  * @param manager
@@ -122,7 +122,7 @@ export declare const OPTION_EDIT_EVENTS: {
         };
     }[];
 }[];
-export declare const OPTION_EDIT_EVENTS_OLD: {
+export declare const OPTION_EDIT_EVENTS_OLD: (schema: any) => {
     eventName: string;
     eventLabel: string;
     description: string;
@@ -146,24 +146,41 @@ export declare const OPTION_EDIT_EVENTS_OLD: {
         };
     }[];
 }[];
-export declare const TREE_BASE_EVENTS: ({
+export declare const TREE_BASE_EVENTS: (schema: any) => ({
     eventName: string;
     eventLabel: string;
     description: string;
-    dataSchema: {
+    dataSchema: (manager: EditorManager) => {
         type: string;
         properties: {
             data: {
                 type: string;
                 title: string;
                 properties: {
-                    value: {
+                    item: {
                         type: string;
                         title: string;
+                        properties: {
+                            [x: number]: {
+                                type: string;
+                                title: string;
+                            };
+                        };
                     };
+                    value: any;
                     items: {
                         type: string;
                         title: string;
+                        items: {
+                            type: string;
+                            title: string;
+                            properties: {
+                                [x: number]: {
+                                    type: string;
+                                    title: string;
+                                };
+                            };
+                        };
                     };
                 };
             };
@@ -173,27 +190,20 @@ export declare const TREE_BASE_EVENTS: ({
     eventName: string;
     eventLabel: string;
     description: string;
-    dataSchema: (manager: EditorManager) => {
+    dataSchema: {
         type: string;
         properties: {
             data: {
                 type: string;
                 title: string;
                 properties: {
-                    value: any;
+                    value: {
+                        type: string;
+                        title: string;
+                    };
                     items: {
                         type: string;
                         title: string;
-                        items: {
-                            type: string;
-                            title: string;
-                            properties: {
-                                [x: number]: {
-                                    type: string;
-                                    title: string;
-                                };
-                            };
-                        };
                     };
                 };
             };
@@ -203,16 +213,31 @@ export declare const TREE_BASE_EVENTS: ({
     eventName: string;
     eventLabel: string;
     description: string;
-    dataSchema: {
+    dataSchema: (manager: EditorManager) => {
         type: string;
         properties: {
             data: {
                 type: string;
                 title: string;
                 properties: {
-                    value: {
+                    result: {
+                        type: string;
+                        title: string;
+                    };
+                    value: any;
+                    items: {
                         type: string;
                         title: string;
+                        items: {
+                            type: string;
+                            title: string;
+                            properties: {
+                                [x: number]: {
+                                    type: string;
+                                    title: string;
+                                };
+                            };
+                        };
                     };
                 };
             };