amis-editor 5.3.0 → 5.4.0

package/esm/plugin/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Button.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -102,6 +102,7 @@ var ButtonPlugin = /** @class */function (_super) {
           name: "themeCss.className.background:".concat(state),
           labelMode: 'input',
           needGradient: true,
+          needImage: true,
           visibleOn: visibleOn,
           editorThemePath: "button1.type.${level}.".concat(state, ".body.bg-color")
         }), getSchemaTpl('theme:border', {
@@ -116,6 +117,11 @@ var ButtonPlugin = /** @class */function (_super) {
           name: "themeCss.className.radius:".concat(state),
           visibleOn: visibleOn,
           editorThemePath: "button1.size.${size}.body.border"
+        }), getSchemaTpl('theme:size', {
+          label: i18n("7893f221dae53be8e3bfe72d2eb8a240"),
+          name: "themeCss.iconClassName.iconSize:".concat(state),
+          visibleOn: visibleOn,
+          editorThemePath: "button1.size.${size}.body.icon-size"
         })];
       };
       return getSchemaTpl('tabs', [{

package/esm/plugin/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/CRUD.d.ts

@@ -1,6 +1,6 @@
 import { BasePlugin, BasicRendererInfo, BasicSubRenderInfo, ChangeEventContext, PluginEvent, RendererEventContext, RendererInfoResolveEventContext, ScaffoldForm, SubRendererInfo } from 'amis-editor-core';
 import type { CRUDCommonSchema } from 'amis';
-import { EditorNodeType, RendererPluginAction } from 'amis-editor-core';
+import type { EditorNodeType, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 type CRUDModes = CRUDCommonSchema['mode'];
 export declare class CRUDPlugin extends BasePlugin {
     rendererName: string;
@@ -14,6 +14,7 @@ export declare class CRUDPlugin extends BasePlugin {
     icon: string;
     pluginIcon: string;
     scaffold: any;
+    events: RendererPluginEvent[];
     actions: RendererPluginAction[];
     btnSchemas: {
         create: {
@@ -126,6 +127,7 @@ export declare class CRUDPlugin extends BasePlugin {
     filterProps(props: any): any;
     afterUpdate(event: PluginEvent<ChangeEventContext>): void;
     buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
+    rendererBeforeDispatchEvent(node: EditorNodeType, e: any, data: any): void;
     /** crud 不同 mode 之间转换时候，主体的转换 */
     transformByMode({ from, to, schema }: {
         from: CRUDModes;

package/esm/plugin/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -8,10 +8,11 @@ import { normalizeApiResponseData, toast } from 'amis';
 import get from 'lodash/get';
 import cloneDeep from 'lodash/cloneDeep';
 import React__default from 'react';
-import { getSchemaTpl, JSONPipeIn, defaultValue, tipedLabel, getI18nEnabled, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
-import { setVariable, normalizeApi } from 'amis-core';
+import { getSchemaTpl, JSONPipeIn, defaultValue, tipedLabel, getI18nEnabled, jsonToJsonSchema, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+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) {
@@ -49,6 +50,28 @@ var CRUDPlugin = /** @class */function (_super) {
       bulkActions: [],
       itemActions: []
     };
+    _this.events = [{
+      eventName: 'fetchInited',
+      eventLabel: i18n("f36616e35765ac3d5c9c7646e50a305d"),
+      description: i18n("48c43999cf3908d9f5100a6d5f0b4404"),
+      dataSchema: [{
+        type: 'object',
+        properties: {
+          'event.data.responseData': {
+            type: 'object',
+            title: i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
+          },
+          'event.data.responseStatus': {
+            type: 'number',
+            title: i18n("23d861e4b6635508eb877a50a9333a9b")
+          },
+          'event.data.responseMsg': {
+            type: 'string',
+            title: i18n("a303669d47440ed05558efbf3d5d0592")
+          }
+        }
+      }]
+    }];
     _this.actions = [{
       actionType: 'reload',
       actionLabel: i18n("64ca9bab920a2983bcf270320d850d00"),
@@ -851,6 +874,9 @@ var CRUDPlugin = /** @class */function (_super) {
         }), getSchemaTpl('switch', {
           name: 'alwaysShowPagination',
           label: i18n("fa9417bacb7714e82663655345ca213d")
+        }), getSchemaTpl('switch', {
+          name: 'autoFillHeight',
+          label: '内容区域自适应高度'
         }), getSchemaTpl('switch', {
           name: 'hideCheckToggler',
           label: i18n("e3d2a85f20608a5bde7d539969d03167"),
@@ -1370,21 +1396,81 @@ var CRUDPlugin = /** @class */function (_super) {
     }
   };
   CRUDPlugin.prototype.buildDataSchemas = function (node, region, trigger) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function () {
-      var child;
-      return __generator(this, function (_c) {
-        child = node.children.find(function (item) {
-          return !!~['table', 'table2', 'cards', 'list'].indexOf(item.type);
-        });
-        if (!((_b = (_a = child === null || child === void 0 ? void 0 : child.info) === null || _a === void 0 ? void 0 : _a.plugin) === null || _b === void 0 ? void 0 : _b.buildDataSchemas)) {
-          return [2 /*return*/];
-        }
+      var child, childSchame, cellProperties, columns, isColumnChild, scope, menberProps;
+      return __generator(this, function (_g) {
+        switch (_g.label) {
+          case 0:
+            child = node.children.find(function (item) {
+              return !!~['table', 'table2', 'cards', 'list'].indexOf(item.type);
+            });
+            if (!((_b = (_a = child === null || child === void 0 ? void 0 : child.info) === null || _a === void 0 ? void 0 : _a.plugin) === null || _b === void 0 ? void 0 : _b.buildDataSchemas)) {
+              return [2 /*return*/];
+            }
 
-        return [2 /*return*/, child.info.plugin.buildDataSchemas(child, undefined, trigger)];
+            return [4 /*yield*/, child.info.plugin.buildDataSchemas(child, undefined, trigger)];
+          case 1:
+            childSchame = _g.sent();
+            // 兼容table的rows，并自行merged异步数据
+            if (child.type === 'table') {
+              cellProperties = {};
+              columns = child.children.find(function (item) {
+                return item.isRegion && item.region === 'columns';
+              });
+              if (trigger) {
+                isColumnChild = 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'));
+                }
+              }
+              childSchame = {
+                $id: childSchame.$id,
+                type: childSchame.type,
+                properties: __assign(__assign({}, cellProperties), {
+                  items: childSchame.properties.rows,
+                  selectedItems: childSchame.properties.selectedItems,
+                  unSelectedItems: childSchame.properties.unSelectedItems,
+                  count: {
+                    type: 'number',
+                    title: i18n("31769d6063c5ab0cfee842b395916fd4")
+                  },
+                  page: {
+                    type: 'number',
+                    title: i18n("9a4fe969f1066e197fd2369a44d879ac")
+                  }
+                })
+              };
+            }
+            return [2 /*return*/, childSchame];
+        }
       });
     });
   };
+  CRUDPlugin.prototype.rendererBeforeDispatchEvent = function (node, e, data) {
+    if (e === 'fetchInited') {
+      var scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));
+      var jsonschema = __assign({
+        $id: 'crudFetchInitedData',
+        type: 'object'
+      }, jsonToJsonSchema(data.responseData, function (type, key) {
+        if (type === 'array' && key === 'items') {
+          return i18n("77fdd35933c099cdcb64b71f3fbe7a6c");
+        }
+        if (type === 'number' && key === 'count') {
+          return i18n("31769d6063c5ab0cfee842b395916fd4");
+        }
+        return key;
+      }));
+      scope === null || scope === void 0 ? void 0 : scope.removeSchema(jsonschema.$id);
+      scope === null || scope === void 0 ? void 0 : scope.addSchema(jsonschema);
+    }
+  };
   /** crud 不同 mode 之间转换时候，主体的转换 */
   CRUDPlugin.prototype.transformByMode = function (_a) {
     var _b, _c;

package/esm/plugin/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/CodeView.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/CustomRegion.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Datetime.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Dialog.js

@@ -1,10 +1,11 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
 import { __extends, __spreadArray, __read, __assign } from 'tslib';
 import React__default from 'react';
+import { Button } from 'amis-ui';
 import { noop, getSchemaTpl, defaultValue, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { getEventControlConfig } from '../renderer/event-control/helper.js';
 import { i18n } from 'i18n-runtime';
@@ -94,6 +95,76 @@ var DialogPlugin = /** @class */function (_super) {
     _this.panelTitle = i18n("ab3aec075a09d055b2a28c8b61925ee0");
     _this.panelJustify = true;
     _this.panelBodyCreator = function (context) {
+      var _a;
+      // 确认对话框的配置面板
+      if (((_a = context.schema) === null || _a === void 0 ? void 0 : _a.dialogType) === 'confirm') {
+        return getSchemaTpl('tabs', [{
+          title: i18n("24d67862f87f439db7ca957aecb77cce"),
+          body: getSchemaTpl('collapseGroup', [{
+            title: i18n("4092ed98e9035652d4c9ca9441701ed7"),
+            body: [getSchemaTpl('layout:originPosition', {
+              value: 'left-top'
+            }), {
+              label: i18n("32c65d8d7431e76029678ec7bb73a5ab"),
+              type: 'input-text',
+              name: 'title'
+            }, getSchemaTpl('layout:originPosition', {
+              value: 'left-top'
+            }), {
+              label: '确认按钮文案',
+              type: 'input-text',
+              name: 'confirmText'
+            }, getSchemaTpl('layout:originPosition', {
+              value: 'left-top'
+            }), {
+              label: '取消按钮文案',
+              type: 'input-text',
+              name: 'cancelText'
+            }, getSchemaTpl('switch', {
+              label: i18n("f29ab26877ed22ffa59636d747d824b9"),
+              name: 'closeOnEsc',
+              value: false
+            })]
+          }])
+        }, {
+          title: i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
+          body: getSchemaTpl('collapseGroup', [{
+            title: i18n("4092ed98e9035652d4c9ca9441701ed7"),
+            body: [{
+              label: i18n("c8339fd2a85af4ba66084d28df808de4"),
+              type: 'button-group-select',
+              name: 'size',
+              size: 'sm',
+              options: [{
+                label: i18n("544fac400db790f57ea8ee4207cbeb6b"),
+                value: ''
+              }, {
+                label: i18n("391b8fa9c747a1799353ab856e666ad5"),
+                value: 'sm'
+              }, {
+                label: i18n("aed1dfbc31703955e64806b799b67645"),
+                value: 'md'
+              }, {
+                label: i18n("ab18e30c0dc4093ceeda8961fac3d1f4"),
+                value: 'lg'
+              }, {
+                label: i18n("949934d97c42801151673a51d3adc421"),
+                value: 'xl'
+              }],
+              pipeIn: defaultValue(''),
+              pipeOut: function (value) {
+                return value ? value : undefined;
+              }
+            }, getSchemaTpl('buttonLevel', {
+              label: '确认按钮样式',
+              name: 'confirmBtnLevel'
+            }), getSchemaTpl('buttonLevel', {
+              label: '取消按钮样式',
+              name: 'cancelBtnLevel'
+            })]
+          }])
+        }]);
+      }
       return getSchemaTpl('tabs', [{
         title: i18n("24d67862f87f439db7ca957aecb77cce"),
         body: getSchemaTpl('collapseGroup', [{
@@ -183,9 +254,31 @@ var InlineModal = /** @class */function (_super) {
   }
   InlineModal.prototype.componentDidMount = function () {};
   InlineModal.prototype.render = function () {
-    var children = this.props.children;
+    var _a = this.props,
+      children = _a.children,
+      dialogType = _a.dialogType,
+      cancelText = _a.cancelText,
+      confirmText = _a.confirmText,
+      cancelBtnLevel = _a.cancelBtnLevel,
+      confirmBtnLevel = _a.confirmBtnLevel;
+    if (dialogType === 'confirm') {
+      children = children.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.key) !== 'actions';
+      });
+      return React__default.createElement("div", {
+        className: "ae-InlineModal"
+      }, children, React__default.createElement("div", {
+        className: "ae-InlineModal-footer"
+      }, React__default.createElement(Button, {
+        className: "ae-InlineModal-footer-btn",
+        level: cancelBtnLevel
+      }, cancelText || i18n("625fb26b4b3340f7872b411f401e754c")), React__default.createElement(Button, {
+        className: "ae-InlineModal-footer-btn",
+        level: confirmBtnLevel
+      }, confirmText || i18n("e83a256e4f5bb4ff8b3d804b5473217a"))));
+    }
     return React__default.createElement("div", {
-      className: "ae-InlineModel"
+      className: "ae-InlineModal"
     }, children);
   };
   return InlineModal;

package/esm/plugin/Divider.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Each.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Flex.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/ButtonToolbar.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/CodeEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Form/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -148,15 +148,23 @@ var FormPlugin = /** @class */function (_super) {
     // 事件定义
     _this.events = [{
       eventName: 'inited',
-      eventLabel: i18n("9328b90ded33d16a873db5c0dbd815b8"),
-      description: i18n("f3b97bd71a77cca1e9288089a537cf3b"),
+      eventLabel: i18n("f36616e35765ac3d5c9c7646e50a305d"),
+      description: i18n("48c43999cf3908d9f5100a6d5f0b4404"),
       // 表单数据为表单变量
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          'event.data.responseData': {
             type: 'object',
-            title: i18n("9787088794f42c7e476cf7580f81447e")
+            title: i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
+          },
+          'event.data.responseStatus': {
+            type: 'number',
+            title: i18n("23d861e4b6635508eb877a50a9333a9b")
+          },
+          'event.data.responseMsg': {
+            type: 'string',
+            title: i18n("a303669d47440ed05558efbf3d5d0592")
           }
         }
       }]
@@ -748,7 +756,7 @@ var FormPlugin = /** @class */function (_super) {
       var scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));
       var jsonschema = __assign({
         $id: 'formInitedData'
-      }, jsonToJsonSchema(data));
+      }, jsonToJsonSchema(data.responseData));
       scope === null || scope === void 0 ? void 0 : scope.removeSchema(jsonschema.$id);
       scope === null || scope === void 0 ? void 0 : scope.addSchema(jsonschema);
     }