amis-editor 5.4.1 → 5.5.0

package/esm/plugin/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -13,7 +13,6 @@ import { getSchemaTpl, JSONPipeIn, defaultValue, tipedLabel, getI18nEnabled, jso
 import { setVariable, normalizeApi, someTree } from 'amis-core';
 import { getEnv } from 'mobx-state-tree';
 import isPlainObject from 'lodash/isPlainObject';
-import omit from 'lodash/omit';
 import { i18n } from 'i18n-runtime';
 
 var viewTypeToEditType = function (type) {
@@ -58,17 +57,23 @@ var CRUDPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.responseData': {
+          data: {
             type: 'object',
-            title: i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
-          },
-          'event.data.responseStatus': {
-            type: 'number',
-            title: i18n("23d861e4b6635508eb877a50a9333a9b")
-          },
-          'event.data.responseMsg': {
-            type: 'string',
-            title: i18n("a303669d47440ed05558efbf3d5d0592")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              responseData: {
+                type: 'object',
+                title: i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
+              },
+              responseStatus: {
+                type: 'number',
+                title: i18n("23d861e4b6635508eb877a50a9333a9b")
+              },
+              responseMsg: {
+                type: 'string',
+                title: i18n("a303669d47440ed05558efbf3d5d0592")
+              }
+            }
           }
         }
       }]
@@ -79,13 +84,19 @@ var CRUDPlugin = /** @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("6142a89066ca7dd6a1ce9493462c5aca")
+              },
+              unSelectedItems: {
+                type: 'array',
+                title: i18n("21bd0846bd8aa2296c597a1c1ff8e1a7")
+              }
+            }
           }
         }
       }]
@@ -96,13 +107,19 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -113,13 +130,19 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -130,13 +153,19 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -147,9 +176,15 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -160,9 +195,15 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -173,13 +214,19 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -190,13 +237,19 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -207,13 +260,19 @@ var CRUDPlugin = /** @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")
+              }
+            }
           }
         }
       }]
@@ -1552,11 +1611,11 @@ var CRUDPlugin = /** @class */function (_super) {
     }
   };
   CRUDPlugin.prototype.buildDataSchemas = function (node, region, trigger) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function () {
-      var child, childSchame, cellProperties, columns, isColumnChild, scope, menberProps;
-      return __generator(this, function (_g) {
-        switch (_g.label) {
+      var child, childSchame, cellProperties_1, itemsSchema_1, columns, rowsSchema, isColumnChild_1, scope, menberProps, tmpProperties_1;
+      return __generator(this, function (_h) {
+        switch (_h.label) {
           case 0:
             child = node.children.find(function (item) {
               return !!~['table', 'table2', 'cards', 'list'].indexOf(item.type);
@@ -1567,31 +1626,47 @@ var CRUDPlugin = /** @class */function (_super) {
 
             return [4 /*yield*/, child.info.plugin.buildDataSchemas(child, undefined, trigger)];
           case 1:
-            childSchame = _g.sent();
+            childSchame = _h.sent();
             // 兼容table的rows，并自行merged异步数据
             if (child.type === 'table') {
-              cellProperties = {};
+              cellProperties_1 = {};
+              itemsSchema_1 = {};
               columns = child.children.find(function (item) {
                 return item.isRegion && item.region === 'columns';
               });
+              rowsSchema = (_c = childSchame.properties.rows) === null || _c === void 0 ? void 0 : _c.items;
               if (trigger) {
-                isColumnChild = someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
+                isColumnChild_1 = someTree(columns === null || columns === void 0 ? void 0 : columns.children, function (item) {
                   return item.id === trigger.id;
                 });
-                // merge异步数据中的单列成员，因为rendererBeforeDispatchEvent无法区分是否需要单列成员
-                if (isColumnChild) {
-                  scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));
-                  menberProps = (_f = (_e = (_d = (_c = scope.getSchemaById('crudFetchInitedData')) === null || _c === void 0 ? void 0 : _c.properties) === null || _d === void 0 ? void 0 : _d.items) === null || _e === void 0 ? void 0 : _e.items) === null || _f === void 0 ? void 0 : _f.properties;
-                  cellProperties = __assign(__assign({}, menberProps), omit(childSchame.properties, 'rows', 'selectedItems', 'unSelectedItems'));
-                }
+                scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));
+                menberProps = (_g = (_f = (_e = (_d = scope.getSchemaById('crudFetchInitedData')) === null || _d === void 0 ? void 0 : _d.properties) === null || _e === void 0 ? void 0 : _e.items) === null || _f === void 0 ? void 0 : _f.items) === null || _g === void 0 ? void 0 : _g.properties;
+                tmpProperties_1 = __assign(__assign({}, menberProps), rowsSchema === null || rowsSchema === void 0 ? void 0 : rowsSchema.properties);
+                Object.keys(tmpProperties_1).map(function (key) {
+                  if (isColumnChild_1) {
+                    // 给列补充group
+                    cellProperties_1[key] = __assign(__assign({}, cellProperties_1[key]), {
+                      group: i18n("bf2a4fd8ecd654982e2d466f10f54d3f")
+                    });
+                  }
+                  itemsSchema_1[key] = __assign({}, tmpProperties_1[key]);
+                });
               }
               childSchame = {
                 $id: childSchame.$id,
                 type: childSchame.type,
-                properties: __assign(__assign({}, cellProperties), {
+                properties: __assign(__assign({}, cellProperties_1), {
                   items: childSchame.properties.rows,
-                  selectedItems: childSchame.properties.selectedItems,
-                  unSelectedItems: childSchame.properties.unSelectedItems,
+                  selectedItems: __assign(__assign({}, childSchame.properties.selectedItems), {
+                    items: __assign(__assign({}, childSchame.properties.selectedItems.items), {
+                      properties: itemsSchema_1
+                    })
+                  }),
+                  unSelectedItems: __assign(__assign({}, childSchame.properties.selectedItems), {
+                    items: __assign(__assign({}, childSchame.properties.unSelectedItems.items), {
+                      properties: itemsSchema_1
+                    })
+                  }),
                   count: {
                     type: 'number',
                     title: i18n("31769d6063c5ab0cfee842b395916fd4")
@@ -1680,6 +1755,7 @@ var CRUDPlugin = /** @class */function (_super) {
       actions: actions
     };
   };
+  CRUDPlugin.id = 'CRUDPlugin';
   return CRUDPlugin;
 }(BasePlugin);
 registerEditorPlugin(CRUDPlugin);

package/esm/plugin/CRUD2.d.ts

@@ -1,4 +1,4 @@
-import { AfterBuildPanelBody, BaseEventContext, BasePlugin, BasicRendererInfo, PluginEvent, RendererInfoResolveEventContext, ScaffoldForm, EditorManager, EditorNodeType, DSBuilder, DSBuilderManager, DSFeatureType, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
+import { AfterBuildPanelBody, BaseEventContext, BasePlugin, BasicRendererInfo, PluginEvent, RendererInfoResolveEventContext, ScaffoldForm, EditorManager, EditorNodeType, DSBuilder, DSBuilderManager, DSFeatureType, RendererPluginAction } from 'amis-editor-core';
 import type { CRUD2Schema } from 'amis';
 import { FeatureOption } from '../renderer/FeatureControl';
 type FeatOption = {
@@ -9,6 +9,7 @@ type FeatOption = {
     align?: 'left' | 'right';
 };
 export declare class CRUDPlugin extends BasePlugin {
+    static id: string;
     constructor(manager: EditorManager);
     afterBuildPanelBody(event: PluginEvent<AfterBuildPanelBody>): Promise<void>;
     addFilterPanelSetting(context: AfterBuildPanelBody): Promise<void>;
@@ -34,7 +35,6 @@ export declare class CRUDPlugin extends BasePlugin {
     /** 将数据资源和数据操作进行填充 */
     resolveListField(setting: any, schema: any, builder: DSBuilder): void;
     get scaffoldForm(): ScaffoldForm;
-    events: RendererPluginEvent[];
     actions: RendererPluginAction[];
     previewSchema: any;
     getRendererInfo(context: RendererInfoResolveEventContext): BasicRendererInfo | void;

package/esm/plugin/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -435,11 +435,6 @@ var CRUDPlugin = /** @class */function (_super) {
     _this.order = -1000;
     _this.docLink = '/amis/zh-CN/components/crud';
     _this.tags = [i18n("73721e611daaafe5c34aa9f3f901d016")];
-    _this.events = [{
-      eventName: 'get-data',
-      eventLabel: i18n("1b79a4f49b7a21e62b8868f12189b0b0"),
-      description: i18n("5a28d015b7b3518f75bc4cc27d9f6c20")
-    }];
     _this.actions = [{
       actionType: 'search',
       actionLabel: i18n("cfd84204d9476936c949d071cc2338cf"),
@@ -1303,6 +1298,7 @@ var CRUDPlugin = /** @class */function (_super) {
     });
   };
 
+  CRUDPlugin.id = 'CRUD2Plugin';
   return CRUDPlugin;
 }(BasePlugin);
 var TableCRUDPlugin = /** @class */function (_super) {

package/esm/plugin/Card.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, InsertEventContext, PluginEvent, RegionConfig, VRendererConfig } from 'amis-editor-core';
 export declare class CardPlugin extends BasePlugin {
+    static id: string;
     static scene: string[];
     rendererName: string;
     $schema: string;

package/esm/plugin/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -204,6 +204,7 @@ var CardPlugin = /** @class */function (_super) {
       });
     }
   };
+  CardPlugin.id = 'CardPlugin';
   CardPlugin.scene = ['layout'];
   return CardPlugin;
 }(BasePlugin);

package/esm/plugin/Card2.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, RegionConfig } from 'amis-editor-core';
 export declare class Card2Plugin extends BasePlugin {
+    static id: string;
     static scene: string[];
     rendererName: string;
     $schema: string;

package/esm/plugin/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -81,6 +81,7 @@ var Card2Plugin = /** @class */function (_super) {
     };
     return _this;
   }
+  Card2Plugin.id = 'Card2Plugin';
   Card2Plugin.scene = ['layout'];
   return Card2Plugin;
 }(BasePlugin);

package/esm/plugin/Cards.d.ts

@@ -1,5 +1,6 @@
 import { BaseEventContext, BasePlugin, BasicRendererInfo, BasicToolbarItem, ContextMenuEventContext, ContextMenuItem, RendererInfoResolveEventContext } from 'amis-editor-core';
 export declare class CardsPlugin extends BasePlugin {
+    static id: string;
     static scene: string[];
     rendererName: string;
     $schema: string;

package/esm/plugin/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -244,6 +244,7 @@ var CardsPlugin = /** @class */function (_super) {
     }
     return _super.prototype.getRendererInfo.call(this, context);
   };
+  CardsPlugin.id = 'CardsPlugin';
   CardsPlugin.scene = ['layout'];
   return CardsPlugin;
 }(BasePlugin);

package/esm/plugin/Carousel.d.ts

@@ -1,5 +1,6 @@
 import { BaseEventContext, BasePlugin, BasicToolbarItem } from 'amis-editor-core';
 export declare class CarouselPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/esm/plugin/Carousel.js

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

package/esm/plugin/Chart.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 export declare class ChartPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/esm/plugin/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -23,45 +23,51 @@ var ChartConfigEditor = function (_a) {
 var DEFAULT_EVENT_PARAMS = [{
   type: 'object',
   properties: {
-    'event.data.componentType': {
-      type: 'string',
-      title: 'componentType'
-    },
-    'event.data.seriesType': {
-      type: 'string',
-      title: 'seriesType'
-    },
-    'event.data.seriesIndex': {
-      type: 'number',
-      title: 'seriesIndex'
-    },
-    'event.data.seriesName': {
-      type: 'string',
-      title: 'seriesName'
-    },
-    'event.data.name': {
-      type: 'string',
-      title: 'name'
-    },
-    'event.data.dataIndex': {
-      type: 'number',
-      title: 'dataIndex'
-    },
-    'event.data.data': {
+    data: {
       type: 'object',
-      title: 'data'
-    },
-    'event.data.dataType': {
-      type: 'string',
-      title: 'dataType'
-    },
-    'event.data.value': {
-      type: 'number',
-      title: 'value'
-    },
-    'event.data.color': {
-      type: 'string',
-      title: 'color'
+      title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+      properties: {
+        componentType: {
+          type: 'string',
+          title: 'componentType'
+        },
+        seriesType: {
+          type: 'string',
+          title: 'seriesType'
+        },
+        seriesIndex: {
+          type: 'number',
+          title: 'seriesIndex'
+        },
+        seriesName: {
+          type: 'string',
+          title: 'seriesName'
+        },
+        name: {
+          type: 'string',
+          title: 'name'
+        },
+        dataIndex: {
+          type: 'number',
+          title: 'dataIndex'
+        },
+        data: {
+          type: 'object',
+          title: 'data'
+        },
+        dataType: {
+          type: 'string',
+          title: 'dataType'
+        },
+        value: {
+          type: 'number',
+          title: 'value'
+        },
+        color: {
+          type: 'string',
+          title: 'color'
+        }
+      }
     }
   }
 }];
@@ -106,9 +112,10 @@ var ChartPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18n("584e4b6108e132be92c9de09d7bbed72")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            description: i18n("85f1708454f409855d552f702ac27b19")
           }
         }
       }]
@@ -129,13 +136,19 @@ var ChartPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.name': {
-            type: 'string',
-            title: 'name'
-          },
-          'event.data.selected': {
+          data: {
             type: 'object',
-            title: 'selected'
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              name: {
+                type: 'string',
+                title: 'name'
+              },
+              selected: {
+                type: 'object',
+                title: 'selected'
+              }
+            }
           }
         }
       }]
@@ -276,6 +289,7 @@ var ChartPlugin = /** @class */function (_super) {
       }
     });
   };
+  ChartPlugin.id = 'ChartPlugin';
   return ChartPlugin;
 }(BasePlugin);
 registerEditorPlugin(ChartPlugin);

package/esm/plugin/CodeView.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin } from 'amis-editor-core';
 export declare class CodeViewPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/esm/plugin/CodeView.js

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