amis-editor 5.2.0-beta.2 → 5.2.1-beta.15

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

@@ -0,0 +1,76 @@
+/**
+ * amis-editor v5.2.1-beta.15
+ * Copyright 2018-2022 @fex
+ */
+
+import { __awaiter, __generator, __assign, __spreadArray } from 'tslib';
+import { isExpression, resolveVariableAndFilter } from 'amis-core';
+
+/**
+ * 从amis数据域中取变量数据
+ * @param node
+ * @param manager
+ * @returns
+ */
+function resolveVariablesFromScope(node, manager) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function () {
+        var dataPropsAsOptions;
+        return __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 (__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([], variables, true), variablesArr, true);
+                        }
+                        else if (typeof variables === 'function') {
+                            variablesArr = __spreadArray(__spreadArray([], variables(that), true), variablesArr, true);
+                        }
+                        else if (isExpression(variables)) {
+                            variablesArr = __spreadArray(__spreadArray([], resolveVariableAndFilter(that.props.variables, that.props.data, '| raw'), true), variablesArr, true);
+                        }
+                    }
+                    return [2 /*return*/, variablesArr];
+            }
+        });
+    });
+}
+
+export { getVariables, resolveVariablesFromScope };

package/esm/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -14,15 +14,13 @@ setSchemaTpl('api', function (patch) {
   if (patch === void 0) {
     patch = {};
   }
-
   var name = patch.name,
-      label = patch.label,
-      value = patch.value,
-      description = patch.description,
-      sampleBuilder = patch.sampleBuilder;
-      patch.apiDesc;
-      var rest = __rest(patch, ["name", "label", "value", "description", "sampleBuilder", "apiDesc"]);
-
+    label = patch.label,
+    value = patch.value,
+    description = patch.description,
+    sampleBuilder = patch.sampleBuilder;
+    patch.apiDesc;
+    var rest = __rest(patch, ["name", "label", "value", "description", "sampleBuilder", "apiDesc"]);
   return __assign({
     type: 'container',
     body: [{
@@ -45,7 +43,7 @@ setSchemaTpl('api', function (patch) {
         rootClose: true,
         placement: 'left'
       } : undefined,
-      option: "\u9AD8\u7EA7\u914D\u7F6E",
+      option: i18n("1f318234cab713b51b5172d91770bc11"),
       name: name || 'api',
       mode: 'inline',
       className: 'w-full m-b-sm',
@@ -69,8 +67,8 @@ setSchemaTpl('api', function (patch) {
       description: description,
       visibleOn: "!this.".concat(name || 'api', " || typeof this.").concat(name || 'api', " === 'string'"),
       className: 'm-b-none',
-      labelRemark: {} // disabledOn: `data.${name || 'api'} && data.${name || 'api'}.data && Object.keys(data.${name || 'api'}.data).length || data.${name || 'api'} && data.${name || 'api'}.sendOn`,
-
+      labelRemark: {}
+      // disabledOn: `data.${name || 'api'} && data.${name || 'api'}.data && Object.keys(data.${name || 'api'}.data).length || data.${name || 'api'} && data.${name || 'api'}.sendOn`,
     }, {
       type: 'combo',
       name: name || 'api',
@@ -87,18 +85,15 @@ setSchemaTpl('api', function (patch) {
           var url = value;
           var method = 'get';
           var m = /^(raw:|external:)?(get|post|put|patch|delete):(.*)$/.exec(url);
-
           if (m) {
             url = m[1] + m[3];
             method = m[2];
           }
-
           return {
             method: method,
             url: url
           };
         }
-
         return value;
       },
       items: [{
@@ -161,7 +156,8 @@ setSchemaTpl('api', function (patch) {
         valueType: 'ae-DataPickerControl',
         descriptionClassName: 'help-block text-xs m-b-none',
         description: i18n("5414824fb8efdb7d59beae4bf95fdefd")
-      }, // {
+      },
+      // {
       //   type: 'input-kv',
       //   syncDefaultValue: false,
       //   name: 'data',
@@ -285,7 +281,6 @@ setSchemaTpl('source', function (patch) {
   if (patch === void 0) {
     patch = {};
   }
-
   return getSchemaTpl('api', __assign({
     name: 'source',
     label: i18n("1395eba8d9efe27aa1ecd1a45e3e5dcd"),
@@ -316,7 +311,6 @@ setSchemaTpl('initFetch', function (overrides) {
   if (overrides === void 0) {
     overrides = {};
   }
-
   var visibleOn = get(overrides, 'visibleOn', 'this.initApi');
   var fieldName = get(overrides, 'name', 'initFetch');
   var label = get(overrides, 'label', i18n("47d0a7caaa2baee8d38612a1c57421ef"));
@@ -348,7 +342,8 @@ setSchemaTpl('initFetch', function (overrides) {
       visibleOn: "typeof this.".concat(fieldName, " !== \"boolean\""),
       placeholder: i18n("713ec76479b992652ed39364d3d03870"),
       className: 'm-t-n-sm'
-    }) // {
+    })
+    // {
     //   name: `${fieldName}On`,
     //   autoComplete: false,
     //   visibleOn: `typeof this.${fieldName} !== "boolean"`,
@@ -359,6 +354,7 @@ setSchemaTpl('initFetch', function (overrides) {
     ]
   };
 });
+
 setSchemaTpl('proxy', {
   type: 'switch',
   label: i18n("3f4f3acd6968f38361dddc6612a0c54f"),
@@ -374,15 +370,13 @@ setSchemaTpl('apiControl', function (patch) {
   if (patch === void 0) {
     patch = {};
   }
-
   var name = patch.name,
-      label = patch.label;
-      patch.value;
-      var description = patch.description,
-      sampleBuilder = patch.sampleBuilder;
-      patch.apiDesc;
-      var rest = __rest(patch, ["name", "label", "value", "description", "sampleBuilder", "apiDesc"]);
-
+    label = patch.label;
+    patch.value;
+    var description = patch.description,
+    sampleBuilder = patch.sampleBuilder;
+    patch.apiDesc;
+    var rest = __rest(patch, ["name", "label", "value", "description", "sampleBuilder", "apiDesc"]);
   return __assign({
     type: 'ae-apiControl',
     label: label,
@@ -411,7 +405,6 @@ setSchemaTpl('interval', function (more) {
   if (more === void 0) {
     more = {};
   }
-
   return __assign({
     type: 'ae-switch-more',
     label: i18n("e5e3131aaf96b6dd10574bc9beeaf934"),
@@ -444,7 +437,6 @@ setSchemaTpl('stopAutoRefreshWhen', function (extra) {
   if (extra === void 0) {
     extra = {};
   }
-
   return getSchemaTpl('valueFormula', __assign({
     name: 'stopAutoRefreshWhen',
     label: tipedLabel(i18n("83f16354dd1532422dc8b3581d096e7b"), i18n("620f826a77f079c5683a9d3c59461ea1")),
@@ -454,19 +446,16 @@ setSchemaTpl('stopAutoRefreshWhen', function (extra) {
 /**
  * 接口控件
  */
-
 setSchemaTpl('actionApiControl', function (patch) {
   if (patch === void 0) {
     patch = {};
   }
-
   var name = patch.name,
-      label = patch.label;
-      patch.value;
-      var description = patch.description,
-      sampleBuilder = patch.sampleBuilder,
-      rest = __rest(patch, ["name", "label", "value", "description", "sampleBuilder"]);
-
+    label = patch.label;
+    patch.value;
+    var description = patch.description,
+    sampleBuilder = patch.sampleBuilder,
+    rest = __rest(patch, ["name", "label", "value", "description", "sampleBuilder"]);
   return __assign({
     type: 'ae-actionApiControl',
     label: label,