amis-editor 5.2.5-beta.1 → 5.2.5-beta.3

package/esm/renderer/event-control/helper.js

@@ -1,11 +1,11 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
 import { __spreadArray, __assign, __awaiter, __generator } from 'tslib';
 import React__default from 'react';
-import { getSchemaTpl, defaultValue, tipedLabel } from 'amis-editor-core';
+import { defaultValue, getSchemaTpl, tipedLabel } from 'amis-editor-core';
 import { findTree, filterTree, DataSchema, normalizeApi } from 'amis-core';
 import { Button } from 'amis';
 import { i18n } from 'i18n-runtime';
@@ -89,16 +89,17 @@ var ACTION_TYPE_TREE = function (manager) {
           visibleOn: 'data.actionType === "url"'
         },
         */
-        getSchemaTpl('textareaFormulaControl', {
+        {
           name: 'url',
           label: i18n("8f1c078c6d42759e6ccb1a9bf35f1629"),
+          type: 'ae-textareaFormulaControl',
           variables: '${variables}',
           mode: 'horizontal',
           // placeholder: 'http://', 长文本暂不支持
           size: 'lg',
           required: true,
           visibleOn: 'data.actionType === "url"'
-        }), {
+        }, {
           type: 'combo',
           name: 'params',
           label: i18n("0b72392143e4038e98128cb0f6f679b3"),
@@ -122,12 +123,13 @@ var ACTION_TYPE_TREE = function (manager) {
             size: 'xs'
           },
            */
-          getSchemaTpl('formulaControl', {
+          {
+            type: 'ae-formulaControl',
             variables: '${variables}',
             name: 'val',
             variableMode: 'tabs',
             placeholder: i18n("bfed4943c5f487de1b63a82f7230cce2")
-          })]
+          }]
         }, {
           type: 'switch',
           name: 'blank',
@@ -349,14 +351,15 @@ var ACTION_TYPE_TREE = function (manager) {
           required: true
         },
         */
-        getSchemaTpl('textareaFormulaControl', {
+        {
           name: 'msg',
           label: i18n("b87b77561e776367e6756e11ea652217"),
+          type: 'ae-textareaFormulaControl',
           mode: 'horizontal',
           variables: '${variables}',
           size: 'lg',
           required: true
-        }),
+        },
         /*
         {
         name: 'title',
@@ -370,13 +373,14 @@ var ACTION_TYPE_TREE = function (manager) {
         mode: 'horizontal'
         },
         */
-        getSchemaTpl('textareaFormulaControl', {
+        {
           name: 'title',
           label: i18n("43ab9af06e1e0f0b2a8767b46cf8b1cf"),
+          type: 'ae-textareaFormulaControl',
           variables: '${variables}',
           mode: 'horizontal',
           size: 'lg'
-        }),
+        },
         /*
         {
         name: 'timeout',
@@ -390,9 +394,10 @@ var ACTION_TYPE_TREE = function (manager) {
         mode: 'horizontal'
         },
         */
-        getSchemaTpl('formulaControl', {
+        {
           name: 'timeout',
           label: i18n("f41a94bb85c5223181c4cdf83ea9021b"),
+          type: 'ae-formulaControl',
           rendererSchema: {
             type: 'input-number'
           },
@@ -400,7 +405,7 @@ var ACTION_TYPE_TREE = function (manager) {
           variables: '${variables}',
           size: 'lg',
           mode: 'horizontal'
-        }), {
+        }, {
           type: 'button-group-select',
           name: 'position',
           value: 'top-right',
@@ -601,7 +606,8 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18n("dce5379cb978a8259ecfca8f08f00817"),
           value: 'hidden'
         }]
-      }, getSchemaTpl('expressionFormulaControl', {
+      }, {
+        type: 'ae-expressionFormulaControl',
         mode: 'horizontal',
         label: i18n("a9400c408441f1f7f6d6954deb05ae9a"),
         required: true,
@@ -610,7 +616,7 @@ var ACTION_TYPE_TREE = function (manager) {
         evalMode: true,
         name: '__actionExpression',
         visibleOn: "this.groupType === 'visibility'"
-      })], false)
+      }], false)
     }, {
       actionLabel: i18n("12c8d50c55eeec7059ddd5c303e34f77"),
       actionType: 'usability',
@@ -670,7 +676,8 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18n("710ad08b11419332713360d2750cd707"),
           value: 'disabled'
         }]
-      }, getSchemaTpl('expressionFormulaControl', {
+      }, {
+        type: 'ae-expressionFormulaControl',
         mode: 'horizontal',
         label: i18n("a9400c408441f1f7f6d6954deb05ae9a"),
         required: true,
@@ -678,7 +685,7 @@ var ACTION_TYPE_TREE = function (manager) {
         evalMode: true,
         name: '__actionExpression',
         visibleOn: "this.groupType === 'usability'"
-      })], false)
+      }], false)
     }, {
       actionLabel: i18n("e052287273ad39a1d3fa9fa3decb5fd9"),
       actionType: 'staticStatus',
@@ -796,15 +803,16 @@ var ACTION_TYPE_TREE = function (manager) {
         visibleOn: `data.__addParam && data.__customData && data.__containerType === "all" && data.actionType === "reload" && ${IS_DATA_CONTAINER}`
       },
       */
-      getSchemaTpl('formulaControl', {
+      {
         name: '__valueInput',
         label: '',
+        type: 'ae-formulaControl',
         variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
         required: true,
         visibleOn: "data.__addParam && data.__customData && data.__containerType === \"all\" && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER)
-      }), {
+      }, {
         type: 'combo',
         name: '__reloadParams',
         label: '',
@@ -834,11 +842,12 @@ var ACTION_TYPE_TREE = function (manager) {
           inputMode: 'input-group'
         }
         */
-        getSchemaTpl('formulaControl', {
+        {
           name: 'val',
+          type: 'ae-formulaControl',
           variables: '${variables}',
           placeholder: i18n("bfed4943c5f487de1b63a82f7230cce2")
-        })],
+        }],
         visibleOn: "data.__addParam && data.__customData && data.__containerType === \"appoint\" && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER)
       }, {
         type: 'radios',
@@ -881,7 +890,7 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18n("cc6aeb073ebc3cb29734a49164f8964c"),
           value: 'page'
         }, {
-          label: i18n("2eb4c7ac45befad0f1f9c750bda57166"),
+          label: '内存变量',
           value: 'app'
         }],
         value: '${args.fromApp ? "app" : args.fromPage ? "page" : "cmpt"}',
@@ -987,11 +996,12 @@ var ACTION_TYPE_TREE = function (manager) {
               inputMode: 'input-group'
             }
             */
-            getSchemaTpl('formulaControl', {
+            {
               name: 'val',
+              type: 'ae-formulaControl',
               variables: '${variables}',
               placeholder: i18n("a33903526e8fb3d1ac3066da70e7941e")
-            })],
+            }],
             visibleOn: "".concat(IS_DATA_CONTAINER, " && data.__containerType === 'appoint' || data.__comboType === 'appoint'")
           }, {
             type: 'combo',
@@ -1038,10 +1048,11 @@ var ACTION_TYPE_TREE = function (manager) {
                 inputMode: 'input-group'
               }
               */
-              getSchemaTpl('formulaControl', {
+              {
                 name: 'val',
+                type: 'ae-formulaControl',
                 variables: '${variables}'
-              })]
+              }]
             }],
             visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n                      && data.__comboType === 'all'"
           },
@@ -1060,15 +1071,16 @@ var ACTION_TYPE_TREE = function (manager) {
             required: true
           },
           */
-          getSchemaTpl('formulaControl', {
+          {
             name: '__valueInput',
             label: '',
+            type: 'ae-formulaControl',
             variables: '${variables}',
             size: 'lg',
             mode: 'horizontal',
             visibleOn: "(".concat(IS_DATA_CONTAINER, " || ").concat(SHOW_SELECT_PROP, ") && data.__containerType === 'all'"),
             required: true
-          }),
+          },,
           /*
           {
             name: '__valueInput',
@@ -1084,15 +1096,16 @@ var ACTION_TYPE_TREE = function (manager) {
             required: true
           }
           */
-          getSchemaTpl('formulaControl', {
+          {
             name: '__valueInput',
             label: i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
+            type: 'ae-formulaControl',
             variables: '${variables}',
             size: 'lg',
             mode: 'horizontal',
             visibleOn: "data.__rendererName && !".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
             required: true
-          })]
+          }]
         })], false)
       },
       // 页面变量
@@ -1130,7 +1143,7 @@ var ACTION_TYPE_TREE = function (manager) {
           }]
         }])]
       },
-      // 应用临时变量
+      // 内存变量
       {
         type: 'container',
         visibleOn: '__actionSubType === "app"',
@@ -1140,7 +1153,7 @@ var ACTION_TYPE_TREE = function (manager) {
           body: [{
             type: 'tree-select',
             name: 'path',
-            label: i18n("2eb4c7ac45befad0f1f9c750bda57166"),
+            label: '内存变量',
             multiple: false,
             mode: 'horizontal',
             required: true,
@@ -1148,7 +1161,7 @@ var ACTION_TYPE_TREE = function (manager) {
             showIcon: false,
             size: 'lg',
             hideRoot: false,
-            rootLabel: i18n("2eb4c7ac45befad0f1f9c750bda57166"),
+            rootLabel: '内存变量',
             options: variableOptions
           }, {
             type: 'input-formula',
@@ -1249,15 +1262,16 @@ var ACTION_TYPE_TREE = function (manager) {
           required: true
         },
         */
-        getSchemaTpl('textareaFormulaControl', {
+        {
           name: 'content',
           label: i18n("ac04259507be8ba6b891dc9dc208f491"),
+          type: 'ae-textareaFormulaControl',
           variables: '${variables}',
           mode: 'horizontal',
           size: 'lg',
           visibleOn: 'data.actionType === "copy"',
           required: true
-        }), {
+        }, {
           type: 'select',
           name: 'copyFormat',
           mode: 'horizontal',
@@ -1468,11 +1482,12 @@ var COMMON_ACTION_SCHEMA_MAP = {
           inputMode: 'input-group'
         }
         */
-        getSchemaTpl('formulaControl', {
+        {
           name: 'val',
+          type: 'ae-formulaControl',
           variables: '${variables}',
           placeholder: i18n("9a2ee7044ff04234a8892a13583d14b6")
-        })],
+        }],
         visibleOn: "".concat(IS_DATA_CONTAINER)
       }, {
         type: 'combo',
@@ -1513,10 +1528,11 @@ var COMMON_ACTION_SCHEMA_MAP = {
             inputMode: 'input-group'
           }
           */
-          getSchemaTpl('formulaControl', {
+          {
             name: 'val',
+            type: 'ae-formulaControl',
             variables: '${variables}'
-          })]
+          }]
         }],
         visibleOn: "data.__rendererName === 'combo' || data.__rendererName === 'input-table'"
       },
@@ -1535,15 +1551,16 @@ var COMMON_ACTION_SCHEMA_MAP = {
         required: true
       }
       */
-      getSchemaTpl('formulaControl', {
+      {
         name: '__valueInput',
         label: i18n("e22855f53b7a1ab33e920375c0cd0e3d"),
+        type: 'ae-formulaControl',
         variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
         visibleOn: "!".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
         required: true
-      })]
+      }]
     })
   },
   reload: {

package/esm/renderer/event-control/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/Background.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/Border.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/BoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/BoxShadow.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/Display.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/Font.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/InsetBoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/ThemeClassName.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/font-family.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/transformation.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,9 +1,8 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
-import { __assign } from 'tslib';
 import React__default, { useEffect } from 'react';
 import { Modal, Button } from 'amis';
 import cx from 'classnames';
@@ -29,7 +28,7 @@ var FormulaPicker = function (props) {
     };
     return (React__default.createElement(Modal, { className: cx('FormulaPicker-Modal'), size: "md", show: true, onHide: handleClose, closeOnEsc: true },
         React__default.createElement(Modal.Body, null,
-            React__default.createElement(FormulaEditor, __assign({}, props, { header: "\u8868\u8FBE\u5F0F", variables: variables, variableMode: variableMode, value: formula, evalMode: evalMode, onChange: handleChange }))),
+            React__default.createElement(FormulaEditor, { header: "\u8868\u8FBE\u5F0F", variables: variables, variableMode: variableMode, value: formula, evalMode: evalMode, onChange: handleChange })),
         React__default.createElement(Modal.Footer, null,
             React__default.createElement(Button, { onClick: handleClose }, "\u53D6\u6D88"),
             React__default.createElement(Button, { onClick: handleConfirm, level: "primary" }, "\u786E\u8BA4"))));

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -343,7 +343,8 @@ setSchemaTpl('valueFormula', function (config) {
     // 上下展示，可避免 自定义渲染器 出现挤压
     mode: mode === 'vertical' ? 'vertical' : 'horizontal',
     visibleOn: visibleOn,
-    body: [getSchemaTpl('formulaControl', __assign({
+    body: [__assign({
+      type: 'ae-formulaControl',
       label: label !== null && label !== void 0 ? label : i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
       name: name || 'value',
       rendererWrapper: rendererWrapper,
@@ -356,7 +357,7 @@ setSchemaTpl('valueFormula', function (config) {
       requiredDataPropsVariables: requiredDataPropsVariables,
       variableMode: variableMode,
       DateTimeType: DateTimeType !== null && DateTimeType !== void 0 ? DateTimeType : FormulaDateType.NotDate
-    }, rest))]
+    }, rest)]
   };
 });
 setSchemaTpl('inputType', {
@@ -472,20 +473,20 @@ setSchemaTpl('optionsMenuTpl', function (config) {
     }];
     return variablesArr;
   }
-  return getSchemaTpl('textareaFormulaControl', __assign({
+  return __assign({
+    type: 'ae-textareaFormulaControl',
     mode: 'normal',
     label: tipedLabel(i18n("1ca87f0171481e27d94e81b477150b7d"), i18n("d6ecb32a380c91887a9346653c2427e9")),
     name: 'menuTpl',
     variables: getOptionVars,
     requiredDataPropsVariables: true
-  }, rest));
+  }, rest);
 });
-setSchemaTpl('menuTpl', function () {
-  return getSchemaTpl('textareaFormulaControl', {
-    mode: 'normal',
-    label: tipedLabel(i18n("59cf15fe6b8d659c9bd2f86143534a06"), i18n("d6ecb32a380c91887a9346653c2427e9")),
-    name: 'menuTpl'
-  });
+setSchemaTpl('menuTpl', {
+  type: 'ae-textareaFormulaControl',
+  mode: 'normal',
+  label: tipedLabel(i18n("59cf15fe6b8d659c9bd2f86143534a06"), i18n("d6ecb32a380c91887a9346653c2427e9")),
+  name: 'menuTpl'
 });
 setSchemaTpl('expression', {
   type: 'input-text',
@@ -885,6 +886,23 @@ setSchemaTpl('badge', {
   name: 'badge',
   type: 'ae-badge'
 });
+setSchemaTpl('nav-badge', {
+  label: i18n("b8c467fce096a649583c0bc9d9281a5c"),
+  name: 'badge',
+  type: 'ae-nav-badge'
+});
+setSchemaTpl('nav-default-active', {
+  type: 'ae-nav-default-active'
+});
+// 暂未使用
+setSchemaTpl('formulaControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return __assign({
+    type: 'ae-formulaControl'
+  }, schema);
+});
 /**
  * 日期范围快捷键组件
  */
@@ -950,11 +968,12 @@ setSchemaTpl('app-page-args', {
     inputMode: 'input-group'
   }
    */
-  getSchemaTpl('formulaControl', {
+  {
     name: 'val',
+    type: 'ae-formulaControl',
     variables: '${variables}',
     placeholder: i18n("bfed4943c5f487de1b63a82f7230cce2")
-  })]
+  }]
 });
 setSchemaTpl('iconLink', function (schema) {
   var name = schema.name,
@@ -1001,12 +1020,11 @@ setSchemaTpl('pageSubTitle', {
   name: 'subTitle',
   type: 'textarea'
 });
-setSchemaTpl('textareaDefaultValue', function () {
-  return getSchemaTpl('textareaFormulaControl', {
-    label: i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
-    name: 'value',
-    mode: 'normal'
-  });
+setSchemaTpl('textareaDefaultValue', {
+  type: 'ae-textareaFormulaControl',
+  label: i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
+  name: 'value',
+  mode: 'normal'
 });
 setSchemaTpl('prefix', {
   type: 'input-text',

package/esm/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -262,6 +262,14 @@ setSchemaTpl('hideNodePathLabel', {
   },
   inputClassName: 'is-inline'
 });
+setSchemaTpl('navControl', {
+  label: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+  mode: 'normal',
+  name: 'source',
+  type: 'ae-navSourceControl',
+  closeDefaultCheck: true // 关闭默认值设置
+});
+
 setSchemaTpl('optionControl', {
   label: i18n("0d83078816aa273f2941c9b55ec82bf3"),
   mode: 'normal',

package/esm/tpl/remark.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 

package/esm/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.1
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */