amis-editor 5.4.1 → 5.6.0-beta.0

package/esm/plugin/Form/InputTable.js

@@ -1,11 +1,11 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
-import { __extends, __assign, __awaiter, __generator, __values } from 'tslib';
+import { __extends, __assign, __awaiter, __generator } from 'tslib';
 import { getSchemaTpl, getI18nEnabled, tipedLabel, defaultValue, DSBuilderManager, mockValue, repeatArray, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
-import { setVariable } from 'amis-core';
+import { setVariable, someTree } from 'amis-core';
 import { ValidatorTag } from '../../validator.js';
 import { getArgsWrapper, getEventControlConfig } from '../../renderer/event-control/helper.js';
 import cloneDeep from 'lodash/cloneDeep';
@@ -100,13 +100,19 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.index': {
-            type: 'array',
-            title: i18n("7b25d5ff93da66fe95b5409731bb9838")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              index: {
+                type: 'array',
+                title: i18n("d84017fa76584f7475e26f79767df28d")
+              }
+            }
           }
         }
       }]
@@ -117,17 +123,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("1fb1cbe49c3e72c2b5f4e0151a4cb5d9")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("7b25d5ff93da66fe95b5409731bb9838")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("1fb1cbe49c3e72c2b5f4e0151a4cb5d9")
+              },
+              index: {
+                type: 'number',
+                title: i18n("d84017fa76584f7475e26f79767df28d")
+              }
+            }
           }
         }
       }]
@@ -138,17 +150,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("1fb1cbe49c3e72c2b5f4e0151a4cb5d9")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("7b25d5ff93da66fe95b5409731bb9838")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("1fb1cbe49c3e72c2b5f4e0151a4cb5d9")
+              },
+              index: {
+                type: 'number',
+                title: i18n("d84017fa76584f7475e26f79767df28d")
+              }
+            }
           }
         }
       }]
@@ -159,21 +177,27 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("1fb1cbe49c3e72c2b5f4e0151a4cb5d9")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("7b25d5ff93da66fe95b5409731bb9838")
-          },
-          'event.data.error': {
-            type: 'object',
-            title: i18n("37122b9e4499da38258b3d51b09d68a1")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("1fb1cbe49c3e72c2b5f4e0151a4cb5d9")
+              },
+              index: {
+                type: 'number',
+                title: i18n("d84017fa76584f7475e26f79767df28d")
+              },
+              error: {
+                type: 'object',
+                title: i18n("37122b9e4499da38258b3d51b09d68a1")
+              }
+            }
           }
         }
       }]
@@ -184,17 +208,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'number',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              }
+            }
           }
         }
       }]
@@ -205,17 +235,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'number',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              }
+            }
           }
         }
       }]
@@ -226,17 +262,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'number',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              }
+            }
           }
         }
       }]
@@ -247,21 +289,27 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
-          },
-          'event.data.error': {
-            type: 'object',
-            title: i18n("650bccdd6f99fe5fc4ca6cb8788e7cb4")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'number',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              },
+              error: {
+                type: 'object',
+                title: i18n("650bccdd6f99fe5fc4ca6cb8788e7cb4")
+              }
+            }
           }
         }
       }]
@@ -272,17 +320,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
-            type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
+          data: {
             type: 'object',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'object',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              }
+            }
           }
         }
       }]
@@ -293,17 +347,23 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
-            type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
+          data: {
             type: 'object',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'object',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              }
+            }
           }
         }
       }]
@@ -314,21 +374,27 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
-          },
-          'event.data.item': {
-            type: 'object',
-            title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
-          },
-          'event.data.index': {
+          data: {
             type: 'object',
-            title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
-          },
-          'event.data.error': {
-            type: 'object',
-            title: i18n("37122b9e4499da38258b3d51b09d68a1")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("a9e009a9936bf5bcc9d4eabcb3e952e0")
+              },
+              index: {
+                type: 'object',
+                title: i18n("e756ec22a0f897c4dd886c5f4a95b7a6")
+              },
+              error: {
+                type: 'object',
+                title: i18n("37122b9e4499da38258b3d51b09d68a1")
+              }
+            }
           }
         }
       }]
@@ -339,9 +405,15 @@ var TableControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'array',
-            title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'array',
+                title: i18n("c9f63503ee66082fc00c3e6eac57a95f")
+              }
+            }
           }
         }
       }]
@@ -837,74 +909,77 @@ var TableControlPlugin = /** @class */function (_super) {
       });
     }
   };
-  TableControlPlugin.prototype.buildDataSchemas = function (node, region) {
-    var _a, _b;
+  TableControlPlugin.prototype.buildDataSchemas = function (node, region, trigger, parent) {
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-      var itemsSchema, columns, _c, _d, current, schema, _e, _f, _g, e_1_1;
-      var e_1, _h;
-      return __generator(this, function (_j) {
-        switch (_j.label) {
+      var itemsSchema, columns, parentScopeId, isColumnChild, scopeId, cells, cell, items, current, schema, _f, _g, scopeId, scope;
+      return __generator(this, function (_h) {
+        switch (_h.label) {
           case 0:
             itemsSchema = {
-              $id: 'inputTableRow',
+              $id: "".concat(node.id, "-").concat(node.type, "-tableRows"),
               type: 'object',
               properties: {}
             };
             columns = node.children.find(function (item) {
               return item.isRegion && item.region === 'columns';
             });
-            _j.label = 1;
+            parentScopeId = "".concat(parent === null || parent === void 0 ? void 0 : parent.id, "-").concat(parent === null || parent === void 0 ? void 0 : parent.type).concat(((_a = node.parent) === null || _a === void 0 ? void 0 : _a.type) === 'cell' ? '-currentRow' : '');
+            isColumnChild = false;
+            // 追加当前行scope
+            if (trigger) {
+              isColumnChild = someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
+                return item.id === trigger.id;
+              });
+              if (isColumnChild) {
+                scopeId = "".concat(node.id, "-").concat(node.type, "-currentRow");
+                if (this.manager.dataSchema.getScope(scopeId)) {
+                  this.manager.dataSchema.removeScope(scopeId);
+                }
+                if (this.manager.dataSchema.getScope(parentScopeId)) {
+                  this.manager.dataSchema.switchTo(parentScopeId);
+                }
+                this.manager.dataSchema.addScope([], scopeId);
+                this.manager.dataSchema.current.tag = i18n("bf2a4fd8ecd654982e2d466f10f54d3f");
+                this.manager.dataSchema.current.group = i18n("813a5158d9f7171d20e7df340c5b48f9");
+              }
+            }
+            cells = columns.children.concat();
+            _h.label = 1;
           case 1:
-            _j.trys.push([1, 8, 9, 10]);
-            _c = __values(columns === null || columns === void 0 ? void 0 : columns.children), _d = _c.next();
-            _j.label = 2;
+            if (!(cells.length > 0)) return [3 /*break*/, 6];
+            cell = cells.shift();
+            items = cell.children.concat();
+            _h.label = 2;
           case 2:
-            if (!!_d.done) return [3 /*break*/, 7];
-            current = _d.value;
+            if (!items.length) return [3 /*break*/, 5];
+            current = items.shift();
             schema = current.schema;
-            if (!schema.name) return [3 /*break*/, 6];
-            _e = itemsSchema.properties;
-            _f = schema.name;
-            if (!((_b = (_a = current.info) === null || _a === void 0 ? void 0 : _a.plugin) === null || _b === void 0 ? void 0 : _b.buildDataSchemas)) return [3 /*break*/, 4];
-            return [4 /*yield*/, current.info.plugin.buildDataSchemas(current, region)];
+            if (!schema.name) return [3 /*break*/, 4];
+            _f = itemsSchema.properties;
+            _g = schema.name;
+            return [4 /*yield*/, (_c = (_b = current.info.plugin).buildDataSchemas) === null || _c === void 0 ? void 0 : _c.call(_b, current, region, trigger, node)];
           case 3:
-            _g = _j.sent();
-            return [3 /*break*/, 5];
+            _f[_g] = _h.sent();
+            _h.label = 4;
           case 4:
-            _g = {
-              type: 'string',
-              title: schema.label || schema.name
-            };
-            _j.label = 5;
+            return [3 /*break*/, 2];
           case 5:
-            _e[_f] = _g;
-            _j.label = 6;
+            return [3 /*break*/, 1];
           case 6:
-            _d = _c.next();
-            return [3 /*break*/, 2];
-          case 7:
-            return [3 /*break*/, 10];
-          case 8:
-            e_1_1 = _j.sent();
-            e_1 = {
-              error: e_1_1
-            };
-            return [3 /*break*/, 10];
-          case 9:
-            try {
-              if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
-            } finally {
-              if (e_1) throw e_1.error;
-            }
-            return [7 /*endfinally*/];
-          case 10:
             if ((region === null || region === void 0 ? void 0 : region.region) === 'columns') {
               return [2 /*return*/, itemsSchema];
             }
+            // 追加当前行数据
+            if (isColumnChild) {
+              scopeId = "".concat(node.id, "-").concat(node.type, "-currentRow");
+              scope = this.manager.dataSchema.getScope(scopeId);
+              scope === null || scope === void 0 ? void 0 : scope.addSchema(itemsSchema);
+            }
             return [2 /*return*/, {
-              $id: 'inputTable',
+              $id: "".concat(node.id, "-").concat(node.type, "-tableData"),
               type: 'array',
-              title: i18n("5c48fa6f337d2b5dd168a0887c6baa2b"),
+              title: ((_d = node.schema) === null || _d === void 0 ? void 0 : _d.label) || ((_e = node.schema) === null || _e === void 0 ? void 0 : _e.name),
               items: itemsSchema
             }];
         }
@@ -916,23 +991,25 @@ var TableControlPlugin = /** @class */function (_super) {
     return __awaiter(this, void 0, void 0, function () {
       var scope, builder;
       return __generator(this, function (_c) {
-        if (target.parent.isRegion && target.parent.region === 'columns') {
+        if (target.type === scopeNode.type || target.parent.isRegion && target.parent.region === 'columns') {
           scope = scopeNode.parent.parent;
           builder = this.dsBuilderManager.resolveBuilderBySchema(scope.schema, 'api');
-          if (builder && scope.schema.api) {
-            return [2 /*return*/, builder.getAvailableContextFileds({
-              schema: scope.schema,
-              sourceKey: 'api',
-              feat: (_b = (_a = scope.schema) === null || _a === void 0 ? void 0 : _a.feat) !== null && _b !== void 0 ? _b : 'List',
-              scopeNode: scopeNode
-            }, target)];
-          }
+        }
+        if (builder && scope.schema.api) {
+          return [2 /*return*/, builder.getAvailableContextFileds({
+            schema: scope.schema,
+            sourceKey: 'api',
+            feat: (_b = (_a = scope.schema) === null || _a === void 0 ? void 0 : _a.feat) !== null && _b !== void 0 ? _b : 'List',
+            scopeNode: scopeNode
+          }, /** ID相同为本体，否则为子项 */
+          (target === null || target === void 0 ? void 0 : target.id) === (scopeNode === null || scopeNode === void 0 ? void 0 : scopeNode.id) ? scopeNode : target)];
         }
         return [2 /*return*/];
       });
     });
   };
 
+  TableControlPlugin.id = 'TableControlPlugin';
   return TableControlPlugin;
 }(BasePlugin);
 registerEditorPlugin(TableControlPlugin);

package/esm/plugin/Form/InputTag.d.ts

@@ -1,6 +1,8 @@
+import { EditorNodeType } from 'amis-editor-core';
 import { BasePlugin } from 'amis-editor-core';
 import { RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 export declare class TagControlPlugin extends BasePlugin {
+    static id: string;
     static scene: string[];
     rendererName: string;
     $schema: string;
@@ -24,4 +26,5 @@ export declare class TagControlPlugin extends BasePlugin {
     events: RendererPluginEvent[];
     actions: RendererPluginAction[];
     panelBodyCreator: (context: BaseEventContext) => any[];
+    buildDataSchemas(node: EditorNodeType, region: EditorNodeType): any;
 }