@byteluck-fe/model-driven-driven 2.5.3 → 2.5.8

package/README.md

@@ -1,13 +1,13 @@
-# Driven
-设计态引擎
-
-    Builder.ts // 兼容旧版Designer，提供页面初始化
-    constants.ts // 常量
-    Designer.ts // 旧版designer的实现
-    designerUtils.ts // 工具函数
-    Driven.ts // 引擎
-    EventLogic.ts // 事件管理
-    index.ts
-    Plugin.ts // 插件
-    Store.ts // 仓库
-    utils.ts // 工具
+# Driven
+设计态引擎
+
+    Builder.ts // 兼容旧版Designer，提供页面初始化
+    constants.ts // 常量
+    Designer.ts // 旧版designer的实现
+    designerUtils.ts // 工具函数
+    Driven.ts // 引擎
+    EventLogic.ts // 事件管理
+    index.ts
+    Plugin.ts // 插件
+    Store.ts // 仓库
+    utils.ts // 工具

package/dist/esm/Driven.js

@@ -200,8 +200,8 @@ import { checkSchema, generatePermissions, getModelBindInfoList, toSchema } from
 import { Group, initSettings, Tab } from "@byteluck-fe/model-driven-settings";
 // 当前正在注册的插件名称
 var applyingPluginName = "";
-/**
- * 设计器驱动
+/**
+ * 设计器驱动
  * */ var Driven = /*#__PURE__*/ function(Watcher) {
     "use strict";
     _inherits(Driven, Watcher);
@@ -213,20 +213,20 @@ var applyingPluginName = "";
         _define_property(_assert_this_initialized(_this), "mode", void 0);
         _define_property(_assert_this_initialized(_this), "isMounted", false);
         _define_property(_assert_this_initialized(_this), "id", genNonDuplicateId(8));
-        /**
-   * 控件可选的事件
+        /**
+   * 控件可选的事件
    * */ _define_property(_assert_this_initialized(_this), "eventLogic", void 0);
-        /**
-   * 处理数据存储，存放模型等
+        /**
+   * 处理数据存储，存放模型等
    * */ _define_property(_assert_this_initialized(_this), "store", void 0);
-        /**
-   * 额外参数存储
+        /**
+   * 额外参数存储
    */ _define_property(_assert_this_initialized(_this), "externalParams", void 0);
-        /**
-   * 处理instance，和schema存储
+        /**
+   * 处理instance，和schema存储
    * */ _define_property(_assert_this_initialized(_this), "designer", void 0);
-        /**
-   * 插件数组
+        /**
+   * 插件数组
    * */ _define_property(_assert_this_initialized(_this), "__plugins", void 0);
         _define_property(_assert_this_initialized(_this), "__pluginsApplied", false);
         _define_property(_assert_this_initialized(_this), "$options", void 0);
@@ -479,10 +479,10 @@ var applyingPluginName = "";
                 if (instance === null) return;
                 var _instance = this.getInstance(instance);
                 if (!_instance) return;
-                /*
-        移动之后，拿到控件新的位置，并触发事件, 如果是新增的控件的话，就没有原始位置和父级，
-        事件是否区分move和add
-        move是从主表移动到子表或子表移动到主表才触发，还是所有移动都触发
+                /*
+        移动之后，拿到控件新的位置，并触发事件, 如果是新增的控件的话，就没有原始位置和父级，
+        事件是否区分move和add
+        move是从主表移动到子表或子表移动到主表才触发，还是所有移动都触发
       */ var oldDataScopeParent = this.store.movingInstanceOldDataScopeParent;
                 var newDataScopeParent = findInstanceDataScopeParent(_instance);
                 var oldParent = this.store.movingInstanceOldParent;
@@ -607,8 +607,8 @@ var applyingPluginName = "";
         },
         {
             key: "removeInstance",
-            value: /**
-   * 删除控件
+            value: /**
+   * 删除控件
    * */ function removeInstance(instance) {
                 // 删除实例，并触发事件 removed
                 var parent = instance.parent;
@@ -647,8 +647,8 @@ var applyingPluginName = "";
         },
         {
             key: "updateInstanceType",
-            value: /**
-   * 修改控件类型
+            value: /**
+   * 修改控件类型
    * */ function updateInstanceType(instance, type) {
                 var schema = instance.toSchema();
                 var newInstance = this.createInstance(type, {
@@ -707,16 +707,16 @@ var applyingPluginName = "";
         },
         {
             key: "assertInstance",
-            value: /**
-   * 判断控件的类型，返回当前控件的正确类型
+            value: /**
+   * 判断控件的类型，返回当前控件的正确类型
    * */ function assertInstance(instance, types) {
                 return isString(types) ? instance.type === types : types.includes(instance.type);
             }
         },
         {
             key: "getInstanceInListControl",
-            value: /**
-   * 控件在列表控件内，如明细子表或列表控件
+            value: /**
+   * 控件在列表控件内，如明细子表或列表控件
    * */ function getInstanceInListControl(instance) {
                 var _instance = instance;
                 while(_instance){
@@ -787,7 +787,7 @@ var applyingPluginName = "";
     ]);
     return Driven;
 }(Watcher);
-/**
-   * 控件事件定义
+/**
+   * 控件事件定义
    * */ _define_property(Driven, "EventLogic", EventLogic);
 export { Driven };

package/dist/esm/Store.js

@@ -104,42 +104,42 @@ export var Store = /*#__PURE__*/ function() {
     "use strict";
     function Store(options) {
         _class_call_check(this, Store);
-        /**
-   * 页面控件实例树
+        /**
+   * 页面控件实例树
    * */ _define_property(this, "instance", void 0);
-        /**
-   * 拍平的控件数组
+        /**
+   * 拍平的控件数组
    * */ _define_property(this, "flatInstances", void 0);
-        /**
-   * 控件id组成的map
+        /**
+   * 控件id组成的map
    * */ _define_property(this, "instanceIdMap", void 0);
-        /**
-   * dataCode和fieldCode组成的map
-   * {
-   *   [主表dataCode]: {
-   *     [fieldCode]: 控件
-   *   },
-   *   [子表dataCode]: {
-   *     [fieldCode]: 控件
-   *   }
-   * }
+        /**
+   * dataCode和fieldCode组成的map
+   * {
+   *   [主表dataCode]: {
+   *     [fieldCode]: 控件
+   *   },
+   *   [子表dataCode]: {
+   *     [fieldCode]: 控件
+   *   }
+   * }
    * */ _define_property(this, "dataFieldCodeMap", void 0);
-        /**
-   * 当前选中的控件
+        /**
+   * 当前选中的控件
    * */ _define_property(this, "selected", null);
-        /**
-   * 当前选中的数据作用域控件
+        /**
+   * 当前选中的数据作用域控件
    * */ _define_property(this, "selectedInstanceDataScopeParent", null);
         _define_property(this, "selectedDataScopeFlatInstances", []);
-        /**
-   * 当前选中控件的setting
+        /**
+   * 当前选中控件的setting
    * */ _define_property(this, "selectedInstanceSetting", []);
         _define_property(this, "selectedInstanceSettingItems", []);
-        /**
-   * 当前选中控件的数据模型
+        /**
+   * 当前选中控件的数据模型
    * */ _define_property(this, "selectedFieldItem", null);
-        /**
-   * 扩展字段，比如appId，dataCode等
+        /**
+   * 扩展字段，比如appId，dataCode等
    * */ _define_property(this, "external", {});
         _define_property(this, "movingInstance", null);
         _define_property(this, "movingInstanceOldParent", null);
@@ -155,8 +155,8 @@ export var Store = /*#__PURE__*/ function() {
     _create_class(Store, [
         {
             key: "selectedRules",
-            get: /**
-   * 当前选中控件的rules
+            get: /**
+   * 当前选中控件的rules
    * */ function get() {
                 if (!this.selected) {
                     return null;
@@ -166,8 +166,8 @@ export var Store = /*#__PURE__*/ function() {
         },
         {
             key: "selectedAntdRules",
-            get: /**
-   * 当前选中控件的antd rules
+            get: /**
+   * 当前选中控件的antd rules
    * */ function get() {
                 var rules = this.selectedRules;
                 if (!rules) {

package/dist/esm/utils.js

@@ -195,9 +195,9 @@ export function getMasterFormControls(controls) {
     });
     return formctls;
 }
-/**
- * @description 给modelBindInfoList中填充fieldCode和dataCode
- * @description 我们生成fieldCode的规则是：DataBind的控件，取`field_${id}`，ObjectDataBind的控件，取`field_${id}_${key}`, key指的是ObjectDataBind.keys()
+/**
+ * @description 给modelBindInfoList中填充fieldCode和dataCode
+ * @description 我们生成fieldCode的规则是：DataBind的控件，取`field_${id}`，ObjectDataBind的控件，取`field_${id}_${key}`, key指的是ObjectDataBind.keys()
  * */ export function fillModelBindInfoListFieldCode(modelBindInfoList) {
     var dataCode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
     if (!modelBindInfoList || !Array.isArray(modelBindInfoList)) return [];
@@ -228,13 +228,13 @@ function fieldCodeBeforeAddPrefix(fieldCode) {
     }
     return prefix + fieldCode;
 }
-/**
- * @description 通过fieldType获取列表表头的type
+/**
+ * @description 通过fieldType获取列表表头的type
  * */ export function getColumnTypeFromFiledType(fieldType) {
     return FieldTypeToColumnType[fieldType];
 }
-/**
- * @description 通过modelBindInfoList生成多个columns
+/**
+ * @description 通过modelBindInfoList生成多个columns
  * */ export function getColumnsFromModelBindInfoList(modelBindInfoList) {
     var designer = new Designer();
     var columns = [];

package/dist/types/Builder.d.ts

@@ -1,8 +1,8 @@
-import { ControlDesignerInstance } from '@byteluck-fe/model-driven-core';
-export declare class Builder {
-    private designer;
-    ListPageBuilder(): ControlDesignerInstance<'list-view'>;
-    ProListPageBuilder(): ControlDesignerInstance<'list-view'>;
-    FormPageBuilder(): ControlDesignerInstance<'data-view'>;
-    VuePageBuilder(): ControlDesignerInstance<'grid'>;
-}
+import { ControlDesignerInstance } from '@byteluck-fe/model-driven-core';
+export declare class Builder {
+    private designer;
+    ListPageBuilder(): ControlDesignerInstance<'list-view'>;
+    ProListPageBuilder(): ControlDesignerInstance<'list-view'>;
+    FormPageBuilder(): ControlDesignerInstance<'data-view'>;
+    VuePageBuilder(): ControlDesignerInstance<'grid'>;
+}

package/dist/types/Designer.d.ts

@@ -1,36 +1,36 @@
-import { ControlDesigner, ControlDesignerInstance, ControlsKeys, RegisterControls, controlHooksEmitter, ControlExport } from '@byteluck-fe/model-driven-core';
-import EventLogic from './EventLogic';
-import { FieldTypes } from '@byteluck-fe/model-driven-shared';
-import { toSchema, getModelBindInfoList, checkSchema } from './utils';
-interface ToolboxType {
-    key: string;
-    title: string;
-    children: ControlDesigner<ControlsKeys>[];
-}
-interface DesignerServices {
-    getUsersByIds?: (userIds: string[]) => Promise<any>;
-    remoteUserByName?: (username: string) => Promise<any>;
-    getDeptByIds?: (deptIds: string[]) => Promise<any>;
-    remoteDeptByName?: (deptName: string) => Promise<any>;
-    getAddress?: (params: any, addressType: string[]) => Promise<any>;
-    uploadFile?: (params: any) => Promise<any>;
-}
-export default class Designer<EventKeys extends string = string> extends RegisterControls<'Designer'> {
-    static EventLogic: typeof EventLogic;
-    toolbox: ToolboxType[];
-    readonly services: DesignerServices;
-    readonly eventLogic: EventLogic;
-    readonly fieldTypes: typeof FieldTypes;
-    controlSettingMap: Map<string, ControlExport['Setting']>;
-    constructor();
-    registerControl(control: ControlExport): void;
-    getControlSetting(type: string): any[] | null;
-    setInstance(instance: ControlDesignerInstance<ControlsKeys>, props: string, value: unknown): void;
-    eachControls(callback: (value: ControlDesigner<ControlsKeys>, index: number, array: ControlDesigner<ControlsKeys>[]) => void): void;
-    getInitControl(): ControlDesignerInstance<ControlsKeys>[];
-    checkSchema(...args: Parameters<typeof checkSchema>): Promise<ReturnType<typeof checkSchema>>;
-    getModelBindInfoList(...args: Parameters<typeof getModelBindInfoList>): ReturnType<typeof getModelBindInfoList>;
-    getSchema(...args: Parameters<typeof toSchema>): ReturnType<typeof toSchema>;
-    listenControlHook(...args: Parameters<(typeof controlHooksEmitter)['on']>): ReturnType<(typeof controlHooksEmitter)['on']>;
-}
-export { ToolboxType, DesignerServices, Designer };
+import { ControlDesigner, ControlDesignerInstance, ControlsKeys, RegisterControls, controlHooksEmitter, ControlExport } from '@byteluck-fe/model-driven-core';
+import EventLogic from './EventLogic';
+import { FieldTypes } from '@byteluck-fe/model-driven-shared';
+import { toSchema, getModelBindInfoList, checkSchema } from './utils';
+interface ToolboxType {
+    key: string;
+    title: string;
+    children: ControlDesigner<ControlsKeys>[];
+}
+interface DesignerServices {
+    getUsersByIds?: (userIds: string[]) => Promise<any>;
+    remoteUserByName?: (username: string) => Promise<any>;
+    getDeptByIds?: (deptIds: string[]) => Promise<any>;
+    remoteDeptByName?: (deptName: string) => Promise<any>;
+    getAddress?: (params: any, addressType: string[]) => Promise<any>;
+    uploadFile?: (params: any) => Promise<any>;
+}
+export default class Designer<EventKeys extends string = string> extends RegisterControls<'Designer'> {
+    static EventLogic: typeof EventLogic;
+    toolbox: ToolboxType[];
+    readonly services: DesignerServices;
+    readonly eventLogic: EventLogic;
+    readonly fieldTypes: typeof FieldTypes;
+    controlSettingMap: Map<string, ControlExport['Setting']>;
+    constructor();
+    registerControl(control: ControlExport): void;
+    getControlSetting(type: string): any[] | null;
+    setInstance(instance: ControlDesignerInstance<ControlsKeys>, props: string, value: unknown): void;
+    eachControls(callback: (value: ControlDesigner<ControlsKeys>, index: number, array: ControlDesigner<ControlsKeys>[]) => void): void;
+    getInitControl(): ControlDesignerInstance<ControlsKeys>[];
+    checkSchema(...args: Parameters<typeof checkSchema>): Promise<ReturnType<typeof checkSchema>>;
+    getModelBindInfoList(...args: Parameters<typeof getModelBindInfoList>): ReturnType<typeof getModelBindInfoList>;
+    getSchema(...args: Parameters<typeof toSchema>): ReturnType<typeof toSchema>;
+    listenControlHook(...args: Parameters<(typeof controlHooksEmitter)['on']>): ReturnType<(typeof controlHooksEmitter)['on']>;
+}
+export { ToolboxType, DesignerServices, Designer };

package/dist/types/Driven.d.ts

@@ -1,112 +1,112 @@
-import { Callback, Watcher } from '@byteluck-fe/model-driven-shared';
-import { Store, StoreOptions } from './Store';
-import { Designer } from './Designer';
-import EventLogic from './EventLogic';
-import { Plugin } from './Plugin';
-import { DesignerControl, ControlDesignerInstance, ControlsKeys, Schema, DeepPartial, Messages, BeforeCreateInstance } from '@byteluck-fe/model-driven-core';
-import { generatePermissions, getModelBindInfoList, toSchema } from './utils';
-import { Settings } from '@byteluck-fe/model-driven-settings';
-type EventKeys = 'before-validate' | 'validated' | 'updated' | 'joined' | 'moved' | 'removed' | 'select' | 'field-changed';
-type SchemaBaseType = Schema<ControlsKeys>;
-interface DrivenOptions {
-    autoMount?: boolean;
-    plugins?: Plugin[];
-    Designer?: typeof Designer;
-    mode?: string;
-    schema: SchemaBaseType | SchemaBaseType[];
-    store?: Omit<StoreOptions, 'instance'>;
-}
-/**
- * 设计器驱动
- * */
-declare class Driven extends Watcher<EventKeys> {
-    /**
-     * 控件事件定义
-     * */
-    static EventLogic: typeof EventLogic;
-    readonly mode: string;
-    isMounted: boolean;
-    id: string;
-    /**
-     * 控件可选的事件
-     * */
-    readonly eventLogic: EventLogic;
-    /**
-     * 处理数据存储，存放模型等
-     * */
-    store: Store;
-    /**
-     * 额外参数存储
-     */
-    externalParams?: Record<string, any>;
-    /**
-     * 处理instance，和schema存储
-     * */
-    private designer;
-    /**
-     * 插件数组
-     * */
-    private __plugins;
-    private __pluginsApplied;
-    private readonly $options;
-    constructor(options: DrivenOptions);
-    mount(): void;
-    use(plugin: Plugin): this;
-    private applyPlugins;
-    emit(key: EventKeys, ...payload: any[]): Promise<unknown[]>;
-    on(key: EventKeys, callback: Callback): void;
-    setInstances(schema: DrivenOptions['schema'], beforeCreateInstance?: BeforeCreateInstance): void;
-    private beforeSelectInstance;
-    private afterSelectInstance;
-    private setSelectedInstanceSetting;
-    private concatSetting;
-    private formatGroupSetting;
-    setControlConfig(...args: Parameters<Designer['registerControlConfig']>): Designer<string>;
-    getControlConfig(control: ControlsKeys): Readonly<Record<string, unknown>> | undefined;
-    getControlSetting(type: ControlsKeys): Settings;
-    selectInstance(instance: DesignerControl | null): void;
-    setSelectedFieldItem(fieldItem: Parameters<Store['setSelectedFieldItem']>[0]): void;
-    moveStart(instance: DesignerControl | string): void;
-    moveEnd(instance?: DesignerControl | string | null): void;
-    createInstance<T extends ControlsKeys>(type: T, initSchema?: DeepPartial<Schema<T>>): ControlDesignerInstance<T> | undefined;
-    getInstance(instanceId: DesignerControl | string): DesignerControl | undefined;
-    getInstances(): DesignerControl[];
-    getInstancesFromType<T extends ControlsKeys>(type: T): InstanceType<import("@byteluck-fe/model-driven-core").ControlDesigner<T>>[];
-    getDataScopeInstances(): DesignerControl[];
-    getDataScopeInstancesFromType<T extends ControlsKeys>(type: T): InstanceType<import("@byteluck-fe/model-driven-core").ControlDesigner<T>>[];
-    private updateInstancePropValue;
-    private updateInstanceProps;
-    setInstance<T extends DesignerControl>(instance: T, props: DeepPartial<T['props']>, payload?: any): void;
-    setInstance<T extends DesignerControl>(instance: T, propName: string, value: unknown, payload?: any): void;
-    /**
-     * 删除控件
-     * */
-    removeInstance(instance: DesignerControl): void;
-    replaceInstance(oldInstance: DesignerControl, newInstance: DesignerControl): void;
-    /**
-     * 修改控件类型
-     * */
-    updateInstanceType<T extends ControlsKeys>(instance: DesignerControl, type: T): ControlDesignerInstance<T> | undefined;
-    validate(messages?: Messages, ignore?: string[]): Promise<boolean>;
-    getSchema: typeof toSchema;
-    getModelBindInfoList: typeof getModelBindInfoList;
-    generatePermissions: typeof generatePermissions;
-    getCustomControlsInUse(): string[];
-    assertInstanceIsCustomControl(instance: DesignerControl | string): boolean;
-    static register(...arg: Parameters<(typeof Designer)['register']>): typeof Driven;
-    static judgeControlIsRegistered(control: Parameters<(typeof Designer)['register']>[0]): boolean;
-    judgeControlIsRegistered(control: Parameters<(typeof Designer)['register']>[0]): boolean;
-    register(...arg: Parameters<(typeof Designer)['register']>): this;
-    /**
-     * 判断控件的类型，返回当前控件的正确类型
-     * */
-    assertInstance<T extends ControlsKeys>(instance: DesignerControl, types: T | T[]): instance is ControlDesignerInstance<T>;
-    /**
-     * 控件在列表控件内，如明细子表或列表控件
-     * */
-    getInstanceInListControl(instance: DesignerControl): boolean;
-    getInstanceParentControl<T extends ControlsKeys>(instance: DesignerControl, controlType: T): ControlDesignerInstance<T> | undefined;
-    private callSelectedEffect;
-    private callSelectedScopeEffect;
-}
-export { Driven };
+import { Callback, Watcher } from '@byteluck-fe/model-driven-shared';
+import { Store, StoreOptions } from './Store';
+import { Designer } from './Designer';
+import EventLogic from './EventLogic';
+import { Plugin } from './Plugin';
+import { DesignerControl, ControlDesignerInstance, ControlsKeys, Schema, DeepPartial, Messages, BeforeCreateInstance } from '@byteluck-fe/model-driven-core';
+import { generatePermissions, getModelBindInfoList, toSchema } from './utils';
+import { Settings } from '@byteluck-fe/model-driven-settings';
+type EventKeys = 'before-validate' | 'validated' | 'updated' | 'joined' | 'moved' | 'removed' | 'select' | 'field-changed';
+type SchemaBaseType = Schema<ControlsKeys>;
+interface DrivenOptions {
+    autoMount?: boolean;
+    plugins?: Plugin[];
+    Designer?: typeof Designer;
+    mode?: string;
+    schema: SchemaBaseType | SchemaBaseType[];
+    store?: Omit<StoreOptions, 'instance'>;
+}
+/**
+ * 设计器驱动
+ * */
+declare class Driven extends Watcher<EventKeys> {
+    /**
+     * 控件事件定义
+     * */
+    static EventLogic: typeof EventLogic;
+    readonly mode: string;
+    isMounted: boolean;
+    id: string;
+    /**
+     * 控件可选的事件
+     * */
+    readonly eventLogic: EventLogic;
+    /**
+     * 处理数据存储，存放模型等
+     * */
+    store: Store;
+    /**
+     * 额外参数存储
+     */
+    externalParams?: Record<string, any>;
+    /**
+     * 处理instance，和schema存储
+     * */
+    private designer;
+    /**
+     * 插件数组
+     * */
+    private __plugins;
+    private __pluginsApplied;
+    private readonly $options;
+    constructor(options: DrivenOptions);
+    mount(): void;
+    use(plugin: Plugin): this;
+    private applyPlugins;
+    emit(key: EventKeys, ...payload: any[]): Promise<unknown[]>;
+    on(key: EventKeys, callback: Callback): void;
+    setInstances(schema: DrivenOptions['schema'], beforeCreateInstance?: BeforeCreateInstance): void;
+    private beforeSelectInstance;
+    private afterSelectInstance;
+    private setSelectedInstanceSetting;
+    private concatSetting;
+    private formatGroupSetting;
+    setControlConfig(...args: Parameters<Designer['registerControlConfig']>): Designer<string>;
+    getControlConfig(control: ControlsKeys): Readonly<Record<string, unknown>> | undefined;
+    getControlSetting(type: ControlsKeys): Settings;
+    selectInstance(instance: DesignerControl | null): void;
+    setSelectedFieldItem(fieldItem: Parameters<Store['setSelectedFieldItem']>[0]): void;
+    moveStart(instance: DesignerControl | string): void;
+    moveEnd(instance?: DesignerControl | string | null): void;
+    createInstance<T extends ControlsKeys>(type: T, initSchema?: DeepPartial<Schema<T>>): ControlDesignerInstance<T> | undefined;
+    getInstance(instanceId: DesignerControl | string): DesignerControl | undefined;
+    getInstances(): DesignerControl[];
+    getInstancesFromType<T extends ControlsKeys>(type: T): InstanceType<import("@byteluck-fe/model-driven-core").ControlDesigner<T>>[];
+    getDataScopeInstances(): DesignerControl[];
+    getDataScopeInstancesFromType<T extends ControlsKeys>(type: T): InstanceType<import("@byteluck-fe/model-driven-core").ControlDesigner<T>>[];
+    private updateInstancePropValue;
+    private updateInstanceProps;
+    setInstance<T extends DesignerControl>(instance: T, props: DeepPartial<T['props']>, payload?: any): void;
+    setInstance<T extends DesignerControl>(instance: T, propName: string, value: unknown, payload?: any): void;
+    /**
+     * 删除控件
+     * */
+    removeInstance(instance: DesignerControl): void;
+    replaceInstance(oldInstance: DesignerControl, newInstance: DesignerControl): void;
+    /**
+     * 修改控件类型
+     * */
+    updateInstanceType<T extends ControlsKeys>(instance: DesignerControl, type: T): ControlDesignerInstance<T> | undefined;
+    validate(messages?: Messages, ignore?: string[]): Promise<boolean>;
+    getSchema: typeof toSchema;
+    getModelBindInfoList: typeof getModelBindInfoList;
+    generatePermissions: typeof generatePermissions;
+    getCustomControlsInUse(): string[];
+    assertInstanceIsCustomControl(instance: DesignerControl | string): boolean;
+    static register(...arg: Parameters<(typeof Designer)['register']>): typeof Driven;
+    static judgeControlIsRegistered(control: Parameters<(typeof Designer)['register']>[0]): boolean;
+    judgeControlIsRegistered(control: Parameters<(typeof Designer)['register']>[0]): boolean;
+    register(...arg: Parameters<(typeof Designer)['register']>): this;
+    /**
+     * 判断控件的类型，返回当前控件的正确类型
+     * */
+    assertInstance<T extends ControlsKeys>(instance: DesignerControl, types: T | T[]): instance is ControlDesignerInstance<T>;
+    /**
+     * 控件在列表控件内，如明细子表或列表控件
+     * */
+    getInstanceInListControl(instance: DesignerControl): boolean;
+    getInstanceParentControl<T extends ControlsKeys>(instance: DesignerControl, controlType: T): ControlDesignerInstance<T> | undefined;
+    private callSelectedEffect;
+    private callSelectedScopeEffect;
+}
+export { Driven };

package/dist/types/EventLogic.d.ts

@@ -1,2 +1,2 @@
-import { EventLogic } from '@byteluck-fe/model-driven-shared';
-export default EventLogic;
+import { EventLogic } from '@byteluck-fe/model-driven-shared';
+export default EventLogic;

package/dist/types/Plugin.d.ts

@@ -1,6 +1,6 @@
-import { Driven } from './Driven';
-declare abstract class Plugin {
-    abstract pluginName?: string;
-    abstract apply(driven: Driven): void;
-}
-export { Plugin };
+import { Driven } from './Driven';
+declare abstract class Plugin {
+    abstract pluginName?: string;
+    abstract apply(driven: Driven): void;
+}
+export { Plugin };

package/dist/types/Store.d.ts

@@ -1,82 +1,82 @@
-import { DesignerControl, ControlDesignerInstance, DesignerLayoutControl, DesignerListControl } from '@byteluck-fe/model-driven-core';
-import { Rules } from 'async-validator';
-import { Settings, Setting } from '@byteluck-fe/model-driven-settings';
-export interface StoreOptions {
-    instance: DesignerControl[];
-    getParentBeforeInstanceMove?: (instance: DesignerControl) => DesignerControl | null;
-}
-type DataScopeControl = ControlDesignerInstance<'data-view' | 'subtable' | 'list-view'> | null;
-export declare class Store {
-    /**
-     * 页面控件实例树
-     * */
-    instance: DesignerControl[];
-    /**
-     * 拍平的控件数组
-     * */
-    flatInstances: DesignerControl[];
-    /**
-     * 控件id组成的map
-     * */
-    instanceIdMap: Map<string, DesignerControl>;
-    /**
-     * dataCode和fieldCode组成的map
-     * {
-     *   [主表dataCode]: {
-     *     [fieldCode]: 控件
-     *   },
-     *   [子表dataCode]: {
-     *     [fieldCode]: 控件
-     *   }
-     * }
-     * */
-    dataFieldCodeMap: Map<string, Map<string, DesignerControl>>;
-    /**
-     * 当前选中的控件
-     * */
-    selected: DesignerControl | null;
-    /**
-     * 当前选中的数据作用域控件
-     * */
-    selectedInstanceDataScopeParent: DataScopeControl;
-    selectedDataScopeFlatInstances: DesignerControl[];
-    /**
-     * 当前选中控件的setting
-     * */
-    selectedInstanceSetting: Settings;
-    selectedInstanceSettingItems: Setting[];
-    /**
-     * 当前选中控件的数据模型
-     * */
-    selectedFieldItem: any;
-    /**
-     * 扩展字段，比如appId，dataCode等
-     * */
-    external: Record<string, any>;
-    movingInstance: DesignerControl | null;
-    movingInstanceOldParent: DesignerControl | null;
-    movingInstanceOldDataScopeParent: DataScopeControl;
-    private readonly getParentBeforeInstanceMove;
-    constructor(options: StoreOptions);
-    /**
-     * 当前选中控件的rules
-     * */
-    get selectedRules(): Rules | null;
-    /**
-     * 当前选中控件的antd rules
-     * */
-    get selectedAntdRules(): Rules | null;
-    setInstances(instances: DesignerControl[]): void;
-    setSelectInstance(instance: DesignerControl | null): void;
-    setSelectInstanceSettings(settings: Settings): void;
-    private getSettingItems;
-    setSelectedFieldItem(fieldItem: Record<string, any> | null): void;
-    setMovingInstance(instance: DesignerControl | null): void;
-    updateDataFieldCodeMap(instance: DesignerControl): void;
-    getFlatInstances(): void;
-}
-export declare function loop(instances: DesignerControl[] | DesignerControl, callback: (instance: DesignerControl) => void): void;
-export declare function isDataScopeInstance(instance: DesignerControl): instance is Exclude<DataScopeControl, null>;
-export declare function findInstanceDataScopeParent(instance: DesignerControl | null): any;
-export declare function getDataScopeFlatInstances(dataScopeInstance: DesignerLayoutControl | DesignerListControl): DesignerControl[];
-export {};
+import { DesignerControl, ControlDesignerInstance, DesignerLayoutControl, DesignerListControl } from '@byteluck-fe/model-driven-core';
+import { Rules } from 'async-validator';
+import { Settings, Setting } from '@byteluck-fe/model-driven-settings';
+export interface StoreOptions {
+    instance: DesignerControl[];
+    getParentBeforeInstanceMove?: (instance: DesignerControl) => DesignerControl | null;
+}
+type DataScopeControl = ControlDesignerInstance<'data-view' | 'subtable' | 'list-view'> | null;
+export declare class Store {
+    /**
+     * 页面控件实例树
+     * */
+    instance: DesignerControl[];
+    /**
+     * 拍平的控件数组
+     * */
+    flatInstances: DesignerControl[];
+    /**
+     * 控件id组成的map
+     * */
+    instanceIdMap: Map<string, DesignerControl>;
+    /**
+     * dataCode和fieldCode组成的map
+     * {
+     *   [主表dataCode]: {
+     *     [fieldCode]: 控件
+     *   },
+     *   [子表dataCode]: {
+     *     [fieldCode]: 控件
+     *   }
+     * }
+     * */
+    dataFieldCodeMap: Map<string, Map<string, DesignerControl>>;
+    /**
+     * 当前选中的控件
+     * */
+    selected: DesignerControl | null;
+    /**
+     * 当前选中的数据作用域控件
+     * */
+    selectedInstanceDataScopeParent: DataScopeControl;
+    selectedDataScopeFlatInstances: DesignerControl[];
+    /**
+     * 当前选中控件的setting
+     * */
+    selectedInstanceSetting: Settings;
+    selectedInstanceSettingItems: Setting[];
+    /**
+     * 当前选中控件的数据模型
+     * */
+    selectedFieldItem: any;
+    /**
+     * 扩展字段，比如appId，dataCode等
+     * */
+    external: Record<string, any>;
+    movingInstance: DesignerControl | null;
+    movingInstanceOldParent: DesignerControl | null;
+    movingInstanceOldDataScopeParent: DataScopeControl;
+    private readonly getParentBeforeInstanceMove;
+    constructor(options: StoreOptions);
+    /**
+     * 当前选中控件的rules
+     * */
+    get selectedRules(): Rules | null;
+    /**
+     * 当前选中控件的antd rules
+     * */
+    get selectedAntdRules(): Rules | null;
+    setInstances(instances: DesignerControl[]): void;
+    setSelectInstance(instance: DesignerControl | null): void;
+    setSelectInstanceSettings(settings: Settings): void;
+    private getSettingItems;
+    setSelectedFieldItem(fieldItem: Record<string, any> | null): void;
+    setMovingInstance(instance: DesignerControl | null): void;
+    updateDataFieldCodeMap(instance: DesignerControl): void;
+    getFlatInstances(): void;
+}
+export declare function loop(instances: DesignerControl[] | DesignerControl, callback: (instance: DesignerControl) => void): void;
+export declare function isDataScopeInstance(instance: DesignerControl): instance is Exclude<DataScopeControl, null>;
+export declare function findInstanceDataScopeParent(instance: DesignerControl | null): any;
+export declare function getDataScopeFlatInstances(dataScopeInstance: DesignerLayoutControl | DesignerListControl): DesignerControl[];
+export {};

package/dist/types/constants.d.ts

@@ -1,6 +1,6 @@
-import { CONTROL_TYPE, FieldTypes } from '@byteluck-fe/model-driven-shared';
-export declare const objectDataBindControlTypes: CONTROL_TYPE[];
-export declare const objectDataBindKeyToFieldType: Record<string, {
-    caption: string;
-    fieldType: FieldTypes;
-}>;
+import { CONTROL_TYPE, FieldTypes } from '@byteluck-fe/model-driven-shared';
+export declare const objectDataBindControlTypes: CONTROL_TYPE[];
+export declare const objectDataBindKeyToFieldType: Record<string, {
+    caption: string;
+    fieldType: FieldTypes;
+}>;

package/dist/types/designerUtils.d.ts

@@ -1,4 +1,4 @@
-import { ControlsKeys, ControlDesignerInstance, DesignerFormControl, DesignerLayoutControl, DesignerControl, DesignerListControl, DesignerSearchControl, DesignerWrapControl } from '@byteluck-fe/model-driven-core';
-export declare function hasChildrenControl(instance: DesignerControl): instance is DesignerLayoutControl | DesignerSearchControl | DesignerWrapControl;
-export declare function hasHeaderControl(instance: DesignerControl): instance is DesignerListControl;
-export declare function loopFormControl(control: ControlDesignerInstance<ControlsKeys>[], callback: (item: DesignerFormControl | ControlDesignerInstance<'subtable'>, children?: DesignerFormControl[]) => any): void;
+import { ControlsKeys, ControlDesignerInstance, DesignerFormControl, DesignerLayoutControl, DesignerControl, DesignerListControl, DesignerSearchControl, DesignerWrapControl } from '@byteluck-fe/model-driven-core';
+export declare function hasChildrenControl(instance: DesignerControl): instance is DesignerLayoutControl | DesignerSearchControl | DesignerWrapControl;
+export declare function hasHeaderControl(instance: DesignerControl): instance is DesignerListControl;
+export declare function loopFormControl(control: ControlDesignerInstance<ControlsKeys>[], callback: (item: DesignerFormControl | ControlDesignerInstance<'subtable'>, children?: DesignerFormControl[]) => any): void;

package/dist/types/index.d.ts

@@ -1,8 +1,8 @@
-import Designer, { ToolboxType, DesignerServices } from './Designer';
-export type { ToolboxType, DesignerServices };
-export { Designer };
-export * from './utils';
-export * from './Builder';
-export * from './designerUtils';
-export * from './Driven';
-export * from './Store';
+import Designer, { ToolboxType, DesignerServices } from './Designer';
+export type { ToolboxType, DesignerServices };
+export { Designer };
+export * from './utils';
+export * from './Builder';
+export * from './designerUtils';
+export * from './Driven';
+export * from './Store';

package/dist/types/utils.d.ts

@@ -1,55 +1,55 @@
-import { Schema, ControlsKeys, ColumnControlsKeys, DataBindModelType, ControlDesignerInstance, DesignerColumnControl, DesignerControl, DesignerFormControl, Messages } from '@byteluck-fe/model-driven-core';
-import { FieldTypes } from '@byteluck-fe/model-driven-shared';
-export declare function getMasterFormControls(controls: DesignerControl[]): DesignerFormControl[];
-/**
- * @description 给modelBindInfoList中填充fieldCode和dataCode
- * @description 我们生成fieldCode的规则是：DataBind的控件，取`field_${id}`，ObjectDataBind的控件，取`field_${id}_${key}`, key指的是ObjectDataBind.keys()
- * */
-export declare function fillModelBindInfoListFieldCode(modelBindInfoList: DataBindModelType[], dataCode?: string): DataBindModelType[];
-/**
- * @description 通过fieldType获取列表表头的type
- * */
-export declare function getColumnTypeFromFiledType(fieldType: string): ColumnControlsKeys | undefined;
-/**
- * @description 通过modelBindInfoList生成多个columns
- * */
-export declare function getColumnsFromModelBindInfoList(modelBindInfoList: DataBindModelType[]): DesignerColumnControl[];
-/**
- * @description 通过fieldType获取列实例
- * */
-export declare function getColumnsFromFiledType(fieldTypes: FieldTypes[]): ControlDesignerInstance<ColumnControlsKeys>[];
-export declare function getColumnsFromFiledType(fieldType: FieldTypes): ControlDesignerInstance<ColumnControlsKeys>;
-/**
- * @description 将控件实例转换为schema
- * */
-declare function toSchema<T extends ControlsKeys>(instance: DesignerControl): Schema<T>;
-declare function toSchema<T extends ControlsKeys>(instances: DesignerControl[]): Schema<T>[];
-declare function getModelBindInfoList(controls: DesignerControl[] | DesignerControl): DataBindModelType | DataBindModelType[] | undefined;
-declare function checkSchema(controls: DesignerControl[] | DesignerControl, messages?: Messages, ignore?: string[]): Promise<boolean>;
-interface PermissionItem {
-    controlId: string;
-    caption: string;
-    type: string;
-    controlType: string;
-    /**
-     * 是否可编辑
-     * */
-    canEdit: boolean;
-    /**
-     * 是否可查看
-     * */
-    canRead: boolean;
-    /**
-     * 是否可隐藏
-     * */
-    canHide: boolean;
-    parentId: string | null;
-    /**
-     * 在表单、列表授权时将权限分组显示
-     * element = 元素分组权限 = 除了绑定字段的控件都是这种类型
-     * field = 字段分组权限 = 绑了字段的控件类型
-     */
-    group: 'element' | 'field';
-}
-declare function generatePermissions(controls: DesignerControl[] | DesignerControl, parent?: PermissionItem): PermissionItem[];
-export { toSchema, getModelBindInfoList, checkSchema, generatePermissions };
+import { Schema, ControlsKeys, ColumnControlsKeys, DataBindModelType, ControlDesignerInstance, DesignerColumnControl, DesignerControl, DesignerFormControl, Messages } from '@byteluck-fe/model-driven-core';
+import { FieldTypes } from '@byteluck-fe/model-driven-shared';
+export declare function getMasterFormControls(controls: DesignerControl[]): DesignerFormControl[];
+/**
+ * @description 给modelBindInfoList中填充fieldCode和dataCode
+ * @description 我们生成fieldCode的规则是：DataBind的控件，取`field_${id}`，ObjectDataBind的控件，取`field_${id}_${key}`, key指的是ObjectDataBind.keys()
+ * */
+export declare function fillModelBindInfoListFieldCode(modelBindInfoList: DataBindModelType[], dataCode?: string): DataBindModelType[];
+/**
+ * @description 通过fieldType获取列表表头的type
+ * */
+export declare function getColumnTypeFromFiledType(fieldType: string): ColumnControlsKeys | undefined;
+/**
+ * @description 通过modelBindInfoList生成多个columns
+ * */
+export declare function getColumnsFromModelBindInfoList(modelBindInfoList: DataBindModelType[]): DesignerColumnControl[];
+/**
+ * @description 通过fieldType获取列实例
+ * */
+export declare function getColumnsFromFiledType(fieldTypes: FieldTypes[]): ControlDesignerInstance<ColumnControlsKeys>[];
+export declare function getColumnsFromFiledType(fieldType: FieldTypes): ControlDesignerInstance<ColumnControlsKeys>;
+/**
+ * @description 将控件实例转换为schema
+ * */
+declare function toSchema<T extends ControlsKeys>(instance: DesignerControl): Schema<T>;
+declare function toSchema<T extends ControlsKeys>(instances: DesignerControl[]): Schema<T>[];
+declare function getModelBindInfoList(controls: DesignerControl[] | DesignerControl): DataBindModelType | DataBindModelType[] | undefined;
+declare function checkSchema(controls: DesignerControl[] | DesignerControl, messages?: Messages, ignore?: string[]): Promise<boolean>;
+interface PermissionItem {
+    controlId: string;
+    caption: string;
+    type: string;
+    controlType: string;
+    /**
+     * 是否可编辑
+     * */
+    canEdit: boolean;
+    /**
+     * 是否可查看
+     * */
+    canRead: boolean;
+    /**
+     * 是否可隐藏
+     * */
+    canHide: boolean;
+    parentId: string | null;
+    /**
+     * 在表单、列表授权时将权限分组显示
+     * element = 元素分组权限 = 除了绑定字段的控件都是这种类型
+     * field = 字段分组权限 = 绑了字段的控件类型
+     */
+    group: 'element' | 'field';
+}
+declare function generatePermissions(controls: DesignerControl[] | DesignerControl, parent?: PermissionItem): PermissionItem[];
+export { toSchema, getModelBindInfoList, checkSchema, generatePermissions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteluck-fe/model-driven-driven",
-  "version": "2.5.3",
+  "version": "2.5.8",
   "description": "> TODO: description",
   "author": "郝晨光 <2293885211@qq.com>",
   "homepage": "",
@@ -26,10 +26,10 @@
     "postpublish": "node ../../scripts/postpublish.js"
   },
   "dependencies": {
-    "@byteluck-fe/model-driven-controls": "2.5.3",
+    "@byteluck-fe/model-driven-controls": "2.5.8",
     "@byteluck-fe/model-driven-core": "2.5.3",
     "@byteluck-fe/model-driven-settings": "2.5.3",
     "@byteluck-fe/model-driven-shared": "2.5.3"
   },
-  "gitHead": "9207c31501e84896728e6c5a9a7696b70a9a87ed"
+  "gitHead": "f6110d56a16cc6652f820c2be3b4314df38c00bf"
 }