amis-editor 5.5.0 → 5.6.1

package/lib/plugin/Table.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -12,8 +13,10 @@ var React = require('react');
 var amis = require('amis');
 var amisEditorCore = require('amis-editor-core');
 var amisCore = require('amis-core');
+var DSBuilderManager = require('../builder/DSBuilderManager.js');
 var helper = require('../renderer/event-control/helper.js');
 var util = require('../util.js');
+var mobx = require('mobx');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -22,13 +25,13 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var TablePlugin = /** @class */function (_super) {
   tslib.__extends(TablePlugin, _super);
-  function TablePlugin() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
+  function TablePlugin(manager) {
+    var _this = _super.call(this, manager) || this;
     // 关联渲染器名字
     _this.rendererName = 'table';
     _this.$schema = '/schemas/TableSchema.json';
     // 组件名称
-    _this.name = i18nRuntime.i18n("b339aa87104709397ba68e7ebbc6e5ba");
+    _this.name = i18nRuntime.i18n("642d94fa418e15a3997bcf7488315e4d");
     _this.tags = [i18nRuntime.i18n("027446c2f9070b0f5b16a18208bf5fc7")];
     _this.isBaseComponent = true;
     _this.description = i18nRuntime.i18n("ea2b32f5d78d2305b9b7bc21e056a009");
@@ -335,7 +338,7 @@ var TablePlugin = /** @class */function (_super) {
                   size: "sm",
                   block: true,
                   onClick: _this.editHeaderDetail.bind(_this, context.id)
-                }, "\u914D\u7F6E\u5934\u90E8")
+                }, i18nRuntime.i18n("e6aa1b827415217c524ae9d9b665cca5"))
               }]
             }
           }, {
@@ -351,7 +354,7 @@ var TablePlugin = /** @class */function (_super) {
                   size: "sm",
                   block: true,
                   onClick: _this.editFooterDetail.bind(_this, context.id)
-                }, "\u914D\u7F6E\u5E95\u90E8")
+                }, i18nRuntime.i18n("a2ecfd5a0db9c855f59eea75083678e6"))
               }]
             }
           }
@@ -448,7 +451,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"),
@@ -476,6 +479,8 @@ var TablePlugin = /** @class */function (_super) {
         }, helper.getEventControlConfig(_this.manager, context)))]
       }]);
     };
+    _this.unWatchWidthChange = {};
+    _this.dsManager = new DSBuilderManager.DSBuilderManager(manager);
     return _this;
   }
   Object.defineProperty(TablePlugin.prototype, "scaffoldForm", {
@@ -602,115 +607,142 @@ var TablePlugin = /** @class */function (_super) {
       });
     }
   };
-  TablePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
-    var _a, _b, _c, _d;
+  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, _e, _f, current, sourceMatch1, sourceMatch2, source_1, scope, rowMembers, cellProperties, isColumnChild;
-      var e_1, _g;
-      return tslib.__generator(this, function (_h) {
-        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配置的列成员
-          for (_e = tslib.__values((_a = node.schema) === null || _a === void 0 ? void 0 : _a.columns), _f = _e.next(); !_f.done; _f = _e.next()) {
-            current = _f.value;
-            if (current.name) {
-              itemsSchema.properties[current.name] = {
-                type: 'string',
-                title: current.label || current.name
-              };
-            }
-          }
-        } catch (e_1_1) {
-          e_1 = {
-            error: e_1_1
-          };
-        } finally {
-          try {
-            if (_f && !_f.done && (_g = _e.return)) _g.call(_e);
-          } finally {
-            if (e_1) throw e_1.error;
-          }
-        }
-        // 收集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];
+      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';
             });
-            if (rowMembers) {
-              itemsSchema = tslib.__assign(tslib.__assign({}, itemsSchema), {
-                properties: tslib.__assign(tslib.__assign({}, itemsSchema.properties), (_d = (_c = (_b = rowMembers.properties) === null || _b === void 0 ? void 0 : _b[source_1]) === null || _c === void 0 ? void 0 : _c.items) === null || _d === void 0 ? void 0 : _d.properties)
+            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");
+              }
             }
-            scope = rowMembers ? undefined : scope.parent;
-          }
-        }
-        if ((region === null || region === void 0 ? void 0 : region.region) === 'columns') {
-          return [2 /*return*/, 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
+                }
+              }
+            }];
         }
-        cellProperties = {};
-        if (trigger) {
-          isColumnChild = amisCore.someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
-            return item.id === trigger.id;
-          });
-          if (isColumnChild) {
-            Object.keys(itemsSchema.properties).map(function (key) {
-              cellProperties[key] = tslib.__assign(tslib.__assign({}, itemsSchema.properties[key]), {
-                group: i18nRuntime.i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
-              });
-            });
+      });
+    });
+  };
+  TablePlugin.prototype.getAvailableContextFields = function (scopeNode, node, region) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var builder;
+      return tslib.__generator(this, function (_j) {
+        if (((_b = (_a = node === null || node === void 0 ? void 0 : node.info) === null || _a === void 0 ? void 0 : _a.renderer) === null || _b === void 0 ? void 0 : _b.name) === 'table-cell') {
+          if (((_c = scopeNode.parent) === null || _c === void 0 ? void 0 : _c.type) === 'service' && ((_f = (_e = (_d = scopeNode.parent) === null || _d === void 0 ? void 0 : _d.parent) === null || _e === void 0 ? void 0 : _e.path) === null || _f === void 0 ? void 0 : _f.endsWith('service'))) {
+            return [2 /*return*/, (_h = (_g = scopeNode.parent.parent.info.plugin).getAvailableContextFields) === null || _h === void 0 ? void 0 : _h.call(_g, scopeNode.parent.parent, node, region)];
           }
         }
-        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
-            }
-          })
-        }];
+        builder = this.dsManager.getBuilderBySchema(scopeNode.schema);
+        if (builder && scopeNode.schema.api) {
+          return [2 /*return*/, builder.getAvailableContextFields({
+            schema: scopeNode.schema,
+            sourceKey: 'api',
+            feat: 'List'
+          }, node)];
+        }
+        return [2 /*return*/];
       });
     });
   };
+
   TablePlugin.prototype.editHeaderDetail = function (id) {
     var _a;
     var manager = this.manager;
@@ -763,9 +795,30 @@ var TablePlugin = /** @class */function (_super) {
       }
     });
   };
+  TablePlugin.prototype.componentRef = function (node, ref) {
+    var _this = this;
+    var _a, _b;
+    if (ref) {
+      var store_1 = ref.props.store;
+      this.unWatchWidthChange[node.id] = mobx.reaction(function () {
+        return store_1.columns.map(function (column) {
+          return column.pristine.width;
+        }).join(',');
+      }, function () {
+        ref.updateTableInfoLazy(function () {
+          _this.manager.store.highlightNodes.forEach(function (node) {
+            return node.calculateHighlightBox();
+          });
+        });
+      });
+    } else {
+      (_b = (_a = this.unWatchWidthChange)[node.id]) === null || _b === void 0 ? void 0 : _b.call(_a);
+    }
+  };
   TablePlugin.id = 'TablePlugin';
   return TablePlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(TablePlugin);
 
 exports.TablePlugin = TablePlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Table2.d.ts

@@ -1,27 +1,41 @@
-import { BasePlugin, PluginEvent, RegionConfig, RendererInfoResolveEventContext, BasicRendererInfo, InsertEventContext, ScaffoldForm, EditorNodeType, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
+import { BasePlugin, BaseEventContext, PluginEvent, RegionConfig, RendererInfoResolveEventContext, BasicRendererInfo, InsertEventContext, ScaffoldForm, EditorNodeType, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
+import { DSBuilderManager } from '../builder/DSBuilderManager';
 import type { SchemaObject } from 'amis';
+import type { EditorManager } from 'amis-editor-core';
+export declare const Table2RenderereEvent: RendererPluginEvent[];
+export declare const Table2RendererAction: RendererPluginAction[];
+export type Table2DynamicControls = Partial<Record<'primaryField' | 'rowSelectionKeyField' | 'expandableKeyField' | 'quickSaveApi' | 'quickSaveItemApi' | 'draggable' | 'itemDraggableOn' | 'saveOrderApi' | 'columnTogglable', (context: BaseEventContext) => any>>;
 export declare class Table2Plugin extends BasePlugin {
     static id: string;
-    rendererName: string;
-    $schema: string;
+    disabledRendererPlugin: boolean;
     name: string;
+    panelTitle: string;
+    icon: string;
+    panelIcon: string;
+    pluginIcon: string;
+    rendererName: string;
     isBaseComponent: boolean;
     panelJustify: boolean;
-    disabledRendererPlugin: boolean;
+    $schema: string;
     description: string;
     docLink: string;
-    icon: string;
     scaffold: SchemaObject;
     regions: Array<RegionConfig>;
     previewSchema: any;
     scaffoldForm: ScaffoldForm;
-    panelTitle: string;
     events: RendererPluginEvent[];
     actions: RendererPluginAction[];
-    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
-    getAvailableContextFields(scopeNode: EditorNodeType, node: EditorNodeType, region?: EditorNodeType): Promise<void>;
-    panelBodyCreator: (context: BaseEventContext) => any;
-    filterProps(props: any): any;
+    dsManager: DSBuilderManager;
+    constructor(manager: EditorManager);
     getRendererInfo(context: RendererInfoResolveEventContext): BasicRendererInfo | void;
+    filterProps(props: any): any;
     beforeInsert(event: PluginEvent<InsertEventContext>): void;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
+    getAvailableContextFields(scopeNode: EditorNodeType, node: EditorNodeType, region?: EditorNodeType): Promise<any>;
+    protected _dynamicControls: Table2DynamicControls;
+    /** 需要动态控制的控件 */
+    get dynamicControls(): Table2DynamicControls;
+    set dynamicControls(controls: Table2DynamicControls);
+    isCRUDContext(context: BaseEventContext): boolean;
+    panelBodyCreator: (context: BaseEventContext) => any;
 }