amis-editor 6.10.0-beta.1 → 6.11.0-beta.0

package/lib/plugin/Steps.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0-beta.1
- * build time: 2024-11-27
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 
@@ -43,77 +43,82 @@ var StepsPlugin = /** @class */function (_super) {
     _this.previewSchema = tslib.__assign({}, _this.scaffold);
     _this.panelTitle = 'Steps';
     _this.panelBody = [amisEditorCore.getSchemaTpl('tabs', [{
-      title: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
-      body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
-        value: 'left-top'
-      }), amisEditorCore.getSchemaTpl('combo-container', {
-        name: 'steps',
-        label: i18nRuntime.i18n("b8a2d347bdb22fde367a851df8335771"),
-        type: 'combo',
-        scaffold: {
-          type: 'wrapper',
-          body: i18nRuntime.i18n("bc78248b34b7bf18691e6d385e0f544b")
-        },
-        minLength: 2,
-        multiple: true,
-        draggable: true,
-        items: [amisEditorCore.getSchemaTpl('title', {
-          label: false,
-          placeholder: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab")
-        }), amisEditorCore.getSchemaTpl('stepSubTitle'), amisEditorCore.getSchemaTpl('stepDescription')]
-      }), {
-        name: 'value',
-        type: 'input-text',
-        label: i18nRuntime.i18n("59cecbff0cc77511590d2161cc3058e9"),
-        description: i18nRuntime.i18n("c207ba29769aca6ffd45db9f80bcb29e")
-      }, {
-        name: 'status',
-        type: 'select',
-        label: i18nRuntime.i18n("6bf1f392c0a404d1f7558e6dcdd6c2e6"),
-        creatable: true,
-        value: 'finish',
-        options: [{
-          label: i18nRuntime.i18n("fb852fc6cce168301447d1baff276dc5"),
-          value: 'process'
-        }, {
-          label: i18nRuntime.i18n("8797922788916874c39ee1524bbc3638"),
-          value: 'wait'
-        }, {
-          label: i18nRuntime.i18n("769d88e425e03120b83ee4ed6b9d588e"),
-          value: 'finish'
+      title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
+      body: amisEditorCore.getSchemaTpl('collapseGroup', [{
+        title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
+        body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+          value: 'left-top'
+        }), amisEditorCore.getSchemaTpl('combo-container', {
+          name: 'steps',
+          label: i18nRuntime.i18n("b8a2d347bdb22fde367a851df8335771"),
+          type: 'combo',
+          scaffold: {
+            type: 'wrapper',
+            body: i18nRuntime.i18n("bc78248b34b7bf18691e6d385e0f544b")
+          },
+          minLength: 2,
+          multiple: true,
+          draggable: true,
+          items: [amisEditorCore.getSchemaTpl('title', {
+            label: false,
+            placeholder: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab")
+          }), amisEditorCore.getSchemaTpl('stepSubTitle'), amisEditorCore.getSchemaTpl('stepDescription')]
+        }), {
+          name: 'value',
+          type: 'input-text',
+          label: i18nRuntime.i18n("59cecbff0cc77511590d2161cc3058e9"),
+          description: i18nRuntime.i18n("c207ba29769aca6ffd45db9f80bcb29e")
         }, {
-          label: i18nRuntime.i18n("ad8e01fe719bf1a5af82ee0d100d246b"),
-          value: 'error'
-        }]
-      }, amisEditorCore.getSchemaTpl('api', {
-        name: 'source',
-        label: i18nRuntime.i18n("d1f03ea8d9d3c3a241e8a340b8a384d3")
-      })]
+          name: 'status',
+          type: 'select',
+          label: i18nRuntime.i18n("6bf1f392c0a404d1f7558e6dcdd6c2e6"),
+          creatable: true,
+          value: 'finish',
+          options: [{
+            label: i18nRuntime.i18n("fb852fc6cce168301447d1baff276dc5"),
+            value: 'process'
+          }, {
+            label: i18nRuntime.i18n("8797922788916874c39ee1524bbc3638"),
+            value: 'wait'
+          }, {
+            label: i18nRuntime.i18n("769d88e425e03120b83ee4ed6b9d588e"),
+            value: 'finish'
+          }, {
+            label: i18nRuntime.i18n("ad8e01fe719bf1a5af82ee0d100d246b"),
+            value: 'error'
+          }]
+        }, amisEditorCore.getSchemaTpl('api', {
+          name: 'source',
+          label: i18nRuntime.i18n("d1f03ea8d9d3c3a241e8a340b8a384d3")
+        })]
+      }, amisEditorCore.getSchemaTpl('status')])
     }, {
       title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
-      body: [amisEditorCore.getSchemaTpl('switch', {
-        name: 'iconPosition',
-        label: '图标文字垂直展示',
-        value: false
-      }), {
-        name: 'mode',
-        type: 'select',
-        label: i18nRuntime.i18n("f0789e79d48f135e5d870753f7a85d05"),
-        value: 'horizontal',
-        options: [{
-          label: i18nRuntime.i18n("4cde06e6162ed66720e3133cb83bc059"),
-          value: 'horizontal'
-        }, {
-          label: i18nRuntime.i18n("2a9a1329b191c2787b1a70c289e3bbe0"),
-          value: 'vertical'
-        }, {
-          label: i18nRuntime.i18n("d517acb68fbed2331b57d1a11ca21dcc"),
-          value: 'simple'
-        }]
-      }, amisEditorCore.getSchemaTpl('className')]
-    }, {
-      title: i18nRuntime.i18n("33bf801796fd255b5f6147e33146669b"),
-      body: [amisEditorCore.getSchemaTpl('visible')]
+      body: amisEditorCore.getSchemaTpl('collapseGroup', [{
+        title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
+        body: [{
+          name: 'mode',
+          type: 'select',
+          label: i18nRuntime.i18n("f0789e79d48f135e5d870753f7a85d05"),
+          value: 'horizontal',
+          options: [{
+            label: i18nRuntime.i18n("4cde06e6162ed66720e3133cb83bc059"),
+            value: 'horizontal'
+          }, {
+            label: i18nRuntime.i18n("2a9a1329b191c2787b1a70c289e3bbe0"),
+            value: 'vertical'
+          }, {
+            label: i18nRuntime.i18n("d517acb68fbed2331b57d1a11ca21dcc"),
+            value: 'simple'
+          }]
+        }, amisEditorCore.getSchemaTpl('switch', {
+          name: 'iconPosition',
+          label: '图标文字垂直展示',
+          value: false
+        })]
+      }, amisEditorCore.getSchemaTpl('style:classNames', {
+        isFormItem: false
+      })])
     }])];
     return _this;
   }

package/lib/plugin/Submit.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0-beta.1
- * build time: 2024-11-27
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 

package/lib/plugin/SwitchContainer.d.ts

@@ -15,10 +15,12 @@ export declare class SwitchContainerPlugin extends LayoutBasePlugin {
         type: string;
         items: {
             title: string;
+            id: string;
             body: {
                 type: string;
                 tpl: string;
                 wrapperComponent: string;
+                id: string;
             }[];
         }[];
         style: {
@@ -30,10 +32,12 @@ export declare class SwitchContainerPlugin extends LayoutBasePlugin {
         type: string;
         items: {
             title: string;
+            id: string;
             body: {
                 type: string;
                 tpl: string;
                 wrapperComponent: string;
+                id: string;
             }[];
         }[];
         style: {

package/lib/plugin/SwitchContainer.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0-beta.1
- * build time: 2024-11-27
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 
@@ -12,6 +12,7 @@ var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
 require('../renderer/event-control/index.js');
 var React = require('react');
+var util = require('../util.js');
 var i18nRuntime = require('i18n-runtime');
 var helper = require('../renderer/event-control/helper.js');
 
@@ -38,17 +39,21 @@ var SwitchContainerPlugin = /** @class */function (_super) {
       type: 'switch-container',
       items: [{
         title: i18nRuntime.i18n("f449bcac0f09a349882e74800f20d724"),
+        id: util.generateId(),
         body: [{
           type: 'tpl',
           tpl: i18nRuntime.i18n("3b5a5cee1bd8775463be15d96eac23a1"),
-          wrapperComponent: ''
+          wrapperComponent: '',
+          id: util.generateId()
         }]
       }, {
         title: i18nRuntime.i18n("f7361c5ad849477766b12e970bbd71f0"),
+        id: util.generateId(),
         body: [{
           type: 'tpl',
           tpl: i18nRuntime.i18n("0880f36708cd0408167f318936cc6df1"),
-          wrapperComponent: ''
+          wrapperComponent: '',
+          id: util.generateId()
         }]
       }],
       style: {

package/lib/plugin/Table.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0-beta.1
- * build time: 2024-11-27
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 
@@ -397,6 +397,7 @@ var TablePlugin = /** @class */function (_super) {
             pipeIn: function (value) {
               return value !== null && value !== void 0 ? value : true;
             },
+            falseValue: false,
             form: {
               body: [{
                 children: React__default["default"].createElement(amis.Button, {
@@ -416,6 +417,7 @@ var TablePlugin = /** @class */function (_super) {
             pipeIn: function (value) {
               return value !== null && value !== void 0 ? value : true;
             },
+            falseValue: false,
             form: {
               body: [{
                 children: React__default["default"].createElement(amis.Button, {

package/lib/plugin/Table2.d.ts

@@ -4,7 +4,7 @@ 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 type Table2DynamicControls = Partial<Record<'primaryField' | 'rowSelectionKeyField' | 'expandableKeyField' | 'quickSaveApi' | 'quickSaveItemApi' | 'draggable' | 'itemDraggableOn' | 'saveOrderApi', (context: BaseEventContext) => any> & Record<'columnTogglable', (context: BaseEventContext, isCRUDContext: boolean) => any>>;
 export declare class Table2Plugin extends BasePlugin {
     static id: string;
     disabledRendererPlugin: boolean;

package/lib/plugin/Table2.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.10.0-beta.1
- * build time: 2024-11-27
+ * amis-editor v6.11.0-beta.0
+ * build time: 2024-12-10
  * Copyright 2018-2024 @fex
  */
 
@@ -17,11 +17,14 @@ var DSBuilderManager = require('../builder/DSBuilderManager.js');
 var constants = require('./CRUD2/constants.js');
 var helper = require('../renderer/event-control/helper.js');
 var util = require('../util.js');
+var cloneDeep = require('lodash/cloneDeep');
+var utils = require('./CRUD2/utils.js');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 
 var Table2RenderereEvent = [{
   eventName: 'selectedChange',
@@ -409,14 +412,14 @@ var Table2Plugin = /** @class */function (_super) {
       rowSelectionKeyField: function (context) {
         return {
           type: 'input-text',
-          name: 'rowSelection.keyField',
+          name: 'keyField',
           label: i18nRuntime.i18n("dad6519c7c75a23bee8ccb576e4609a2")
         };
       },
       expandableKeyField: function (context) {
         return {
           type: 'input-text',
-          name: 'rowSelection.keyField',
+          name: 'keyField',
           label: i18nRuntime.i18n("dad6519c7c75a23bee8ccb576e4609a2")
         };
       },
@@ -443,8 +446,35 @@ var Table2Plugin = /** @class */function (_super) {
           }
         });
       },
-      columnTogglable: function (context) {
-        return false;
+      columnTogglable: function (context, isCRUDContext) {
+        return amisEditorCore.getSchemaTpl('switch', {
+          name: 'columnsTogglable',
+          label: amisEditorCore.tipedLabel(i18nRuntime.i18n("2816cea6c4887a53c417831deb5fbe00"), i18nRuntime.i18n("d3c5079f7e26b1a7374ff76341376de4")),
+          onChange: function (value, oldValue, model, form) {
+            // 单独table2使用时不需要放到顶部容器，由table2内部自己处理即可
+            if (!isCRUDContext) {
+              return undefined;
+            }
+            var schema = cloneDeep__default["default"](form.data);
+            if (value === true) {
+              utils.addSchema2Toolbar(schema, {
+                type: 'column-toggler',
+                btnClassName: 'm-l-xs'
+              }, 'header', 'right');
+            } else {
+              utils.deepRemove(schema.headerToolbar, function (item) {
+                return item.type === 'column-toggler';
+              });
+              schema.columns.forEach(function (item) {
+                if (item.toggled !== undefined) {
+                  delete item.toggled;
+                }
+              });
+            }
+            form.setValues(schema);
+            return undefined;
+          }
+        });
       }
     };
     _this.panelBodyCreator = function (context) {
@@ -535,7 +565,7 @@ var Table2Plugin = /** @class */function (_super) {
           ].filter(Boolean)
         }, {
           title: i18nRuntime.i18n("949a8b7bd2c10070a2fae16f9c66afbb"),
-          body: [(_d = dc === null || dc === void 0 ? void 0 : dc.columnTogglable) === null || _d === void 0 ? void 0 : _d.call(dc, context), amisEditorCore.getSchemaTpl('switch', {
+          body: [(_d = dc === null || dc === void 0 ? void 0 : dc.columnTogglable) === null || _d === void 0 ? void 0 : _d.call(dc, context, isCRUDContext), amisEditorCore.getSchemaTpl('switch', {
             name: 'resizable',
             label: amisEditorCore.tipedLabel(i18nRuntime.i18n("ba4f461832cbdb7fbdb170fc9c1db647"), i18nRuntime.i18n("aa2bd9f54608c0c85d3ceecb707938c9")),
             pipeIn: function (value) {
@@ -544,30 +574,7 @@ var Table2Plugin = /** @class */function (_super) {
             pipeOut: function (value) {
               return value;
             }
-          }), isCRUDContext ? null : {
-            type: 'ae-Switch-More',
-            mode: 'normal',
-            name: 'columnsTogglable',
-            hiddenOnDefault: true,
-            formType: 'extend',
-            label: amisEditorCore.tipedLabel(i18nRuntime.i18n("2816cea6c4887a53c417831deb5fbe00"), i18nRuntime.i18n("d3c5079f7e26b1a7374ff76341376de4")),
-            pipeOut: function (value) {
-              if (value && value.columnsTogglable) {
-                return {
-                  columnsTogglable: {
-                    type: 'column-toggler'
-                  }
-                };
-              }
-              return value;
-            },
-            form: {
-              body: [{
-                mode: 'normal',
-                type: 'ae-columnControl'
-              }]
-            }
-          }].filter(Boolean)
+          })].filter(Boolean)
         }, {
           title: i18nRuntime.i18n("ed85be57262e5a0c3116293e88278fef"),
           body: [{
@@ -577,10 +584,11 @@ var Table2Plugin = /** @class */function (_super) {
             label: i18nRuntime.i18n("240145572215920ae06db1eeb85b29c0"),
             hiddenOnDefault: true,
             formType: 'extend',
+            bulk: false,
             form: {
               body: [/** 如果为 CRUD 背景下，主键配置、选择类型在 CRUD 面板中，此处应该隐藏 */
               isCRUDContext ? null : (_e = dc === null || dc === void 0 ? void 0 : dc.rowSelectionKeyField) === null || _e === void 0 ? void 0 : _e.call(dc, context), isCRUDContext ? null : {
-                name: 'rowSelection.type',
+                name: 'type',
                 label: i18nRuntime.i18n("5e1872b4afc82fc5114b32aaf4477500"),
                 type: 'button-group-select',
                 options: [{
@@ -598,11 +606,11 @@ var Table2Plugin = /** @class */function (_super) {
                   return (schema === null || schema === void 0 ? void 0 : schema.selectable) === true ? schema.multiple ? 'checkbox' : 'radio' : 'checkbox';
                 }
               }, amisEditorCore.getSchemaTpl('switch', {
-                name: 'rowSelection.fixed',
+                name: 'fixed',
                 label: i18nRuntime.i18n("9c5c1f96ba29b9c0a8915be950e91cb3")
               }), {
                 type: 'input-number',
-                name: 'rowSelection.columnWidth',
+                name: 'columnWidth',
                 label: i18nRuntime.i18n("5fd9a061aa8d25137801caf78d8d0f42"),
                 min: 0,
                 pipeOut: function (data) {
@@ -610,7 +618,7 @@ var Table2Plugin = /** @class */function (_super) {
                 }
               }, {
                 label: i18nRuntime.i18n("1f1ca9df5fa3648c718ad04649888943"),
-                name: 'rowSelection.rowClick',
+                name: 'rowClick',
                 type: 'button-group-select',
                 value: false,
                 options: [{
@@ -621,10 +629,10 @@ var Table2Plugin = /** @class */function (_super) {
                   value: false
                 }]
               }, amisEditorCore.getSchemaTpl('formulaControl', {
-                name: 'rowSelection.disableOn',
+                name: 'disableOn',
                 label: i18nRuntime.i18n("388855093d17f3df43ff80242d7a1bed")
               }), {
-                name: 'rowSelection.selections',
+                name: 'selections',
                 label: i18nRuntime.i18n("46705a530ba9721527a4202bae7091bd"),
                 type: 'checkboxes',
                 joinValues: false,
@@ -684,11 +692,12 @@ var Table2Plugin = /** @class */function (_super) {
             label: i18nRuntime.i18n("49b4aa407b91ac997e27314e30c03110"),
             hiddenOnDefault: true,
             formType: 'extend',
+            bulk: false,
             form: {
               body: [(_f = dc === null || dc === void 0 ? void 0 : dc.expandableKeyField) === null || _f === void 0 ? void 0 : _f.call(dc, context), {
                 type: 'select',
                 label: i18nRuntime.i18n("4d250d2754fbdc9cbd131bf48d445894"),
-                name: 'expandable.position',
+                name: 'position',
                 options: [{
                   label: i18nRuntime.i18n("18c63459a2c069022c7790430f761214"),
                   value: ''
@@ -703,7 +712,7 @@ var Table2Plugin = /** @class */function (_super) {
                   value: 'none'
                 }]
               }, amisEditorCore.getSchemaTpl('formulaControl', {
-                name: 'expandable.expandableOn',
+                name: 'expandableOn',
                 visibleOn: 'this.expandable',
                 label: i18nRuntime.i18n("ea7026a83bf0b63ecc31fd8e215766de")
               }), {
@@ -714,17 +723,17 @@ var Table2Plugin = /** @class */function (_super) {
                   var value = _a.value,
                     onBulkChange = _a.onBulkChange;
                     _a.onChange;
-                    var name = _a.name;
+                    _a.name;
                     _a.data;
                     _a.form;
-                  var newValue = tslib.__assign(tslib.__assign({}, value), value && value.type ? {} : {
+                  var newValue = (value === null || value === void 0 ? void 0 : value.type) ? value : {
                     type: 'container',
                     body: [{
                       type: 'tpl',
                       tpl: i18nRuntime.i18n("1a7bd457c08093cf2cf887403dc249d8"),
                       inline: false
                     }]
-                  });
+                  };
                   return React__default["default"].createElement(amis.Button, {
                     className: "w-full flex flex-col items-center",
                     onClick: function () {
@@ -732,8 +741,7 @@ var Table2Plugin = /** @class */function (_super) {
                         title: i18nRuntime.i18n("9e9b4716c08d4f15d9d52e00281f4265"),
                         value: newValue,
                         onChange: function (value) {
-                          var _a;
-                          onBulkChange((_a = {}, _a[name] = value, _a));
+                          onBulkChange(value);
                         },
                         data: tslib.__assign({}, _this.manager.store.ctx) //默认数据
                       });
@@ -759,22 +767,17 @@ var Table2Plugin = /** @class */function (_super) {
             mode: 'normal',
             formType: 'extend',
             bulk: true,
-            defaultData: {
-              itemBadge: {
-                mode: 'dot'
-              }
-            },
-            isChecked: function (e) {
-              var data = e.data,
-                name = e.name;
-              return data[name];
-            },
             form: {
               body: [{
                 type: 'ae-badge',
                 label: false,
                 name: 'itemBadge',
-                contentsOnly: true
+                node: context.node,
+                contentsOnly: true,
+                value: {
+                  mode: 'dot',
+                  offset: [0, 0]
+                }
               }]
             }
           }]
@@ -1103,7 +1106,6 @@ var Table2Plugin = /** @class */function (_super) {
           inline: false
         }];
       }
-      props.expandable.keyField = 'id';
       props.expandable.expandedRowKeys = [1];
     }
     if (props.value) {