amis-editor 5.6.2 → 5.6.3

package/esm/renderer/crud2-control/AddColumnModal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -139,11 +139,13 @@ var AddColumnModal = function (props) {
     show: visible,
     onHide: onClose,
     closeOnEsc: false,
-    contentClassName: "ae-Scaffold-Modal AMISCSSWrapper"
+    contentClassName: "ae-Scaffold-Modal :AMISCSSWrapper"
   }, React__default.createElement(Modal.Header, {
     showCloseButton: true,
     onClose: onClose
-  }, React__default.createElement(Modal.Title, null, i18n("49198f84cea6c212cd5d463037827cd5"))), React__default.createElement(Modal.Body, null, render('column-control-modal', {
+  }, React__default.createElement(Modal.Title, {
+    className: "ae-Scaffold-Modal-title"
+  }, i18n("49198f84cea6c212cd5d463037827cd5"))), React__default.createElement(Modal.Body, null, render('column-control-modal', {
     type: 'form',
     title: '',
     mode: 'horizontal',
@@ -253,4 +255,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = themeable(AddColumnModal);
 
 export { AddColumnModal$1 as default };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/crud2-control/CRUDColumnControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -111,7 +111,6 @@ var CRUDColumnControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDColumnControl.prototype.dragRef = function (ref) {
     if (!this.drag && ref) {
       this.initDragging();
@@ -296,7 +295,6 @@ var CRUDColumnControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDColumnControl.prototype.renderOption = function (item, index) {
     var _this = this;
     var _a, _b, _c;
@@ -425,17 +423,17 @@ var CRUDColumnControl = /** @class */function (_super) {
       tipPlacement: "bottom",
       size: "sm",
       className: cx('flex')
-    }) : Array.isArray(options) && options.length > 0 ? React__default.createElement(React__default.Fragment, null, this.renderHeader(), React__default.createElement("ul", {
+    }) : React__default.createElement(React__default.Fragment, null, this.renderHeader(), Array.isArray(options) && options.length > 0 ? React__default.createElement("ul", {
       className: cx('ae-CRUDConfigControl-list'),
       ref: this.dragRef
     }, options.map(function (item, index) {
       return _this.renderOption(item, index);
-    }))) : React__default.createElement("ul", {
+    })) : React__default.createElement("ul", {
       className: cx('ae-CRUDConfigControl-list'),
       ref: this.dragRef
     }, React__default.createElement("p", {
       className: cx("ae-CRUDConfigControl-placeholder")
-    }, i18n("21efd88b67a39834582ad99aabb9dc60"))), showAddModal ? React__default.createElement(AddColumnModal, {
+    }, i18n("21efd88b67a39834582ad99aabb9dc60")))), showAddModal ? React__default.createElement(AddColumnModal, {
       render: this.props.render,
       visible: showAddModal,
       initData: addModalData,
@@ -470,4 +468,4 @@ var CRUDColumnControl = /** @class */function (_super) {
 })(CRUDColumnControl);
 
 export { CRUDColumnControl };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/crud2-control/CRUDFiltersControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -87,7 +87,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
               });
               return [2 /*return*/];
             }
-
             this.setState({
               loading: true
             });
@@ -160,7 +159,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDFiltersControl.prototype.updateSimpleQuery = function (enable) {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function () {
@@ -274,7 +272,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDFiltersControl.prototype.updateAdvancedQuery = function (enable) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -368,7 +365,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDFiltersControl.prototype.updateFuzzyQuery = function (enable) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function () {
@@ -395,7 +391,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
               }
               return [2 /*return*/];
             }
-
             if (!!headerToolbar) return [3 /*break*/, 2];
             _l = (_k = CRUDNode).updateSchema;
             _m = [__assign({}, CRUDSchema)];
@@ -490,7 +485,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDFiltersControl.prototype.handleToggle = function (checked) {
     return __awaiter(this, void 0, void 0, function () {
       var _a, feat, builder;
@@ -537,7 +531,6 @@ var CRUDFiltersControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDFiltersControl.prototype.handleEdit = function (item) {
     var manager = this.props.manager;
     var targetNodeId = item ? item === null || item === void 0 ? void 0 : item.nodeId : this.state.targetNodeId;
@@ -688,4 +681,4 @@ var CRUDFiltersControl = /** @class */function (_super) {
 })(CRUDFiltersControl);
 
 export { CRUDFiltersControl };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/crud2-control/CRUDToolbarControl.d.ts

@@ -32,8 +32,7 @@ export declare class CRUDToolbarControl extends React.Component<CRUDToolbarContr
     collection: ActionValue[];
     constructor(props: CRUDToolbarControlProps);
     componentDidMount(): void;
-    componentDidUpdate(prevProps: Readonly<CRUDToolbarControlProps>): void;
-    getActions(props: CRUDToolbarControlProps): EditorNodeType[];
+    getActionNodes(props: CRUDToolbarControlProps): EditorNodeType[];
     initOptions(actions: EditorNodeType[]): void;
     getOptionLabel(schema: any, behavior: ActionValue): any;
     handleEdit(item: Option): void;

package/esm/renderer/crud2-control/CRUDToolbarControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -8,16 +8,16 @@ import { __extends, __awaiter, __generator, __decorate, __metadata, __assign } f
 import React__default from 'react';
 import { findDOMNode } from 'react-dom';
 import cloneDeep from 'lodash/cloneDeep';
+import pick from 'lodash/pick';
 import { toast, Button, Icon, Spinner, autobind, FormItem } from 'amis';
 import { TooltipWrapper } from 'amis-ui';
-import { findTreeAll } from 'amis-core';
 import { JSONPipeIn } from 'amis-editor-core';
 import { DSFeatureEnum, DSFeature } from '../../builder/constants.js';
-import 'lodash/isObjectLike';
+import { traverseSchemaDeep } from '../../builder/utils.js';
 import '../../builder/DSBuilder.js';
 import '../../builder/DSBuilderManager.js';
 import '../../builder/ApiDSBuilder.js';
-import { deepRemove } from '../../plugin/CRUD2/utils.js';
+import { deepRemove, addSchema2Toolbar } from '../../plugin/CRUD2/utils.js';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -38,28 +38,29 @@ var CRUDToolbarControl = /** @class */function (_super) {
   }
   CRUDToolbarControl.prototype.componentDidMount = function () {
     this.dom = findDOMNode(this);
-    var actions = this.getActions(this.props);
+    var actions = this.getActionNodes(this.props);
     this.initOptions(actions);
   };
-  CRUDToolbarControl.prototype.componentDidUpdate = function (prevProps) {
-    if (prevProps.data.headerToolbar !== this.props.data.headerToolbar) {
-      var actions = this.getActions(this.props);
-      this.initOptions(actions);
-    }
-  };
-  CRUDToolbarControl.prototype.getActions = function (props) {
+  CRUDToolbarControl.prototype.getActionNodes = function (props) {
     var manager = props.manager,
-      nodeId = props.nodeId;
+      nodeId = props.nodeId,
+      _a = props.name,
+      name = _a === void 0 ? 'headerToolbar' : _a;
     var store = manager.store;
-    var node = store.getNodeById(nodeId);
-    var actions = findTreeAll(node.children, function (item) {
-      return [DSFeatureEnum.Insert, DSFeatureEnum.BulkEdit, DSFeatureEnum.BulkDelete, 'custom'].includes(item.schema.behavior);
+    var hostNode = store.getNodeById(nodeId);
+    var actionNodes = [];
+    traverseSchemaDeep(pick(hostNode === null || hostNode === void 0 ? void 0 : hostNode.schema, name), function (key, value, host) {
+      if (key === 'behavior' && [DSFeatureEnum.Insert, DSFeatureEnum.BulkEdit, DSFeatureEnum.BulkDelete, 'custom'].includes(value)) {
+        var node = store.getNodeById(host === null || host === void 0 ? void 0 : host.$$id);
+        !!node && actionNodes.push(node);
+      }
+      return [key, value];
     });
-    return actions;
+    return actionNodes;
   };
   CRUDToolbarControl.prototype.initOptions = function (actions) {
     var _this = this;
-    if (!actions || !actions.length) {
+    if (!actions || !Array.isArray(actions) || !actions.length) {
       this.setState({
         options: []
       });
@@ -95,14 +96,14 @@ var CRUDToolbarControl = /** @class */function (_super) {
   CRUDToolbarControl.prototype.handleAddAction = function (type) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-      var _d, onBulkChange, ctx, nodeId, manager, builder, options, node, CRUDSchemaID, scaffold, _e, headerToolbarSchema, actionSchema;
+      var _d, onChange, ctx, nodeId, manager, builder, options, node, CRUDSchemaID, scaffold, _e, headerToolbarSchema, actionSchema;
       return __generator(this, function (_f) {
         switch (_f.label) {
           case 0:
             this.setState({
               loading: true
             });
-            _d = this.props, onBulkChange = _d.onBulkChange, ctx = _d.data, nodeId = _d.nodeId, manager = _d.manager, builder = _d.builder;
+            _d = this.props, _d.onBulkChange, onChange = _d.onChange, ctx = _d.data, nodeId = _d.nodeId, manager = _d.manager, builder = _d.builder;
             options = this.state.options.concat();
             node = manager.store.getNodeById(nodeId);
             CRUDSchemaID = (_a = node === null || node === void 0 ? void 0 : node.schema) === null || _a === void 0 ? void 0 : _a.id;
@@ -195,7 +196,6 @@ var CRUDToolbarControl = /** @class */function (_super) {
               });
               return [2 /*return*/];
             }
-
             headerToolbarSchema = cloneDeep(ctx.headerToolbar);
             actionSchema = JSONPipeIn(__assign({}, scaffold));
             options.push({
@@ -208,30 +208,25 @@ var CRUDToolbarControl = /** @class */function (_super) {
               options: options,
               loading: false
             }, function () {
-              var _a, _b, _c;
-              var target = (_c = (_b = (_a = headerToolbarSchema === null || headerToolbarSchema === void 0 ? void 0 : headerToolbarSchema[0]) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.body;
-              if (target && Array.isArray(target)) {
-                target.push(actionSchema);
-              } else {
-                headerToolbarSchema.unshift(actionSchema);
-              }
-              onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange({
+              var fakeCRUD = {
                 headerToolbar: headerToolbarSchema
-              });
+              };
+              /** 自适应添加操作按钮到顶部工具栏 */
+              addSchema2Toolbar(fakeCRUD, actionSchema, 'header', 'left');
+              onChange === null || onChange === void 0 ? void 0 : onChange(fakeCRUD.headerToolbar, true, true);
             });
             return [2 /*return*/];
         }
       });
     });
   };
-
   CRUDToolbarControl.prototype.handleDelete = function (option, index) {
     return __awaiter(this, void 0, void 0, function () {
-      var _a, env, ctx, onBulkChange, options, confirmed, headerToolbarSchema, marked;
+      var _a, env, ctx, onChange, options, confirmed, headerToolbarSchema, marked;
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            _a = this.props, env = _a.env, ctx = _a.data, onBulkChange = _a.onBulkChange;
+            _a = this.props, env = _a.env, ctx = _a.data, _a.onBulkChange, onChange = _a.onChange;
             options = this.state.options.concat();
             return [4 /*yield*/, env.confirm("\u786E\u5B9A\u8981\u5220\u9664\u5DE5\u5177\u680F\u4E2D\u300C".concat(option.label, "\u300D\u5417\uFF1F"))];
           case 1:
@@ -246,9 +241,7 @@ var CRUDToolbarControl = /** @class */function (_super) {
                 this.setState({
                   options: options
                 }, function () {
-                  onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange({
-                    headerToolbar: headerToolbarSchema
-                  });
+                  onChange === null || onChange === void 0 ? void 0 : onChange(headerToolbarSchema, true, true);
                 });
               }
             }
@@ -257,7 +250,6 @@ var CRUDToolbarControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDToolbarControl.prototype.renderOption = function (item, index) {
     var _this = this;
     var _a;
@@ -414,4 +406,4 @@ var CRUDToolbarControl = /** @class */function (_super) {
 })(CRUDToolbarControl);
 
 export { CRUDToolbarControl };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/event-control/action-config-dialog.d.ts

@@ -68,6 +68,7 @@ export default class ActionDialog extends React.Component<ActionDialogProp> {
         placeholder: string;
         onChange: (value: string, oldVal: any, data: any, form: any) => void;
     };
+    getCommonUseActionSchema(): any;
     render(): JSX.Element;
 }
 export {};

package/esm/renderer/event-control/action-config-dialog.js

@@ -1,11 +1,11 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
-import { __extends, __assign } from 'tslib';
-import { tipedLabel, getSchemaTpl } from 'amis-editor-core';
+import { __extends, __assign, __spreadArray, __read } from 'tslib';
+import { persistGet, tipedLabel, getSchemaTpl } from 'amis-editor-core';
 import React__default from 'react';
 import ActionConfigPanel from './action-config-panel.js';
 import { BASE_ACTION_PROPS } from './comp-action-select.js';
@@ -115,6 +115,36 @@ var ActionDialog = /** @class */function (_super) {
       });
     }
   };
+  // 获取常用动作列表schema
+  ActionDialog.prototype.getCommonUseActionSchema = function () {
+    var commonUseActions = persistGet('common-use-actions', []).slice(0, 5);
+    return commonUseActions.map(function (action) {
+      return {
+        type: 'tag',
+        label: action.label,
+        displayMode: 'rounded',
+        color: 'active',
+        style: {
+          borderColor: '#2468f2',
+          cursor: 'pointer'
+        },
+        onEvent: {
+          click: {
+            actions: [{
+              actionType: 'setValue',
+              componentName: 'actionType',
+              args: {
+                value: action.value
+              }
+            }, {
+              actionType: 'custom',
+              script: "document.querySelector('.action-tree li .is-checked')?.scrollIntoView()"
+            }]
+          }
+        }
+      };
+    });
+  };
   ActionDialog.prototype.render = function () {
     var _this = this;
     var _a;
@@ -128,6 +158,7 @@ var ActionDialog = /** @class */function (_super) {
       commonActions = _b.commonActions,
       onClose = _b.onClose,
       render = _b.render;
+    var commonUseActionSchema = this.getCommonUseActionSchema();
     return render('inner', {
       type: 'dialog',
       title: i18n("e9908cdf79e965f6907ce9f291cdfcf8"),
@@ -154,6 +185,16 @@ var ActionDialog = /** @class */function (_super) {
         // debug: true,
         onSubmit: (_a = this.props.onSubmit) === null || _a === void 0 ? void 0 : _a.bind(this, type),
         body: [{
+          type: 'flex',
+          className: 'common-actions',
+          justify: 'flex-start',
+          visibleOn: "".concat(commonUseActionSchema.length),
+          items: __spreadArray([{
+            type: 'tpl',
+            tpl: '常用动作：',
+            className: 'common-actions-label'
+          }], __read(commonUseActionSchema), false)
+        }, {
           type: 'grid',
           className: 'h-full',
           columns: [{
@@ -263,7 +304,7 @@ var ActionDialog = /** @class */function (_super) {
         style: {
           borderStyle: 'solid'
         },
-        className: 'action-config-panel AMISCSSWrapper'
+        className: 'action-config-panel :AMISCSSWrapper'
       }],
       onClose: onClose
     }, {
@@ -271,9 +312,8 @@ var ActionDialog = /** @class */function (_super) {
     });
     //   : null;
   };
-
   return ActionDialog;
 }(React__default.Component);
 
 export { ActionDialog as default };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/event-control/action-config-panel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -55,4 +55,4 @@ var ActionConfigPanel = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ActionConfigPanel as default };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/event-control/comp-action-select.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -62,4 +62,4 @@ var CmptActionSelect = /** @class */ (function (_super) {
 }(React__default.Component));
 
 export { BASE_ACTION_PROPS, CmptActionSelect as default };
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/esm/renderer/event-control/helper.d.ts

@@ -153,3 +153,7 @@ export declare const getEventControlConfig: (manager: EditorManager, context: Ba
     }>;
     actionConfigSubmitFormatter: (config: ActionConfig, type?: string, actionData?: ActionData, shcema?: any) => ActionConfig;
 };
+/**
+ * 更新localStorage存储的常用动作
+ */
+export declare const updateCommonUseActions: (action: Option) => void;