amis-editor 5.4.1 → 5.5.0

package/esm/plugin/Table.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -72,13 +72,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.selectedItems': {
-            type: 'array',
-            title: i18n("aeddca0456d8fe520dc95545a83458e9")
-          },
-          'event.data.unSelectedItems': {
-            type: 'array',
-            title: i18n("4f907cb94921bb62a8399adec922bb60")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              selectedItems: {
+                type: 'array',
+                title: i18n("94935dfa6c9b908515a593956ee7d07c")
+              },
+              unSelectedItems: {
+                type: 'array',
+                title: i18n("f10b94a4ac77878be53fad599a761928")
+              }
+            }
           }
         }
       }]
@@ -89,13 +95,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.orderBy': {
-            type: 'string',
-            title: i18n("652f155e644e82ebb0a1aed97ab6ab23")
-          },
-          'event.data.orderDir': {
-            type: 'string',
-            title: i18n("460e3a697d1680445a47139c0816fbe6")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              orderBy: {
+                type: 'string',
+                title: i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              orderDir: {
+                type: 'string',
+                title: i18n("c35c1a13309c6f9da9837857517e65fc")
+              }
+            }
           }
         }
       }]
@@ -106,13 +118,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.filterName': {
-            type: 'string',
-            title: i18n("ad11fba3ac676233f3105e76e7de0501")
-          },
-          'event.data.filterValue': {
-            type: 'string',
-            title: i18n("8e4b9c88c51aaad1a28a28e8b536697f")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              filterName: {
+                type: 'string',
+                title: i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              filterValue: {
+                type: 'string',
+                title: i18n("e125986c2ba6783c4297ffe5405cc8bc")
+              }
+            }
           }
         }
       }]
@@ -123,13 +141,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.searchName': {
-            type: 'string',
-            title: i18n("a80a4486100baf3f45fab3a59e4a816d")
-          },
-          'event.data.searchValue': {
+          data: {
             type: 'object',
-            title: i18n("b9a565fe1dc488efae1d63464f277f09")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              searchName: {
+                type: 'string',
+                title: i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              searchValue: {
+                type: 'object',
+                title: i18n("caafbcb52c70ad0bbbbf127ee7b08b89")
+              }
+            }
           }
         }
       }]
@@ -140,9 +164,15 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.movedItems': {
-            type: 'array',
-            title: i18n("1987561c006c7192ab619f81103d2a2f")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              movedItems: {
+                type: 'array',
+                title: i18n("64ef585f778c9d1b010e86b032398ab6")
+              }
+            }
           }
         }
       }]
@@ -153,9 +183,15 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.columns': {
-            type: 'array',
-            title: i18n("70567329ee851a5ba7e7301bd8e9d9a1")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              columns: {
+                type: 'array',
+                title: i18n("db9df54392e408520ca12c6a56113b5a")
+              }
+            }
           }
         }
       }]
@@ -166,13 +202,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("7bb4a8abc423086dbd1edeed4cd3f718")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -183,13 +225,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("7bb4a8abc423086dbd1edeed4cd3f718")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -200,13 +248,19 @@ var TablePlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("7bb4a8abc423086dbd1edeed4cd3f718")
-          },
-          'event.data.index': {
-            type: 'number',
-            title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -216,20 +270,7 @@ var TablePlugin = /** @class */function (_super) {
       actionLabel: i18n("8eb3c8b16106e5487cd1fa3b8a1342ce"),
       description: i18n("908cc16fe4f7972450167e26276ac726"),
       innerArgs: ['selected'],
-      schema: getArgsWrapper([
-      /*
-      {
-        type: 'input-formula',
-        variables: '${variables}',
-        evalMode: false,
-        variableMode: 'tabs',
-        label: '选中项',
-        size: 'lg',
-        name: 'selected',
-        mode: 'horizontal'
-      }
-      */
-      getSchemaTpl('formulaControl', {
+      schema: getArgsWrapper([getSchemaTpl('formulaControl', {
         name: 'selected',
         label: i18n("a2b39e5a8b5015234dcd8e07a2e00e3d"),
         variables: '${variables}',
@@ -554,11 +595,11 @@ var TablePlugin = /** @class */function (_super) {
     }
   };
   TablePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
-    var _a;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function () {
-      var itemsSchema, columns, _b, _c, current, cellProperties, isColumnChild;
-      var e_1, _d;
-      return __generator(this, function (_e) {
+      var itemsSchema, columns, _e, _f, current, sourceMatch1, sourceMatch2, source_1, scope, rowMembers, cellProperties, isColumnChild;
+      var e_1, _g;
+      return __generator(this, function (_h) {
         itemsSchema = {
           $id: 'tableRow',
           type: 'object',
@@ -582,9 +623,9 @@ var TablePlugin = /** @class */function (_super) {
           //   }
           // }
           // 一期先简单处理，上面todo实现之后，这里可以废弃
-          // table 无法根据source确定异步数据来源，因此不能在table层做异步数据列的收集
-          for (_b = __values((_a = node.schema) === null || _a === void 0 ? void 0 : _a.columns), _c = _b.next(); !_c.done; _c = _b.next()) {
-            current = _c.value;
+          // 收集table配置的列成员
+          for (_e = __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',
@@ -598,11 +639,30 @@ var TablePlugin = /** @class */function (_super) {
           };
         } finally {
           try {
-            if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
+            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];
+            });
+            if (rowMembers) {
+              itemsSchema = __assign(__assign({}, itemsSchema), {
+                properties: __assign(__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)
+              });
+            }
+            scope = rowMembers ? undefined : scope.parent;
+          }
+        }
         if ((region === null || region === void 0 ? void 0 : region.region) === 'columns') {
           return [2 /*return*/, itemsSchema];
         }
@@ -611,7 +671,13 @@ var TablePlugin = /** @class */function (_super) {
           isColumnChild = someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
             return item.id === trigger.id;
           });
-          isColumnChild && (cellProperties = itemsSchema.properties);
+          if (isColumnChild) {
+            Object.keys(itemsSchema.properties).map(function (key) {
+              cellProperties[key] = __assign(__assign({}, itemsSchema.properties[key]), {
+                group: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              });
+            });
+          }
         }
         return [2 /*return*/, {
           $id: 'table',
@@ -624,20 +690,19 @@ var TablePlugin = /** @class */function (_super) {
             },
             selectedItems: {
               type: 'array',
-              title: i18n("41c5c859a80b635c23b3b4d1d8b44efb")
-              // items: itemsSchema
+              title: i18n("41c5c859a80b635c23b3b4d1d8b44efb"),
+              items: itemsSchema
             },
             unSelectedItems: {
               type: 'array',
-              title: i18n("f87912f19be48f36e4e261e585764d6e")
-              // items: itemsSchema
+              title: i18n("f87912f19be48f36e4e261e585764d6e"),
+              items: itemsSchema
             }
           })
         }];
       });
     });
   };
-
   TablePlugin.prototype.editHeaderDetail = function (id) {
     var _a;
     var manager = this.manager;
@@ -690,6 +755,7 @@ var TablePlugin = /** @class */function (_super) {
       }
     });
   };
+  TablePlugin.id = 'TablePlugin';
   return TablePlugin;
 }(BasePlugin);
 registerEditorPlugin(TablePlugin);

package/esm/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;

package/esm/plugin/Table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -126,13 +126,19 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.selectedItems': {
-            type: 'array',
-            title: i18n("aeddca0456d8fe520dc95545a83458e9")
-          },
-          'event.data.unSelectedItems': {
-            type: 'array',
-            title: i18n("4f907cb94921bb62a8399adec922bb60")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              selectedItems: {
+                type: 'array',
+                title: i18n("94935dfa6c9b908515a593956ee7d07c")
+              },
+              unSelectedItems: {
+                type: 'array',
+                title: i18n("f10b94a4ac77878be53fad599a761928")
+              }
+            }
           }
         }
       }]
@@ -143,13 +149,19 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.orderBy': {
-            type: 'string',
-            title: i18n("652f155e644e82ebb0a1aed97ab6ab23")
-          },
-          'event.data.orderDir': {
-            type: 'string',
-            title: i18n("460e3a697d1680445a47139c0816fbe6")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              orderBy: {
+                type: 'string',
+                title: i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              orderDir: {
+                type: 'string',
+                title: i18n("c35c1a13309c6f9da9837857517e65fc")
+              }
+            }
           }
         }
       }]
@@ -160,13 +172,19 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.filterName': {
-            type: 'string',
-            title: i18n("ad11fba3ac676233f3105e76e7de0501")
-          },
-          'event.data.filterValue': {
-            type: 'string',
-            title: i18n("8e4b9c88c51aaad1a28a28e8b536697f")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              filterName: {
+                type: 'string',
+                title: i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              filterValue: {
+                type: 'string',
+                title: i18n("e125986c2ba6783c4297ffe5405cc8bc")
+              }
+            }
           }
         }
       }]
@@ -177,13 +195,19 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.searchName': {
-            type: 'string',
-            title: i18n("a80a4486100baf3f45fab3a59e4a816d")
-          },
-          'event.data.searchValue': {
+          data: {
             type: 'object',
-            title: i18n("b9a565fe1dc488efae1d63464f277f09")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              searchName: {
+                type: 'string',
+                title: i18n("8f98291c9fa89c0bfce463c0a2eaf97c")
+              },
+              searchValue: {
+                type: 'object',
+                title: i18n("caafbcb52c70ad0bbbbf127ee7b08b89")
+              }
+            }
           }
         }
       }]
@@ -194,9 +218,15 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.movedItems': {
-            type: 'array',
-            title: i18n("1987561c006c7192ab619f81103d2a2f")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              movedItems: {
+                type: 'array',
+                title: i18n("64ef585f778c9d1b010e86b032398ab6")
+              }
+            }
           }
         }
       }]
@@ -207,9 +237,15 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.columns': {
-            type: 'array',
-            title: i18n("70567329ee851a5ba7e7301bd8e9d9a1")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              columns: {
+                type: 'array',
+                title: i18n("db9df54392e408520ca12c6a56113b5a")
+              }
+            }
           }
         }
       }]
@@ -220,9 +256,65 @@ var Table2Plugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.item': {
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
+          }
+        }
+      }]
+    }, {
+      eventName: 'rowMouseEnter',
+      eventLabel: i18n("5db079b140feffa84c84d1b51d824dea"),
+      description: i18n("90a5608bcd85a3cfcfbb5263a229915c"),
+      dataSchema: [{
+        type: 'object',
+        properties: {
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
+          }
+        }
+      }]
+    }, {
+      eventName: 'rowMouseLeave',
+      eventLabel: i18n("e8bf039de5dc6751c4045f55930e0c83"),
+      description: i18n("f1ca0d305f3251a81f361a2dc8e11fff"),
+      dataSchema: [{
+        type: 'object',
+        properties: {
+          data: {
             type: 'object',
-            title: i18n("2fbbf5c38b66ac5496ac42246bbe9e0b")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              item: {
+                type: 'object',
+                title: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+              },
+              index: {
+                type: 'number',
+                title: i18n("f74fd69ce55e3f96fe9a032c0da42330")
+              }
+            }
           }
         }
       }]
@@ -231,20 +323,7 @@ var Table2Plugin = /** @class */function (_super) {
       actionType: 'select',
       actionLabel: i18n("8eb3c8b16106e5487cd1fa3b8a1342ce"),
       description: i18n("908cc16fe4f7972450167e26276ac726"),
-      schema: getArgsWrapper([
-      /*
-      {
-        type: 'input-formula',
-        variables: '${variables}',
-        evalMode: false,
-        variableMode: 'tabs',
-        label: '选中项',
-        size: 'lg',
-        name: 'selected',
-        mode: 'horizontal'
-      }
-      */
-      getSchemaTpl('formulaControl', {
+      schema: getArgsWrapper([getSchemaTpl('formulaControl', {
         name: 'selected',
         label: i18n("a2b39e5a8b5015234dcd8e07a2e00e3d"),
         variables: '${variables}',
@@ -792,6 +871,7 @@ var Table2Plugin = /** @class */function (_super) {
       });
     }
   };
+  Table2Plugin.id = 'Table2Plugin';
   return Table2Plugin;
 }(BasePlugin);
 registerEditorPlugin(Table2Plugin);

package/esm/plugin/TableCell2.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, BasicRendererInfo, RendererInfoResolveEventContext, ReplaceEventContext, PluginEvent, AfterBuildPanelBody } from 'amis-editor-core';
 export declare class TableCell2Plugin extends BasePlugin {
+    static id: string;
     panelTitle: string;
     panelIcon: string;
     afterBuildPanelBody(event: PluginEvent<AfterBuildPanelBody>): void;

package/esm/plugin/TableCell2.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -451,6 +451,7 @@ var TableCell2Plugin = /** @class */function (_super) {
       context.data.key = context.data.key || context.schema.key;
     }
   };
+  TableCell2Plugin.id = 'TableCell2Plugin';
   return TableCell2Plugin;
 }(BasePlugin);
 registerEditorPlugin(TableCell2Plugin);

package/esm/plugin/TableView.d.ts

@@ -1,9 +1,9 @@
 /**
  * @file table view 组件的可视化编辑
  */
-import React from 'react';
 import { BaseEventContext, BasePlugin, BasicPanelItem, BasicToolbarItem, BuildPanelEventContext, RegionConfig, VRendererConfig } from 'amis-editor-core';
 export declare class TableViewPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;
@@ -83,7 +83,7 @@ export declare class TableViewPlugin extends BasePlugin {
     };
     tdVRendererConfig: VRendererConfig;
     trVRendererConfig: VRendererConfig;
-    renderRenderer(props: any): React.JSX.Element;
+    renderRenderer(props: any): JSX.Element;
     buildEditorPanel(context: BuildPanelEventContext, panels: Array<BasicPanelItem>): void;
     /**
      * 插入行，需要处理前面有 rowspan 的情况

package/esm/plugin/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -757,6 +757,7 @@ var TableViewPlugin = /** @class */function (_super) {
       }
     }
   };
+  TableViewPlugin.id = 'TableViewPlugin';
   return TableViewPlugin;
 }(BasePlugin);
 registerEditorPlugin(TableViewPlugin);