amis-editor 6.12.0-beta.4 → 6.12.0-beta.6

package/lib/icons/show/markdown.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/show/plain.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/show/progress.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/show/sparkline.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/show/status.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/show/steps.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/show/time.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/icons/theme/css.svg.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/locale/en-US.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/locale/zh-CN.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Alert.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/AnchorNav.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Audio.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Avatar.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Breadcrumb.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Button.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/ButtonGroup.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/CRUD.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 
@@ -1249,7 +1249,69 @@ var CRUDPlugin = /** @class */function (_super) {
         }), amisEditorCore.getSchemaTpl('className'), amisEditorCore.getSchemaTpl('className', {
           name: 'bodyClassName',
           label: i18nRuntime.i18n("af1af0a7fad9e8bdcd21694d0e036e12")
-        })]
+        }), {
+          type: 'container',
+          visibleOn: "this.headerToolbar && this.headerToolbar.some(item => item === 'load-more' || item.type === 'load-more') || \n                      this.footerToolbar && this.footerToolbar.some(item => item === 'load-more' || item.type === 'load-more')",
+          body: [{
+            type: 'group',
+            body: [{
+              name: 'loadMoreProps.showIcon',
+              label: i18nRuntime.i18n("731f9b470e0948cbf56341a53c423213"),
+              type: 'switch',
+              value: true
+            }, {
+              name: 'loadMoreProps.showText',
+              label: i18nRuntime.i18n("bab9f8592e1b8e286ee17ddf5dbea4b3"),
+              type: 'switch',
+              value: true
+            }]
+          }, amisEditorCore.getSchemaTpl('icon', {
+            name: 'loadMoreProps.iconType',
+            label: amisEditorCore.tipedLabel('图标类型', '支持 fontawesome v4 图标、iconfont 图标。如需使用 fontawesome v5/v6 版本,需设置 vendor 为空字符串。默认为 loading-outline'),
+            value: 'loading-outline',
+            visibleOn: 'this.loadMoreProps && this.loadMoreProps.showIcon'
+          }), {
+            name: 'loadMoreProps.minLoadingTime',
+            type: 'input-number',
+            label: amisEditorCore.tipedLabel('最小加载时间', '指定加载时显示loading的最小时间(毫秒)'),
+            value: 0
+          }, {
+            name: 'loadMoreProps.dataAppendTo',
+            type: 'select',
+            label: amisEditorCore.tipedLabel('数据追加方式', '指定新加载的数据追加到已有数据的位置'),
+            value: 'bottom',
+            options: [{
+              label: '追加到底部',
+              value: 'bottom'
+            }, {
+              label: '追加到顶部',
+              value: 'top'
+            }]
+          }, {
+            type: 'group',
+            label: '文本配置',
+            visibleOn: 'this.loadMoreProps && this.loadMoreProps.showText',
+            body: [{
+              name: 'loadMoreProps.contentText.contentdown',
+              label: '加载前',
+              type: 'input-text',
+              value: '点击加载更多'
+            }, {
+              name: 'loadMoreProps.contentText.contentrefresh',
+              label: i18nRuntime.i18n("f013ea9dcba3f5ca1278aa850931fec8"),
+              type: 'input-text',
+              value: '加载中...'
+            }, {
+              name: 'loadMoreProps.contentText.contentnomore',
+              label: '加载完成',
+              type: 'input-text',
+              value: '没有更多数据了'
+            }]
+          }, amisEditorCore.getSchemaTpl('theme:colorPicker', {
+            name: 'loadMoreProps.color',
+            label: i18nRuntime.i18n("7ec907e7059b758ace2f3adb9bb803ff")
+          })]
+        }]
       }, {
         title: i18nRuntime.i18n("10b2761db5a8e089049df39675abc550"),
         className: 'p-none',
@@ -1359,8 +1421,8 @@ var CRUDPlugin = /** @class */function (_super) {
         }), {
           type: 'button',
           label: i18nRuntime.i18n("3dd674542204724eb5417efc7354ec73"),
-          className: 'm-t-xs m-b-xs',
-          visibleOn: '!!this.api.url',
+          className: 'm-b-sm',
+          visibleOn: '${api.url || api && ISTYPE(api, "string")}',
           onClick: function (e, props) {
             return tslib.__awaiter(_this, void 0, void 0, function () {
               var data, schemaFilter, api, response, result, autoFillKeyValues, items, _a, _b, key;
@@ -1418,12 +1480,6 @@ var CRUDPlugin = /** @class */function (_super) {
                       props.formStore.setValues({
                         columns: autoFillKeyValues
                       });
-                      // 查询条件的字段列表
-                      props.formStore.setValues({
-                        filterSettingSource: autoFillKeyValues.map(function (column) {
-                          return column.name;
-                        })
-                      });
                     } else {
                       amis.toast.warning(i18nRuntime.i18n("522cddc343d72db3db80cf3d71f99210"));
                     }
@@ -1469,7 +1525,7 @@ var CRUDPlugin = /** @class */function (_super) {
             label: i18nRuntime.i18n("f4b368051b455e386a314688c7c75c1f"),
             name: 'filterEnabledList',
             joinValues: false,
-            source: '${filterSettingSource}'
+            source: '${ARRAYMAP(ARRAYFILTER(columns, item => item.name), item => ({label: item.label || item.name, value: item.name}))}'
           }, {
             columnRatio: 2,
             type: 'input-number',

package/lib/plugin/CRUD2/BaseCRUD.d.ts

@@ -184,7 +184,7 @@ export declare class BaseCRUDPlugin extends BasePlugin {
         actions?: undefined;
         columns?: undefined;
         type: string;
-        mode: "table2" | "cards" | "list";
+        mode: "cards" | "list" | "table2";
         source: string;
         data: {
             items: {
@@ -222,7 +222,7 @@ export declare class BaseCRUDPlugin extends BasePlugin {
         card?: undefined;
         columns?: undefined;
         type: string;
-        mode: "table2" | "cards" | "list";
+        mode: "cards" | "list" | "table2";
         source: string;
         data: {
             items: {
@@ -239,7 +239,7 @@ export declare class BaseCRUDPlugin extends BasePlugin {
         listItem?: undefined;
         actions?: undefined;
         type: string;
-        mode: "table2" | "cards" | "list";
+        mode: "cards" | "list" | "table2";
         source: string;
         data: {
             items: {

package/lib/plugin/CRUD2/BaseCRUD.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 
@@ -765,6 +765,104 @@ var BaseCRUDPlugin = /** @class */function (_super) {
             headerToolbar: schema.headerToolbar
           });
         }
+      }, {
+        type: 'container',
+        visibleOn: 'this.loadType === "more"',
+        body: [{
+          type: 'switch',
+          name: 'pullRefresh.disabled',
+          label: '禁用加载更多',
+          pipeIn: function (value) {
+            return !!value;
+          },
+          pipeOut: function (value) {
+            return value;
+          }
+        }, {
+          type: 'switch',
+          name: 'pullRefresh.showIcon',
+          label: i18nRuntime.i18n("731f9b470e0948cbf56341a53c423213"),
+          value: true,
+          visibleOn: '!data.pullRefresh?.disabled'
+        }, {
+          type: 'switch',
+          name: 'pullRefresh.showText',
+          label: i18nRuntime.i18n("bab9f8592e1b8e286ee17ddf5dbea4b3"),
+          value: true,
+          visibleOn: '!data.pullRefresh?.disabled'
+        }, amisEditorCore.getSchemaTpl('icon', {
+          name: 'pullRefresh.iconType',
+          label: amisEditorCore.tipedLabel('图标类型', '支持 fontawesome v4 图标、iconfont 图标。如需使用 fontawesome v5/v6 版本,需设置 vendor 为空字符串。默认为 loading-outline'),
+          placeholder: '默认为loading-outline',
+          visibleOn: '!data.pullRefresh?.disabled && data.pullRefresh?.showIcon'
+        }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+          name: 'pullRefresh.color',
+          label: '文字和图标颜色',
+          placeholder: '默认为#777777',
+          visibleOn: '!data.pullRefresh?.disabled'
+        }), {
+          type: 'select',
+          name: 'pullRefresh.dataAppendTo',
+          label: '新数据追加位置',
+          options: [{
+            label: i18nRuntime.i18n("12c4c5e8abda77e1fdc93653d6414187"),
+            value: 'bottom'
+          }, {
+            label: i18nRuntime.i18n("c949729cd1a1e425595c1a297649c7c6"),
+            value: 'top'
+          }],
+          value: 'bottom',
+          visibleOn: '!data.pullRefresh?.disabled'
+        }, {
+          type: 'input-number',
+          name: 'pullRefresh.minLoadingTime',
+          label: '最短加载时间(ms)',
+          min: 0,
+          step: 100,
+          visibleOn: '!data.pullRefresh?.disabled'
+        }, {
+          type: 'select',
+          name: 'pullRefresh.gestureDirection',
+          label: '手势方向',
+          options: [{
+            label: '向上',
+            value: 'up'
+          }, {
+            label: '向下',
+            value: 'down'
+          }],
+          value: 'up',
+          visibleOn: '!data.pullRefresh?.disabled'
+        }, {
+          type: 'fieldset',
+          title: '文本配置',
+          visibleOn: '!data.pullRefresh?.disabled && data.pullRefresh?.showText',
+          body: [{
+            type: 'input-text',
+            name: 'pullRefresh.contentText.normalText',
+            label: '默认文字'
+          }, {
+            type: 'input-text',
+            name: 'pullRefresh.contentText.pullingText',
+            label: '下拉过程文字'
+          }, {
+            type: 'input-text',
+            name: 'pullRefresh.contentText.loosingText',
+            label: '释放刷新文字'
+          }, {
+            type: 'input-text',
+            name: 'pullRefresh.contentText.loadingText',
+            label: '加载中文字'
+          }, {
+            type: 'input-text',
+            name: 'pullRefresh.contentText.successText',
+            label: '加载成功文字'
+          }, {
+            type: 'input-text',
+            name: 'pullRefresh.contentText.completedText',
+            label: '加载完成文字'
+          }]
+        }]
       }, amisEditorCore.getSchemaTpl('switch', {
         name: 'loadDataOnce',
         label: i18nRuntime.i18n("16b8ff2b147382be4cf8654f829df904"),

package/lib/plugin/CRUD2/CRUDTable.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/CRUD2/constants.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/CRUD2/utils.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Calendar.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Card.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Card2.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Cards.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Carousel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Chart.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/CodeView.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Collapse.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/CollapseGroup.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/ColumnToggler.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 

package/lib/plugin/Container.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */
 
@@ -54,7 +54,19 @@ var ContainerPlugin = /** @class */function (_super) {
     _this.previewSchema = tslib.__assign({}, _this.scaffold);
     _this.regions = [{
       key: 'body',
-      label: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032")
+      label: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+      accept: function (json, node, dragNode) {
+        var _a;
+        // Grid 或者 flex 里面作为栏的时候，不让切换进去
+        // 只让其调整顺序
+        // node 是 region 节点，node.host 才是容器节点
+        // node.host.host 是容器节点所在组件节点
+        if (dragNode && ((_a = dragNode.info) === null || _a === void 0 ? void 0 : _a.plugin) === _this && node.host.host === dragNode.host) {
+          // sibling 不接受, 通常是调整顺序
+          return false;
+        }
+        return true;
+      }
     }];
     _this.panelTitle = i18nRuntime.i18n("22c799040acdb2601b437ed5449de076");
     _this.panelJustify = true;
@@ -321,10 +333,13 @@ var ContainerPlugin = /** @class */function (_super) {
     }
   };
   ContainerPlugin.prototype.onWidthChangeStart = function (event) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     var context = event.context;
     var node = context.node;
-    var host = node.host;
+    var region = node.parent;
+    if (((_a = node.info) === null || _a === void 0 ? void 0 : _a.plugin) !== this || !region || !region.isRegion) {
+      return;
+    }
     var dom = context.dom;
     var parent = dom.parentElement;
     if (!parent) {
@@ -333,13 +348,14 @@ var ContainerPlugin = /** @class */function (_super) {
     var resizer = context.resizer;
     var frameRect = parent.getBoundingClientRect();
     var rect = dom.getBoundingClientRect();
-    var isFlexItem = (_a = this.manager) === null || _a === void 0 ? void 0 : _a.isFlexItem(node.id);
-    var isColumnFlex = (_b = this.manager) === null || _b === void 0 ? void 0 : _b.isFlexColumnItem(node.id);
+    var isFlexItem = (_b = this.manager) === null || _b === void 0 ? void 0 : _b.isFlexItem(node.id);
+    var isColumnFlex = (_c = this.manager) === null || _c === void 0 ? void 0 : _c.isFlexColumnItem(node.id);
     var schema = node.schema;
     var index = node.index;
-    var isFlexSize = ((_c = schema.style) === null || _c === void 0 ? void 0 : _c.flex) === '1 1 auto' && (((_d = schema.style) === null || _d === void 0 ? void 0 : _d.position) === 'static' || ((_e = schema.style) === null || _e === void 0 ? void 0 : _e.position) === 'relative');
+    var isFlexSize = ((_d = schema.style) === null || _d === void 0 ? void 0 : _d.flex) === '1 1 auto' && (((_e = schema.style) === null || _e === void 0 ? void 0 : _e.position) === 'static' || ((_f = schema.style) === null || _f === void 0 ? void 0 : _f.position) === 'relative');
     var flexGrow = 1;
     var width = 0;
+    var nodes = region.children;
     event.setData({
       onMove: function (e) {
         var _a;
@@ -354,8 +370,8 @@ var ContainerPlugin = /** @class */function (_super) {
               var width_1 = children[i].clientWidth;
               if (width_1 > 0) {
                 var grow = Math.max(1, Math.min(12, Math.round(12 * width_1 / frameRect.width)));
-                (_a = host.children[i]) === null || _a === void 0 ? void 0 : _a.updateState({
-                  style: tslib.__assign(tslib.__assign({}, host.children[i].schema.style), {
+                (_a = nodes[i]) === null || _a === void 0 ? void 0 : _a.updateState({
+                  style: tslib.__assign(tslib.__assign({}, nodes[i].schema.style), {
                     flexGrow: grow
                   })
                 });
@@ -391,7 +407,7 @@ var ContainerPlugin = /** @class */function (_super) {
       onEnd: function () {
         resizer.removeAttribute('data-value');
         if (isFlexSize) {
-          host === null || host === void 0 ? void 0 : host.children.forEach(function (item) {
+          nodes.forEach(function (item) {
             var _a, _b;
             item.updateSchema({
               style: tslib.__assign(tslib.__assign({}, node.schema.style), {

package/lib/plugin/Custom.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.12.0-beta.4
- * build time: 2025-02-26
+ * amis-editor v6.12.0-beta.6
+ * build time: 2025-03-06
  * Copyright 2018-2025 @fex
  */