amis-editor 5.7.0 → 6.0.0

package/esm/util.d.ts

@@ -17,7 +17,208 @@ export declare const schemaArrayFormat: (value: any) => any;
  * @param options
  * @returns
  */
-export declare const resolveOptionType: (options: any) => "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export declare const resolveOptionType: (schema: any) => "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+/**
+ * 构建选择器事件参数
+ * @param manager
+ * @returns
+ */
+export declare const resolveOptionEventDataSchame: (manager: EditorManager, multiple?: boolean) => {
+    value: any;
+    selectedItems: {
+        type: string;
+        title: string;
+        items: {
+            type: string;
+            title: string;
+            properties: {
+                [x: number]: {
+                    type: string;
+                    title: string;
+                };
+            };
+        };
+        properties?: undefined;
+    } | {
+        type: string;
+        title: string;
+        properties: {
+            [x: number]: {
+                type: string;
+                title: string;
+            };
+        };
+        items?: undefined;
+    };
+    items: {
+        type: string;
+        title: string;
+        items: {
+            type: string;
+            title: string;
+            properties: {
+                [x: number]: {
+                    type: string;
+                    title: string;
+                };
+            };
+        };
+    };
+    itemSchema: {
+        [x: number]: {
+            type: string;
+            title: string;
+        };
+    };
+};
+/**
+ * 构建输入列表事件参数
+ * @param manager
+ * @param multiple
+ * @returns
+ */
+export declare const resolveInputTableEventDataSchame: (manager: EditorManager, multiple?: boolean) => {
+    value: any;
+    item: any;
+};
+export declare const OPTION_EDIT_EVENTS: {
+    eventName: string;
+    eventLabel: string;
+    description: string;
+    dataSchema: (manager: EditorManager) => {
+        type: string;
+        properties: {
+            data: {
+                type: string;
+                title: string;
+                properties: {
+                    item: {
+                        type: string;
+                        title: string;
+                        properties: {
+                            [x: number]: {
+                                type: string;
+                                title: string;
+                            };
+                        };
+                    };
+                    value: any;
+                    items: {
+                        type: string;
+                        title: string;
+                        items: {
+                            type: string;
+                            title: string;
+                            properties: {
+                                [x: number]: {
+                                    type: string;
+                                    title: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    }[];
+}[];
+export declare const OPTION_EDIT_EVENTS_OLD: {
+    eventName: string;
+    eventLabel: string;
+    description: string;
+    dataSchema: {
+        type: string;
+        properties: {
+            data: {
+                type: string;
+                title: string;
+                properties: {
+                    value: {
+                        type: string;
+                        title: string;
+                    };
+                    items: {
+                        type: string;
+                        title: string;
+                    };
+                };
+            };
+        };
+    }[];
+}[];
+export declare const TREE_BASE_EVENTS: ({
+    eventName: string;
+    eventLabel: string;
+    description: string;
+    dataSchema: {
+        type: string;
+        properties: {
+            data: {
+                type: string;
+                title: string;
+                properties: {
+                    value: {
+                        type: string;
+                        title: string;
+                    };
+                    items: {
+                        type: string;
+                        title: string;
+                    };
+                };
+            };
+        };
+    }[];
+} | {
+    eventName: string;
+    eventLabel: string;
+    description: string;
+    dataSchema: (manager: EditorManager) => {
+        type: string;
+        properties: {
+            data: {
+                type: string;
+                title: string;
+                properties: {
+                    value: any;
+                    items: {
+                        type: string;
+                        title: string;
+                        items: {
+                            type: string;
+                            title: string;
+                            properties: {
+                                [x: number]: {
+                                    type: string;
+                                    title: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    }[];
+} | {
+    eventName: string;
+    eventLabel: string;
+    description: string;
+    dataSchema: {
+        type: string;
+        properties: {
+            data: {
+                type: string;
+                title: string;
+                properties: {
+                    value: {
+                        type: string;
+                        title: string;
+                    };
+                };
+            };
+        };
+    }[];
+})[];
 /**
  * 将组件配置里面的公式进行转义，一般是文本组件编辑器里直接显示公式所用
  *

package/esm/util.js

@@ -1,56 +1,359 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
+ * amis-editor v6.0.0
+ * build time: 2023-12-29
  * Copyright 2018-2023 @fex
  */
 
+import { __spreadArray, __read, __assign } from 'tslib';
 import { resolveVariableAndFilter, findTree, JSONValueMap } from 'amis';
 import isString from 'lodash/isString';
+import { i18n } from 'i18n-runtime';
 
-/**
- * 布局配置项，数值设置时需要
- */
 var isAuto = function (value) {
-    if (value && isString(value) && /^((a)|(au)|(aut)|(auto))$/.test(value)) {
-        return true;
-    }
-    return false;
+  if (value && isString(value) && /^((a)|(au)|(aut)|(auto))$/.test(value)) {
+    return true;
+  }
+  return false;
 };
 /**
  * 用于列表类展示组件在 filterProps 中获取编辑态 value 值
  */
 var resolveArrayDatasource = function (_a, defaultSource) {
-    var data = _a.data, value = _a.value, source = _a.source;
-    if (defaultSource === void 0) { defaultSource = '$items'; }
-    return Array.isArray(value)
-        ? value
-        : // resolveVariable 不支持 ${items} 格式，导致预览态无数据
-            resolveVariableAndFilter(typeof source === 'string' ? source : defaultSource, data, '| raw');
+  var data = _a.data,
+    value = _a.value,
+    source = _a.source;
+  if (defaultSource === void 0) {
+    defaultSource = '$items';
+  }
+  return Array.isArray(value) ? value :
+  // resolveVariable 不支持 ${items} 格式，导致预览态无数据
+  resolveVariableAndFilter(typeof source === 'string' ? source : defaultSource, data, '| raw');
 };
 var schemaToArray = function (value) {
-    return value && Array.isArray(value) ? value : [value];
+  return value && Array.isArray(value) ? value : [value];
 };
 var schemaArrayFormat = function (value) {
-    return value && Array.isArray(value) && value.length === 1 ? value[0] : value;
+  return value && Array.isArray(value) && value.length === 1 ? value[0] : value;
 };
 /**
  * 解析选项值类型
  * @param options
  * @returns
  */
-var resolveOptionType = function (options) {
+var resolveOptionType = function (schema) {
+  var _a;
+  var options = schema.options,
+    valueField = schema.valueField;
+  if (!options) {
+    return 'string';
+  }
+  // 默认options内选项是同类型
+  var option = options[0];
+  if (typeof option === 'object') {
+    option = findTree(options, function (item) {
+      return item[valueField || 'value'] !== undefined;
+    });
+  }
+  var value = (_a = option === null || option === void 0 ? void 0 : option[valueField || 'value']) !== null && _a !== void 0 ? _a : option;
+  return value !== undefined ? typeof value : 'string';
+};
+/**
+ * 构建选择器事件参数
+ * @param manager
+ * @returns
+ */
+var resolveOptionEventDataSchame = function (manager, multiple) {
+  var _a;
+  var _b, _c, _d, _e, _f, _g;
+  var schemas = manager.dataSchema.current.schemas;
+  var node = manager.store.getNodeById(manager.store.activeId);
+  var dataSchema = schemas.find(function (item) {
     var _a;
-    if (!options) {
-        return 'string';
+    return (_a = item.properties) === null || _a === void 0 ? void 0 : _a[node.schema.name];
+  });
+  var itemSchema = (_a = {}, _a[((_b = node.schema) === null || _b === void 0 ? void 0 : _b.labelField) || 'label'] = {
+    type: 'string',
+    title: i18n("97d07614380da93d257f9fbf81aa56fb")
+  }, _a[((_c = node.schema) === null || _c === void 0 ? void 0 : _c.valueField) || 'value'] = {
+    type: resolveOptionType((_d = node.schema) === null || _d === void 0 ? void 0 : _d.options),
+    title: i18n("fe7509e0ed085b86f07e3e9975cc5b3d")
+  }, _a);
+  var isMultiple = multiple !== null && multiple !== void 0 ? multiple : (_e = node.schema) === null || _e === void 0 ? void 0 : _e.multiple;
+  return {
+    value: __assign(__assign({
+      type: 'string'
+    }, (_g = (_f = dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.properties) === null || _f === void 0 ? void 0 : _f[node.schema.name]) !== null && _g !== void 0 ? _g : {}), {
+      title: i18n("e48d65cda774019d9a6677354bc781f2")
+    }),
+    selectedItems: isMultiple ? {
+      type: 'array',
+      title: i18n("029e280e119b028bffc51424d909c07d"),
+      items: {
+        type: 'object',
+        title: i18n("ab5dea29793d933fa7b5487a7309df6a"),
+        properties: itemSchema
+      }
+    } : {
+      type: 'object',
+      title: i18n("029e280e119b028bffc51424d909c07d"),
+      properties: itemSchema
+    },
+    items: {
+      type: 'array',
+      title: i18n("b2a18e08b0b0e0fd7e80554b89244aa0"),
+      items: {
+        type: 'object',
+        title: i18n("ab5dea29793d933fa7b5487a7309df6a"),
+        properties: itemSchema
+      }
+    },
+    itemSchema: itemSchema
+  };
+};
+/**
+ * 构建输入列表事件参数
+ * @param manager
+ * @param multiple
+ * @returns
+ */
+var resolveInputTableEventDataSchame = function (manager, multiple) {
+  var _a, _b;
+  var schemas = manager.dataSchema.current.schemas;
+  var node = manager.store.getNodeById(manager.store.activeId);
+  var dataSchema = schemas.find(function (item) {
+    var _a;
+    return (_a = item.properties) === null || _a === void 0 ? void 0 : _a[node.schema.name];
+  });
+  var valDataSchema = (_a = dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.properties) === null || _a === void 0 ? void 0 : _a[node.schema.name];
+  var isMultiple = multiple !== null && multiple !== void 0 ? multiple : (_b = node.schema) === null || _b === void 0 ? void 0 : _b.multiple;
+  return {
+    value: valDataSchema !== null && valDataSchema !== void 0 ? valDataSchema : {},
+    item: isMultiple ? valDataSchema.items : valDataSchema !== null && valDataSchema !== void 0 ? valDataSchema : {}
+  };
+};
+var OPTION_EDIT_EVENTS = [{
+  eventName: 'addConfirm',
+  eventLabel: '确认新增',
+  description: '新增提交时触发',
+  dataSchema: function (manager) {
+    var _a = resolveOptionEventDataSchame(manager),
+      value = _a.value,
+      items = _a.items,
+      itemSchema = _a.itemSchema;
+    return [{
+      type: 'object',
+      properties: {
+        data: {
+          type: 'object',
+          title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+          properties: {
+            item: {
+              type: 'object',
+              title: i18n("75cc2a992ea150d3a6c68ac4bc486637"),
+              properties: itemSchema
+            },
+            value: value,
+            items: items
+          }
+        }
+      }
+    }];
+  }
+}, {
+  eventName: 'editConfirm',
+  eventLabel: i18n("4271f29faca65d7840ad6bb2c4a7b8c6"),
+  description: '编辑提交时触发',
+  dataSchema: function (manager) {
+    var _a = resolveOptionEventDataSchame(manager),
+      value = _a.value,
+      items = _a.items,
+      itemSchema = _a.itemSchema;
+    return [{
+      type: 'object',
+      properties: {
+        data: {
+          type: 'object',
+          title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+          properties: {
+            item: {
+              type: 'object',
+              title: i18n("a13b85bddbcdab63ef2b2d98dd46afe9"),
+              properties: itemSchema
+            },
+            value: value,
+            items: items
+          }
+        }
+      }
+    }];
+  }
+}, {
+  eventName: 'deleteConfirm',
+  eventLabel: '确认删除',
+  description: '删除提交时触发',
+  dataSchema: function (manager) {
+    var _a = resolveOptionEventDataSchame(manager),
+      value = _a.value,
+      items = _a.items,
+      itemSchema = _a.itemSchema;
+    return [{
+      type: 'object',
+      properties: {
+        data: {
+          type: 'object',
+          title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+          properties: {
+            item: {
+              type: 'object',
+              title: i18n("8aa4d6aedd7957ebc6b87fec655695ef"),
+              properties: itemSchema
+            },
+            value: value,
+            items: items
+          }
+        }
+      }
+    }];
+  }
+}];
+var OPTION_EDIT_EVENTS_OLD = [{
+  eventName: 'add',
+  eventLabel: '确认新增(不推荐)',
+  description: '新增提交时触发',
+  dataSchema: [{
+    type: 'object',
+    properties: {
+      data: {
+        type: 'object',
+        title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+        properties: {
+          value: {
+            type: 'object',
+            title: i18n("de2392357fc78e9e0f0946bcc0af87b6")
+          },
+          items: {
+            type: 'array',
+            title: i18n("cf965b232227a0e9d14f4f7e31b01c62")
+          }
+        }
+      }
     }
-    // 默认options内选项是同类型
-    var option = options[0];
-    if (typeof option === 'object') {
-        option = findTree(options, function (item) { return item.value !== undefined; });
+  }]
+}, {
+  eventName: 'edit',
+  eventLabel: '确认编辑(不推荐)',
+  description: '编辑提交时触发',
+  dataSchema: [{
+    type: 'object',
+    properties: {
+      data: {
+        type: 'object',
+        title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+        properties: {
+          value: {
+            type: 'object',
+            title: i18n("e385c7c6f726dc2641866d9050777efb")
+          },
+          items: {
+            type: 'array',
+            title: i18n("cf965b232227a0e9d14f4f7e31b01c62")
+          }
+        }
+      }
     }
-    var value = (_a = option === null || option === void 0 ? void 0 : option.value) !== null && _a !== void 0 ? _a : option;
-    return value !== undefined ? typeof value : 'string';
-};
+  }]
+}, {
+  eventName: 'delete',
+  eventLabel: '确认删除(不推荐)',
+  description: '删除提交时触发',
+  dataSchema: [{
+    type: 'object',
+    properties: {
+      data: {
+        type: 'object',
+        title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+        properties: {
+          value: {
+            type: 'object',
+            title: i18n("58cbd355c5bdb80653a8ae3d3b316c37")
+          },
+          items: {
+            type: 'array',
+            title: i18n("cf965b232227a0e9d14f4f7e31b01c62")
+          }
+        }
+      }
+    }
+  }]
+}];
+var TREE_BASE_EVENTS = __spreadArray(__spreadArray(__spreadArray(__spreadArray([{
+  eventName: 'change',
+  eventLabel: i18n("755955372bcc0c7ebf161a656bc389b3"),
+  description: i18n("2fc76872efce1eabd3b74a3e4fd5b976"),
+  dataSchema: function (manager) {
+    var _a = resolveOptionEventDataSchame(manager),
+      value = _a.value,
+      items = _a.items;
+    return [{
+      type: 'object',
+      properties: {
+        data: {
+          type: 'object',
+          title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+          properties: {
+            value: value,
+            items: items
+          }
+        }
+      }
+    }];
+  }
+}], __read(OPTION_EDIT_EVENTS), false), [{
+  eventName: 'deferLoadFinished',
+  eventLabel: i18n("58995b490ba67e5d29dd87f422b14861"),
+  description: i18n("ec2fb7a5db150690b14b63f83d9d4b30"),
+  dataSchema: function (manager) {
+    var _a = resolveOptionEventDataSchame(manager),
+      value = _a.value,
+      items = _a.items;
+    return [{
+      type: 'object',
+      properties: {
+        data: {
+          type: 'object',
+          title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+          properties: {
+            result: {
+              type: 'object',
+              title: 'deferApi 懒加载远程请求成功后返回的结果'
+            },
+            value: value,
+            items: items
+          }
+        }
+      }
+    }];
+  }
+}], false), __read(OPTION_EDIT_EVENTS_OLD), false), [{
+  eventName: 'loadFinished',
+  eventLabel: '懒加载完成(不推荐)',
+  description: i18n("ec2fb7a5db150690b14b63f83d9d4b30"),
+  dataSchema: [{
+    type: 'object',
+    properties: {
+      data: {
+        type: 'object',
+        title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+        properties: {
+          value: {
+            type: 'object',
+            title: i18n("e6b94af26512b3f7ea8eb1433d4a2aaa")
+          }
+        }
+      }
+    }
+  }]
+}], false);
 /**
  * 将组件配置里面的公式进行转义，一般是文本组件编辑器里直接显示公式所用
  *
@@ -59,13 +362,15 @@ var resolveOptionType = function (options) {
  * @returns 转义后的配置
  */
 function escapeFormula(conf, keys) {
-    if (keys === void 0) { keys = ['tpl']; }
-    return JSONValueMap(conf, function (value, key) {
-        if (keys.includes(String(key)) && /(^|[^\\])\$\{.+\}/.test(value)) {
-            return value.replace(/\${/g, ' \\${');
-        }
-        return value;
-    });
+  if (keys === void 0) {
+    keys = ['tpl'];
+  }
+  return JSONValueMap(conf, function (value, key) {
+    if (keys.includes(String(key)) && /(^|[^\\])\$\{.+\}/.test(value)) {
+      return value.replace(/\${/g, ' \\${');
+    }
+    return value;
+  });
 }
 /**
  * 判断给定的 schema 是否为 model 组件
@@ -74,27 +379,25 @@ function escapeFormula(conf, keys) {
  * @returns 如果给定的 schema 是 model 组件则返回 true，否则返回 false
  */
 function _isModelComp(schema) {
-    var _a, _b;
-    if (!schema) {
-        return false;
+  var _a, _b;
+  if (!schema) {
+    return false;
+  }
+  if (schema.hasOwnProperty('$$m') && (((_a = schema.$$m) === null || _a === void 0 ? void 0 : _a.type) === 'list' || ((_b = schema.$$m) === null || _b === void 0 ? void 0 : _b.type) === 'form')) {
+    return true;
+  }
+  var extraEvaluation = ['source', 'api', 'initApi'].some(function (key) {
+    var _a;
+    if ((schema === null || schema === void 0 ? void 0 : schema[key]) && typeof schema[key] === 'string') {
+      return schema === null || schema === void 0 ? void 0 : schema[key].startsWith('model://');
     }
-    if (schema.hasOwnProperty('$$m') &&
-        (((_a = schema.$$m) === null || _a === void 0 ? void 0 : _a.type) === 'list' || ((_b = schema.$$m) === null || _b === void 0 ? void 0 : _b.type) === 'form')) {
-        return true;
+    if (((_a = schema === null || schema === void 0 ? void 0 : schema[key]) === null || _a === void 0 ? void 0 : _a.url) && typeof schema[key].url === 'string') {
+      return schema[key].url.startsWith('model://') && !schema[key].hasOwnProperty('strategy');
     }
-    var extraEvaluation = ['source', 'api', 'initApi'].some(function (key) {
-        var _a;
-        if ((schema === null || schema === void 0 ? void 0 : schema[key]) && typeof schema[key] === 'string') {
-            return schema === null || schema === void 0 ? void 0 : schema[key].startsWith('model://');
-        }
-        if (((_a = schema === null || schema === void 0 ? void 0 : schema[key]) === null || _a === void 0 ? void 0 : _a.url) && typeof schema[key].url === 'string') {
-            return (schema[key].url.startsWith('model://') &&
-                !schema[key].hasOwnProperty('strategy'));
-        }
-        return false;
-    });
-    return extraEvaluation;
+    return false;
+  });
+  return extraEvaluation;
 }
 
-export { _isModelComp, escapeFormula, isAuto, resolveArrayDatasource, resolveOptionType, schemaArrayFormat, schemaToArray };
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+export { OPTION_EDIT_EVENTS, OPTION_EDIT_EVENTS_OLD, TREE_BASE_EVENTS, _isModelComp, escapeFormula, isAuto, resolveArrayDatasource, resolveInputTableEventDataSchame, resolveOptionEventDataSchame, resolveOptionType, schemaArrayFormat, schemaToArray };
+window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};

package/esm/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
+ * amis-editor v6.0.0
+ * build time: 2023-12-29
  * Copyright 2018-2023 @fex
  */
 
@@ -312,4 +312,4 @@ registerValidator.apply(void 0, __spreadArray([{
 })), false));
 
 export { ValidationGroup, ValidatorTag, getValidator, getValidatorsByTag, registerValidator };
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};

package/lib/builder/ApiDSBuilder.d.ts

@@ -66,7 +66,10 @@ export declare class ApiDSBuilder extends DSBuilder<ApiDSBuilderOptions<DSRender
         };
         onAutoGenerateFields: any;
     }[];
-    /** 基于接口生成字段 */
+    /**
+     * 基于接口生成字段
+     * 注意CRUD的接口返回格式，目前兼容items、rows、options字段，否则取data下的首个数组元素（和CRUD加载逻辑对齐）
+     */
     autoGenerateFields({ api, props, setState }: {
         api: any;
         props: Record<string, any>;