amis-editor 5.4.1 → 5.6.0-beta.0

package/lib/plugin/Table.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -80,13 +80,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.selectedItems': {
-            type: 'array',
-            title: i18nRuntime.i18n("aeddca0456d8fe520dc95545a83458e9")
-          },
-          'event.data.unSelectedItems': {
-            type: 'array',
-            title: i18nRuntime.i18n("4f907cb94921bb62a8399adec922bb60")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              selectedItems: {
+                type: 'array',
+                title: i18nRuntime.i18n("94935dfa6c9b908515a593956ee7d07c")
+              },
+              unSelectedItems: {
+                type: 'array',
+                title: i18nRuntime.i18n("f10b94a4ac77878be53fad599a761928")
+              }
+            }
           }
         }
       }]
@@ -97,13 +103,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.orderBy': {
-            type: 'string',
-            title: i18nRuntime.i18n("652f155e644e82ebb0a1aed97ab6ab23")
-          },
-          'event.data.orderDir': {
-            type: 'string',
-            title: i18nRuntime.i18n("460e3a697d1680445a47139c0816fbe6")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              orderBy: {
+                type: 'string',
+                title: i18nRuntime.i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              orderDir: {
+                type: 'string',
+                title: i18nRuntime.i18n("c35c1a13309c6f9da9837857517e65fc")
+              }
+            }
           }
         }
       }]
@@ -114,13 +126,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.filterName': {
-            type: 'string',
-            title: i18nRuntime.i18n("ad11fba3ac676233f3105e76e7de0501")
-          },
-          'event.data.filterValue': {
-            type: 'string',
-            title: i18nRuntime.i18n("8e4b9c88c51aaad1a28a28e8b536697f")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              filterName: {
+                type: 'string',
+                title: i18nRuntime.i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              filterValue: {
+                type: 'string',
+                title: i18nRuntime.i18n("e125986c2ba6783c4297ffe5405cc8bc")
+              }
+            }
           }
         }
       }]
@@ -131,13 +149,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.searchName': {
-            type: 'string',
-            title: i18nRuntime.i18n("a80a4486100baf3f45fab3a59e4a816d")
-          },
-          'event.data.searchValue': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("b9a565fe1dc488efae1d63464f277f09")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              searchName: {
+                type: 'string',
+                title: i18nRuntime.i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              searchValue: {
+                type: 'object',
+                title: i18nRuntime.i18n("caafbcb52c70ad0bbbbf127ee7b08b89")
+              }
+            }
           }
         }
       }]
@@ -148,9 +172,15 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.movedItems': {
-            type: 'array',
-            title: i18nRuntime.i18n("1987561c006c7192ab619f81103d2a2f")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              movedItems: {
+                type: 'array',
+                title: i18nRuntime.i18n("64ef585f778c9d1b010e86b032398ab6")
+              }
+            }
           }
         }
       }]
@@ -161,9 +191,15 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.columns': {
-            type: 'array',
-            title: i18nRuntime.i18n("70567329ee851a5ba7e7301bd8e9d9a1")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              columns: {
+                type: 'array',
+                title: i18nRuntime.i18n("db9df54392e408520ca12c6a56113b5a")
+              }
+            }
           }
         }
       }]
@@ -174,13 +210,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("7bb4a8abc423086dbd1edeed4cd3f718")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18nRuntime.i18n("f74fd69ce55e3f96fe9a032c0da42330")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18nRuntime.i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18nRuntime.i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -191,13 +233,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("7bb4a8abc423086dbd1edeed4cd3f718")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18nRuntime.i18n("f74fd69ce55e3f96fe9a032c0da42330")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18nRuntime.i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18nRuntime.i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -208,13 +256,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("7bb4a8abc423086dbd1edeed4cd3f718")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18nRuntime.i18n("f74fd69ce55e3f96fe9a032c0da42330")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18nRuntime.i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18nRuntime.i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -224,20 +278,7 @@ var TablePlugin = /** @class */function (_super) {
       actionLabel: i18nRuntime.i18n("8eb3c8b16106e5487cd1fa3b8a1342ce"),
       description: i18nRuntime.i18n("908cc16fe4f7972450167e26276ac726"),
       innerArgs: ['selected'],
-      schema: helper.getArgsWrapper([
-      /*
-      {
-        type: 'input-formula',
-        variables: '${variables}',
-        evalMode: false,
-        variableMode: 'tabs',
-        label: '选中项',
-        size: 'lg',
-        name: 'selected',
-        mode: 'horizontal'
-      }
-      */
-      amisEditorCore.getSchemaTpl('formulaControl', {
+      schema: helper.getArgsWrapper([amisEditorCore.getSchemaTpl('formulaControl', {
         name: 'selected',
         label: i18nRuntime.i18n("a2b39e5a8b5015234dcd8e07a2e00e3d"),
         variables: '${variables}',
@@ -294,7 +335,7 @@ var TablePlugin = /** @class */function (_super) {
                   size: "sm",
                   block: true,
                   onClick: _this.editHeaderDetail.bind(_this, context.id)
-                }, "\u914D\u7F6E\u5934\u90E8")
+                }, i18nRuntime.i18n("e6aa1b827415217c524ae9d9b665cca5"))
               }]
             }
           }, {
@@ -310,7 +351,7 @@ var TablePlugin = /** @class */function (_super) {
                   size: "sm",
                   block: true,
                   onClick: _this.editFooterDetail.bind(_this, context.id)
-                }, "\u914D\u7F6E\u5E95\u90E8")
+                }, i18nRuntime.i18n("a2ecfd5a0db9c855f59eea75083678e6"))
               }]
             }
           }
@@ -407,7 +448,7 @@ var TablePlugin = /** @class */function (_super) {
             name: 'rowClassNameExpr',
             type: 'input-text',
             label: i18nRuntime.i18n("76b3250fb1e8593fac075b64029300fa"),
-            placeholder: "\u652F\u6301\u6A21\u677F\u8BED\u6CD5\uFF0C\u5982 <%= data.id % 2 ? 'bg-success' : '' %>"
+            placeholder: i18nRuntime.i18n("1fe38acb67e766f7767d9f8e88bfe990")
           }]
         }, {
           title: i18nRuntime.i18n("261bba7ad82914e477f4b37f6a83874e"),
@@ -561,91 +602,119 @@ var TablePlugin = /** @class */function (_super) {
       });
     }
   };
-  TablePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
-    var _a;
+  TablePlugin.prototype.buildDataSchemas = function (node, region, trigger, parent) {
+    var _a, _b, _c, _d, _e, _f;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var itemsSchema, columns, _b, _c, current, cellProperties, isColumnChild;
-      var e_1, _d;
-      return tslib.__generator(this, function (_e) {
-        itemsSchema = {
-          $id: 'tableRow',
-          type: 'object',
-          properties: {}
-        };
-        columns = node.children.find(function (item) {
-          return item.isRegion && item.region === 'columns';
-        });
-        try {
-          // todo：以下的处理无效，需要cell实现才能深层细化
-          // for (let current of columns?.children) {
-          //   const schema = current.schema;
-          //   if (schema.name) {
-          //     itemsSchema.properties[schema.name] = current.info?.plugin
-          //       ?.buildDataSchemas
-          //       ? await current.info.plugin.buildDataSchemas(current, region)
-          //       : {
-          //           type: 'string',
-          //           title: schema.label || schema.name
-          //         };
-          //   }
-          // }
-          // 一期先简单处理，上面todo实现之后，这里可以废弃
-          // table 无法根据source确定异步数据来源，因此不能在table层做异步数据列的收集
-          for (_b = tslib.__values((_a = node.schema) === null || _a === void 0 ? void 0 : _a.columns), _c = _b.next(); !_c.done; _c = _b.next()) {
-            current = _c.value;
-            if (current.name) {
-              itemsSchema.properties[current.name] = {
-                type: 'string',
-                title: current.label || current.name
-              };
+      var itemsSchema, columns, parentScopeId, isColumnChild, scopeId, index, cells, cell, items, current, schema, _g, _h, sourceMatch1, sourceMatch2, source_1, scope, rowMembers, scopeId, scope;
+      return tslib.__generator(this, function (_j) {
+        switch (_j.label) {
+          case 0:
+            itemsSchema = {
+              $id: "".concat(node.id, "-").concat(node.type, "-tableRows"),
+              type: 'object',
+              properties: {}
+            };
+            columns = node.children.find(function (item) {
+              return item.isRegion && item.region === 'columns';
+            });
+            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 = amisCore.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 = i18nRuntime.i18n("bf2a4fd8ecd654982e2d466f10f54d3f");
+                this.manager.dataSchema.current.group = i18nRuntime.i18n("813a5158d9f7171d20e7df340c5b48f9");
+              }
             }
-          }
-        } catch (e_1_1) {
-          e_1 = {
-            error: e_1_1
-          };
-        } finally {
-          try {
-            if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
-          } finally {
-            if (e_1) throw e_1.error;
-          }
-        }
-        if ((region === null || region === void 0 ? void 0 : region.region) === 'columns') {
-          return [2 /*return*/, itemsSchema];
-        }
-        cellProperties = {};
-        if (trigger) {
-          isColumnChild = amisCore.someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
-            return item.id === trigger.id;
-          });
-          isColumnChild && (cellProperties = itemsSchema.properties);
-        }
-        return [2 /*return*/, {
-          $id: 'table',
-          type: 'object',
-          properties: tslib.__assign(tslib.__assign({}, cellProperties), {
-            rows: {
-              type: 'array',
-              title: i18nRuntime.i18n("77fdd35933c099cdcb64b71f3fbe7a6c"),
-              items: itemsSchema
-            },
-            selectedItems: {
-              type: 'array',
-              title: i18nRuntime.i18n("41c5c859a80b635c23b3b4d1d8b44efb")
-              // items: itemsSchema
-            },
-            unSelectedItems: {
-              type: 'array',
-              title: i18nRuntime.i18n("f87912f19be48f36e4e261e585764d6e")
-              // items: itemsSchema
+            index = 0;
+            cells = columns.children.concat();
+            _j.label = 1;
+          case 1:
+            if (!(cells.length > 0 && index < node.schema.columns.length)) return [3 /*break*/, 6];
+            cell = cells.shift();
+            items = cell.children.concat();
+            _j.label = 2;
+          case 2:
+            if (!items.length) return [3 /*break*/, 5];
+            current = items.shift();
+            schema = current.schema;
+            if (!schema.name) return [3 /*break*/, 4];
+            _g = itemsSchema.properties;
+            _h = 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[_h] = _j.sent();
+            _j.label = 4;
+          case 4:
+            return [3 /*break*/, 2];
+          case 5:
+            index++;
+            return [3 /*break*/, 1];
+          case 6:
+            // 收集source绑定的列表成员
+            if (node.schema.source) {
+              sourceMatch1 = node.schema.source.match(/\$\{(.*?)\}/);
+              sourceMatch2 = node.schema.source.match(/\$(\w+$)/);
+              source_1 = sourceMatch1 ? sourceMatch1[1] : sourceMatch2 ? sourceMatch2[1] : '';
+              scope = this.manager.dataSchema.getScope("".concat(node.info.id, "-").concat(node.info.type));
+              while (scope) {
+                rowMembers = scope.schemas.find(function (item) {
+                  var _a;
+                  return (_a = item.properties) === null || _a === void 0 ? void 0 : _a[source_1];
+                });
+                if (rowMembers) {
+                  itemsSchema = tslib.__assign(tslib.__assign({}, itemsSchema), {
+                    properties: tslib.__assign(tslib.__assign({}, itemsSchema.properties), (_f = (_e = (_d = rowMembers.properties) === null || _d === void 0 ? void 0 : _d[source_1]) === null || _e === void 0 ? void 0 : _e.items) === null || _f === void 0 ? void 0 : _f.properties)
+                  });
+                }
+                scope = rowMembers ? undefined : scope.parent;
+              }
             }
-          })
-        }];
+            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: "".concat(node.id, "-").concat(node.type),
+              type: 'object',
+              properties: {
+                rows: {
+                  type: 'array',
+                  title: i18nRuntime.i18n("77fdd35933c099cdcb64b71f3fbe7a6c"),
+                  items: itemsSchema
+                },
+                selectedItems: {
+                  type: 'array',
+                  title: i18nRuntime.i18n("41c5c859a80b635c23b3b4d1d8b44efb"),
+                  items: itemsSchema
+                },
+                unSelectedItems: {
+                  type: 'array',
+                  title: i18nRuntime.i18n("f87912f19be48f36e4e261e585764d6e"),
+                  items: itemsSchema
+                }
+              }
+            }];
+        }
       });
     });
   };
-
   TablePlugin.prototype.editHeaderDetail = function (id) {
     var _a;
     var manager = this.manager;
@@ -698,6 +767,7 @@ var TablePlugin = /** @class */function (_super) {
       }
     });
   };
+  TablePlugin.id = 'TablePlugin';
   return TablePlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(TablePlugin);

package/lib/plugin/Table2.d.ts

@@ -1,6 +1,7 @@
 import { BasePlugin, PluginEvent, RegionConfig, RendererInfoResolveEventContext, BasicRendererInfo, InsertEventContext, ScaffoldForm, EditorNodeType, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 import type { SchemaObject } from 'amis';
 export declare class Table2Plugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;