amis-editor 5.2.4-beta.31 → 5.2.5-beta.3

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -529,22 +529,44 @@ var EventControl = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function (data) {
+      var _a;
       return tslib.__awaiter(this, void 0, void 0, function () {
-        var _a, pluginActions, getContextSchemas, actionConfigInitFormatter, getComponents, actionTree, allComponents, rawVariables, dataSchemaIns, eventVariables, variables, action_1, actionConfig, actionNode, hasSubActionNode, supportComponents, node, setValueDs, targetDataSchema, targetDataSchemaIns, targetVariables;
-        return tslib.__generator(this, function (_b) {
-          switch (_b.label) {
+        var _b, pluginActions, getContextSchemas, actionConfigInitFormatter, getComponents, actionTree, allComponents, manager, rawVariables, dataSchemaIns, eventVariables, appVariables, variables, systemVarIndex, action_1, actionConfig, actionNode, hasSubActionNode, supportComponents, node, setValueDs, targetDataSchema, targetDataSchemaIns, targetVariables;
+        return tslib.__generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
-              _a = this.props, pluginActions = _a.actions, getContextSchemas = _a.getContextSchemas, actionConfigInitFormatter = _a.actionConfigInitFormatter, getComponents = _a.getComponents, actionTree = _a.actionTree, allComponents = _a.allComponents;
+              _b = this.props, pluginActions = _b.actions, getContextSchemas = _b.getContextSchemas, actionConfigInitFormatter = _b.actionConfigInitFormatter, getComponents = _b.getComponents, actionTree = _b.actionTree, allComponents = _b.allComponents, manager = _b.manager;
               rawVariables = [];
               if (!getContextSchemas) return [3 /*break*/, 2];
               return [4 /*yield*/, getContextSchemas()];
             case 1:
-              dataSchemaIns = _b.sent();
+              dataSchemaIns = _c.sent();
               rawVariables = dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions();
-              _b.label = 2;
+              _c.label = 2;
             case 2:
               eventVariables = this.getEventVariables(data);
+              appVariables = ((_a = manager === null || manager === void 0 ? void 0 : manager.variableManager) === null || _a === void 0 ? void 0 : _a.getVariableFormulaOptions()) || [];
               variables = tslib.__spreadArray(tslib.__spreadArray([], eventVariables, true), rawVariables, true);
+              systemVarIndex = variables.findIndex(function (item) {
+                return item.label === i18nRuntime.i18n("979a50681e278dcc0be18f68459e8217");
+              });
+              // 插入应用变量
+              if (!!~systemVarIndex) {
+                appVariables.forEach(function (item) {
+                  if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
+                    variables.splice(systemVarIndex, 0, item);
+                  }
+                });
+              } else {
+                appVariables.forEach(function (item) {
+                  if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item.children.length) {
+                    variables.push(item);
+                  }
+                });
+              }
+              variables.forEach(function (item) {
+                return item.selectMode = 'tree';
+              });
               if (!(data.type === 'update')) return [3 /*break*/, 6];
               action_1 = data.actionData.action;
               return [4 /*yield*/, actionConfigInitFormatter === null || actionConfigInitFormatter === void 0 ? void 0 : actionConfigInitFormatter(action_1, {
@@ -552,7 +574,7 @@ var EventControl = /** @class */function (_super) {
                 rawVariables: rawVariables
               })];
             case 3:
-              actionConfig = _b.sent();
+              actionConfig = _c.sent();
               actionNode = helper.findActionNode(actionTree, actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType);
               hasSubActionNode = helper.findSubActionNode(actionTree, action_1.actionType);
               supportComponents = getComponents(actionNode);
@@ -563,13 +585,13 @@ var EventControl = /** @class */function (_super) {
               if (!((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'setValue' && (node === null || node === void 0 ? void 0 : node.id) && helper.SELECT_PROPS_CONTAINER.includes((node === null || node === void 0 ? void 0 : node.type) || ''))) return [3 /*break*/, 5];
               return [4 /*yield*/, getContextSchemas === null || getContextSchemas === void 0 ? void 0 : getContextSchemas(node.id, true)];
             case 4:
-              targetDataSchema = _b.sent();
+              targetDataSchema = _c.sent();
               targetDataSchemaIns = new amis.DataSchema(targetDataSchema || []);
               targetVariables = (targetDataSchemaIns === null || targetDataSchemaIns === void 0 ? void 0 : targetDataSchemaIns.getDataPropsAsOptions()) || [];
               setValueDs = targetVariables === null || targetVariables === void 0 ? void 0 : targetVariables.filter(function (item) {
                 return item.value !== '$$id';
               });
-              _b.label = 5;
+              _c.label = 5;
             case 5:
               data.actionData = tslib.__assign(tslib.__assign({
                 eventKey: data.actionData.eventKey,
@@ -603,7 +625,7 @@ var EventControl = /** @class */function (_super) {
                 rawVariables: rawVariables,
                 __superCmptTreeSource: allComponents
               };
-              _b.label = 7;
+              _c.label = 7;
             case 7:
               this.setState(data);
               return [2 /*return*/];

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -10,76 +10,92 @@ 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');
 
-/**
- * 从amis数据域中取变量数据
- * @param node
- * @param manager
- * @returns
- */
 function resolveVariablesFromScope(node, manager) {
-    var _a;
-    return tslib.__awaiter(this, void 0, void 0, function () {
-        var dataPropsAsOptions;
-        return tslib.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (manager === null || manager === void 0 ? void 0 : manager.getContextSchemas(node))];
-                case 1:
-                    _b.sent();
-                    dataPropsAsOptions = (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions();
-                    if (dataPropsAsOptions) {
-                        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*/, []];
+  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();
+          dataPropsAsOptions = (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions();
+          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([], variables, true), variablesArr, true);
-                        }
-                        else if (typeof variables === 'function') {
-                            variablesArr = tslib.__spreadArray(tslib.__spreadArray([], variables(that), true), variablesArr, true);
-                        }
-                        else if (amisCore.isExpression(variables)) {
-                            variablesArr = tslib.__spreadArray(tslib.__spreadArray([], amisCore.resolveVariableAndFilter(that.props.variables, that.props.data, '| raw'), true), variablesArr, true);
-                        }
-                    }
-                    // 如果存在应用语言类型，则进行翻译
-                    if (that.appLocale && that.appCorpusData) {
-                        return [2 /*return*/, amisEditorCore.translateSchema(variablesArr, that.appCorpusData)];
-                    }
-                    return [2 /*return*/, variablesArr];
+  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([], variables, true), variablesArr, true);
+            } else if (typeof variables === 'function') {
+              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], variables(that), true), variablesArr, true);
+            } else if (amisCore.isExpression(variables)) {
+              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], amisCore.resolveVariableAndFilter(that.props.variables, that.props.data, '| raw'), true), variablesArr, true);
             }
-        });
+          }
+          // 如果存在应用语言类型，则进行翻译
+          if (that.appLocale && that.appCorpusData) {
+            return [2 /*return*/, amisEditorCore.translateSchema(variablesArr, that.appCorpusData)];
+          }
+          return [2 /*return*/, variablesArr];
+      }
     });
+  });
 }
 
 exports.getVariables = getVariables;

package/lib/tpl/api.js

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

package/lib/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -7,7 +7,6 @@
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
-var BaseControl = require('../component/BaseControl.js');
 var flatten = require('lodash/flatten');
 var _ = require('lodash');
 var InputComponentName = require('../component/InputComponentName.js');
@@ -98,6 +97,38 @@ amisEditorCore.setSchemaTpl('formItemMode', function (config) {
     }
   };
 });
+amisEditorCore.setSchemaTpl('formulaControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return tslib.__assign({
+    type: 'ae-formulaControl'
+  }, schema);
+});
+amisEditorCore.setSchemaTpl('expressionFormulaControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return tslib.__assign({
+    type: 'ae-expressionFormulaControl'
+  }, schema);
+});
+amisEditorCore.setSchemaTpl('textareaFormulaControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return tslib.__assign({
+    type: 'ae-textareaFormulaControl'
+  }, schema);
+});
+amisEditorCore.setSchemaTpl('DataPickerControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return tslib.__assign({
+    type: 'ae-DataPickerControl'
+  }, schema);
+});
 amisEditorCore.setSchemaTpl('formItemInline', {
   type: 'switch',
   label: i18nRuntime.i18n("66670400b1f3e4b6c94cff171d441585"),
@@ -281,16 +312,14 @@ amisEditorCore.setSchemaTpl('hint', {
   name: 'hint',
   description: i18nRuntime.i18n("dc5dbe7a1b1ff5cae22ffbb636bc6380")
 });
-amisEditorCore.setSchemaTpl('remark', BaseControl.remarkTpl({
-  name: 'remark',
-  label: i18nRuntime.i18n("ff255db9b108589abd5c649e2a02e3f1"),
-  labelRemark: i18nRuntime.i18n("9e783b34207fe24bc488136faba65442")
-}));
-amisEditorCore.setSchemaTpl('labelRemark', BaseControl.remarkTpl({
-  name: 'labelRemark',
-  label: i18nRuntime.i18n("3ba265c6b63bde0319822afd6b9a649d"),
-  labelRemark: i18nRuntime.i18n("7ad83bbe4646a0011ece7fd338d1e189")
-}));
+amisEditorCore.setSchemaTpl('icon', {
+  label: i18nRuntime.i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
+  type: 'icon-picker',
+  name: 'icon',
+  placeholder: i18nRuntime.i18n("b7dee01f2d085d90c47bcb8b490d9055"),
+  clearable: true,
+  description: ''
+});
 amisEditorCore.setSchemaTpl('valueFormula', function (config) {
   var _a = config || {},
     rendererSchema = _a.rendererSchema,
@@ -470,14 +499,6 @@ amisEditorCore.setSchemaTpl('expression', {
   type: 'input-text',
   description: i18nRuntime.i18n("b18ec08df2e47313bcc93430e7a25fd3")
 });
-amisEditorCore.setSchemaTpl('icon', {
-  label: i18nRuntime.i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
-  type: 'icon-select',
-  name: 'icon',
-  placeholder: i18nRuntime.i18n("b7dee01f2d085d90c47bcb8b490d9055"),
-  clearable: true,
-  description: ''
-});
 amisEditorCore.setSchemaTpl('size', {
   label: i18nRuntime.i18n("b3b97a293baac13db6367aba5539a09c"),
   type: 'button-group-select',
@@ -872,6 +893,14 @@ amisEditorCore.setSchemaTpl('badge', {
   name: 'badge',
   type: 'ae-badge'
 });
+amisEditorCore.setSchemaTpl('nav-badge', {
+  label: i18nRuntime.i18n("b8c467fce096a649583c0bc9d9281a5c"),
+  name: 'badge',
+  type: 'ae-nav-badge'
+});
+amisEditorCore.setSchemaTpl('nav-default-active', {
+  type: 'ae-nav-default-active'
+});
 // 暂未使用
 amisEditorCore.setSchemaTpl('formulaControl', function (schema) {
   if (schema === void 0) {

package/lib/tpl/horizontal.js

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

package/lib/tpl/index.d.ts

@@ -1,4 +1,5 @@
 import './common';
+import './remark';
 import './horizontal';
 import './api';
 import './options';

package/lib/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -46,16 +46,16 @@ amisEditorCore.setSchemaTpl('layout:position', function (config) {
       }
     },
     options: [{
-      label: i18nRuntime.i18n("18c63459a2c069022c7790430f761214"),
+      label: i18nRuntime.i18n("aae5ccb98564e19c48f19c740c3c10b7"),
       value: 'static'
     }, {
-      label: i18nRuntime.i18n("5ddea41072a27a74a1715549dfb79bc2"),
+      label: i18nRuntime.i18n("5d721446605f21bddb3b8e2ab2a3841c"),
       value: 'relative'
     }, {
-      label: i18nRuntime.i18n("e9513a013011450c57cfe3ef51b7d4b0"),
+      label: i18nRuntime.i18n("b55b525d56fd0d4d3dcb9291e59e3433"),
       value: 'fixed'
     }, {
-      label: i18nRuntime.i18n("3059599d8ebfec00a8ab53346d9b4fa3"),
+      label: i18nRuntime.i18n("25ece43050dda20ad4d8dd058dd590d1"),
       value: 'absolute'
     }]
   };
@@ -859,9 +859,11 @@ amisEditorCore.setSchemaTpl('layout:sticky', {
     if (value) {
       form.setValueByName('style.position', 'sticky');
       form.setValueByName('style.inset', '0px auto auto auto');
+      form.setValueByName('style.zIndex', 10);
     } else {
       form.setValueByName('style.position', 'static');
       form.setValueByName('style.inset', undefined);
+      form.setValueByName('style.zIndex', undefined);
     }
   }
 });