@byteluck-fe/model-driven-core 2.5.0-alpha.9 → 2.5.0-beta.4

package/dist/types/framework/index.d.ts

@@ -56,7 +56,15 @@ export declare class FormSelectBind extends FormBind {
     primaryControlId: string;
     constructor(props?: Partial<FormSelectBind>);
 }
+/**
+ * 列表绑定字段项
+ * @public
+ */
 declare class ListBindHeaderItem {
+    /**
+     * 字段
+     * @defaultValue ''
+     */
     fieldCode: string;
     constructor(props?: Partial<ListBindHeaderItem>);
 }
@@ -107,28 +115,81 @@ export declare class LeftVariable {
     constructor(props?: Partial<LeftVariable>);
 }
 export declare class RightVariable {
-    type: 'form' | 'system' | 'custom';
+    type: 'form' | 'system' | 'custom' | 'gv';
     value: string[];
     displayBos: Record<string, unknown>[];
     constructor(props?: Partial<RightVariable>);
 }
+/**
+ * 连接符条件
+ * @public
+ */
 export declare class FieldFilterConditions {
+    /**
+     * 编号
+     * @defaultValue ''
+     */
     id: string;
+    /**
+     * 规则编号
+     * @defaultValue Timestamp
+     */
     ruleId: number;
+    /**
+     * 类型：连接符条件
+     * @defaultValue 'conditions'
+     */
     type: string;
+    /**
+     * 深度
+     * @defaultValue 0
+     */
     level: number;
+    /**
+     * 连接符值
+     * @defaultValue 'and'
+     */
     value: 'and' | 'or';
+    /**
+     * 包含子项
+     * @defaultValue []
+     */
     children: Array<FieldFilterCondition | FieldFilterConditions>;
     constructor(props?: Partial<FieldFilterConditions>);
 }
+/**
+ * 字段过滤条件
+ * @public
+ */
 export declare class FieldFilterCondition {
+    /**
+     * 唯一编号
+     * @defaultValue ''
+     */
     id: string;
+    /**
+     * 规则编号
+     * @defaultValue Timestamp
+     */
     ruleId: number;
+    /**
+     * 类型
+     * @defaultValue 'condition'
+     */
     type: string;
+    /**
+     * 符号
+     */
     symbol: string;
     checked: boolean;
     describe: string;
+    /**
+     * 左值
+     */
     leftVariableBo: LeftVariable;
+    /**
+     * 右值
+     */
     rightVariableBo: RightVariable;
     constructor(props?: Partial<FieldFilterCondition>);
 }
@@ -163,14 +224,41 @@ export declare class MultistageFillingItem {
     propName: string;
     constructor(props: Partial<MultistageFillingItem>);
 }
+/**
+ * 显示项
+ * @public
+ */
 export declare class DisplayBoListItem {
+    /**
+     * 显示项类型：字段 | 符号
+     * @defaultValue 'FIELD'
+     * @public
+     */
     type: 'FIELD' | 'MOSAICS';
+    /**
+     * 值
+     */
     value: string;
+    /**
+     * 字段数据类型
+     */
     fieldType?: FieldTypes;
     constructor(props?: Partial<DisplayBoListItem>);
 }
+/**
+ * 数据源排序项
+ * @public
+ */
 export declare class DataSourceOrderItem {
+    /**
+     * 列名
+     * @defaultValue ''
+     */
     columnName: string;
+    /**
+     * 倒序
+     * @defaultValue false
+     */
     desc: boolean;
     constructor(props: Partial<DataSourceOrderItem>);
 }
@@ -214,6 +302,12 @@ export declare class DataSourceBind {
      * @public
      */
     displayBoList: DisplayBoListItem[];
+    /**
+     * 查询关键字参数映射
+     * @defaultValue ''
+     * @public
+     */
+    keywordMapping?: string;
     /**
      * 绑定服务
      * @defaultValue ''
@@ -232,6 +326,18 @@ export declare class DataSourceBind {
      * @public
      */
     filters?: Array<FieldFilterCondition | FieldFilterConditions>;
+    /**
+     * 过滤条件-查看过滤
+     * @defaultValue []
+     * @public
+     */
+    viewFilters?: Array<FieldFilterCondition | FieldFilterConditions>;
+    /**
+     * 是否开启查看过滤
+     * @defaultValue 0:未开启；1:开启
+     * @public
+     */
+    isOpenViewFilters?: number;
     /**
      * 排序
      * @defaultValue []
@@ -291,6 +397,13 @@ export declare class SuperDataSourceBind extends DataSourceBind {
         attributes?: Partial<CustomAttributeItem>[];
     });
 }
+export declare class OrganizationDataSourceBind extends DataSourceBind {
+    attributes: CustomAttributeItem[];
+    formCode: string;
+    constructor(props?: Omit<Partial<OrganizationDataSourceBind>, 'attributes'> & {
+        attributes?: Partial<CustomAttributeItem>[];
+    });
+}
 export declare class TreeDataSourceBind extends SuperDataSourceBind {
     rootNode: RightVariable;
     filterCode?: String;
@@ -316,6 +429,12 @@ export declare class FillPayloadBind extends FillBind {
      * @public
      **/
     filters: Array<FieldFilterCondition | FieldFilterConditions>;
+    /**
+     * 数据源过滤条件-查看
+     * @defaultValue []
+     * @public
+     **/
+    viewFilters: Array<FieldFilterCondition | FieldFilterConditions>;
     /**
      * 数据源排序条件
      * @defaultValue []
@@ -357,9 +476,25 @@ export declare class Language {
     ja: string;
     constructor(props?: Partial<Language>);
 }
+/**
+ * 正则校验
+ * @public
+ */
 export declare class RegularRules {
+    /**
+     * 内置模版
+     * @defaultValue ''
+     */
     stencilName: string;
+    /**
+     * 正则表达式
+     * @defaultValue ''
+     */
     expression: string;
+    /**
+     * 校验错误提示信息
+     * @defaultValue ''
+     */
     errMessage: string;
     constructor(props?: Partial<RegularRules>);
 }
@@ -390,45 +525,146 @@ export declare class ImageOptionSetting extends OptionSetting {
 }
 export declare function initOptions(options?: Partial<OptionSetting>[]): OptionSetting[];
 export declare function initImageOptions(options?: Partial<ImageOptionSetting>[]): ImageOptionSetting[];
+/**
+ * 对象类型数据绑定配置
+ * @public
+ */
 export declare class ObjectDataBind {
+    /**
+     * 绑定配置
+     */
     [key: string]: DataBind;
 }
+/**
+ * 金额控件数据绑定配置
+ * @public
+ */
 export declare class AmountDataBind extends ObjectDataBind {
+    /**
+     * 金额字段绑定配置
+     */
     amount: DataBind;
+    /**
+     * 币种字段绑定配置
+     */
     currency: DataBind;
     constructor(props?: Partial<AmountDataBind>);
 }
+/**
+ * 金额控件值
+ * @public
+ */
 export declare class AmountValue {
+    /**
+     * 金额值
+     * @defaultValue ''
+     */
     amount: number | '';
+    /**
+     * 货币值
+     * @defaultValue 'CNY'
+     */
     currency: AMOUNT_TYPE;
     constructor(props?: Partial<AmountValue>);
 }
+/**
+ * 日期区间数据绑定项
+ * @public
+ */
 export declare class RangeDataBind extends ObjectDataBind {
+    /**
+     * 开始日期字段绑定项
+     */
     min: DataBind;
+    /**
+     * 结束日期字段绑定项
+     */
     max: DataBind;
     constructor(props?: Partial<AmountDataBind>);
 }
+/**
+ * 日期区间值
+ * @public
+ */
 export declare class RangeDateValue {
+    /**
+     * 开始日期值
+     * @defaultValue ''
+     */
     min: string;
+    /**
+     * 结束日期值
+     * @defaultValue ''
+     */
     max: string;
     constructor(props?: Partial<RangeDateValue>);
 }
+/**
+ * 地址值
+ * @public
+ */
 export declare class AddressValue {
+    /**
+     * 市编码
+     * @defaultValue ''
+     */
     city?: string;
+    /**
+     * 市显示文字
+     * @defaultValue ''
+     */
     cityDisplay?: string;
+    /**
+     * 区编码
+     * @defaultValue ''
+     */
     district?: string;
+    /**
+     * 区显示文字
+     * @defaultValue ''
+     */
     districtDisplay?: string;
+    /**
+     * 省编码
+     * @defaultValue ''
+     */
     province?: string;
+    /**
+     * 省显示文字
+     * @defaultValue ''
+     */
     provinceDisplay?: string;
     constructor(props?: Partial<AddressValue>);
 }
+/**
+ * 计算公式数据绑定项
+ * @public
+ */
 export declare class CalcDataBind extends ObjectDataBind {
+    /**
+     * 计算结果字段绑定项
+     */
     result: DataBind;
+    /**
+     * 单位字段绑定项
+     */
     unit: DataBind;
     constructor(props?: Partial<CalcDataBind>);
 }
+/**
+ * 计算公式值
+ * @public
+ */
 export declare class CalcValue {
+    /**
+     * 计算结果值
+     * @defaultValue 0
+     */
     result: number | 0;
+    /**
+     * 单位
+     * @defaultValue ''
+     */
     unit: string;
     constructor(props?: Partial<CalcValue>);
 }
@@ -493,6 +729,7 @@ export declare enum COMMON_SETTING_TYPE {
     CONTAINS_SUB_NODE = "containsSubNode",
     DEFAULT_COLLAPSE = "defaultCollapse",
     CAN_VIEW_FORM = "canViewForm",
+    VIEW_FORM_MODEL_TYPE = "viewFormModelType",
     SERVER_PAGINATION = "serverPagination",
     IS_SHOW_CAPTION_TIP = "isShowCaptionTip",
     ENCRYPTED = "encrypted",
@@ -548,6 +785,7 @@ export declare class ViewOperationItem {
     id: string;
     title: string;
     filters: Array<FieldFilterCondition | FieldFilterConditions>;
+    viewFilters: Array<FieldFilterCondition | FieldFilterConditions>;
     headers: ListBindHeaderItem[];
     constructor(props: Partial<ViewOperationItem>);
 }

package/dist/types/type.d.ts

@@ -2,7 +2,7 @@ import { BaseControlProperty, LayoutControlProperty, Property, DesignerControl,
 import { PAGE_STATUS } from './framework';
 import { FieldTypes } from '@byteluck-fe/model-driven-shared';
 import { WrapControlProperty } from './common/WrapControl';
-export type SchemaUpgradeFunction = (schemaJSON: any, newVersion: string, oldVersion: string, payload?: any) => any;
+export declare type SchemaUpgradeFunction = (schemaJSON: any, newVersion: string, oldVersion: string, payload?: any) => any;
 export interface ExportedControl {
     Property: typeof Property;
     Designer: typeof DesignerControl;
@@ -32,26 +32,26 @@ export interface WrapControls {
 }
 export interface Controls extends BaseControls, FormControls, LayoutControls, ListControls, ColumnControls, SearchControls, WrapControls {
 }
-export type GetKeys<T extends string> = T extends never ? string : T;
-export type MODE = 'Designer' | 'Runtime';
-export type BaseControlsKeys = GetKeys<keyof BaseControls>;
-export type FormControlsKeys = GetKeys<keyof FormControls>;
-export type LayoutControlsKeys = GetKeys<keyof LayoutControls>;
-export type ListControlsKeys = GetKeys<keyof ListControls>;
-export type ColumnControlsKeys = GetKeys<keyof ColumnControls>;
-export type SearchControlsKeys = GetKeys<keyof SearchControls>;
-export type WrapControlsKeys = GetKeys<keyof WrapControls>;
-export type ControlsKeys = GetKeys<keyof Controls>;
-export type ControlExport = ExportedControl;
-export type ControlDesigner<T extends ControlsKeys> = Controls[T]['Designer'];
-export type ControlDesignerInstance<T extends ControlsKeys> = InstanceType<ControlDesigner<T>>;
-export type ControlRuntime<T extends ControlsKeys> = Controls[T]['Runtime'];
-export type ControlRuntimeInstance<T extends ControlsKeys> = InstanceType<ControlRuntime<T>>;
-export type ControlProperty<T extends ControlsKeys> = Controls[T]['Property'];
-export type ControlPropertyInstance<T extends ControlsKeys> = InstanceType<ControlProperty<T>>;
-export type ControlsConstructor<T extends ControlsKeys, P extends MODE> = Controls[T][P];
-export type ControlsInstance<T extends ControlsKeys, P extends MODE> = InstanceType<ControlsConstructor<T, P>>;
-export type BaseControlTypes = 'layout' | 'form' | 'base' | 'list' | 'column' | 'search' | 'wrap';
+export declare type GetKeys<T extends string> = T extends never ? string : T;
+export declare type MODE = 'Designer' | 'Runtime';
+export declare type BaseControlsKeys = GetKeys<keyof BaseControls>;
+export declare type FormControlsKeys = GetKeys<keyof FormControls>;
+export declare type LayoutControlsKeys = GetKeys<keyof LayoutControls>;
+export declare type ListControlsKeys = GetKeys<keyof ListControls>;
+export declare type ColumnControlsKeys = GetKeys<keyof ColumnControls>;
+export declare type SearchControlsKeys = GetKeys<keyof SearchControls>;
+export declare type WrapControlsKeys = GetKeys<keyof WrapControls>;
+export declare type ControlsKeys = GetKeys<keyof Controls>;
+export declare type ControlExport = ExportedControl;
+export declare type ControlDesigner<T extends ControlsKeys> = Controls[T]['Designer'];
+export declare type ControlDesignerInstance<T extends ControlsKeys> = InstanceType<ControlDesigner<T>>;
+export declare type ControlRuntime<T extends ControlsKeys> = Controls[T]['Runtime'];
+export declare type ControlRuntimeInstance<T extends ControlsKeys> = InstanceType<ControlRuntime<T>>;
+export declare type ControlProperty<T extends ControlsKeys> = Controls[T]['Property'];
+export declare type ControlPropertyInstance<T extends ControlsKeys> = InstanceType<ControlProperty<T>>;
+export declare type ControlsConstructor<T extends ControlsKeys, P extends MODE> = Controls[T][P];
+export declare type ControlsInstance<T extends ControlsKeys, P extends MODE> = InstanceType<ControlsConstructor<T, P>>;
+export declare type BaseControlTypes = 'layout' | 'form' | 'base' | 'list' | 'column' | 'search' | 'wrap';
 export interface BaseControlSchema<K extends ControlsKeys, T extends Property> {
     id: string;
     type: K;
@@ -85,7 +85,7 @@ export interface WrapControlSchema<K extends WrapControlsKeys, T extends WrapCon
     controlType: 'wrap';
     children: R[];
 }
-export type Schema<K extends ControlsKeys, T extends Property = InstanceType<Controls[K]['Property']>> = K extends FormControlsKeys ? FormControlSchema<K, T extends BaseControlProperty ? T : BaseControlProperty> : K extends LayoutControlsKeys ? LayoutControlSchema<K, T extends LayoutControlProperty ? T : LayoutControlProperty> : K extends ListControlsKeys ? ListControlSchema<K, T extends ListControlProperty<any> ? T : ListControlProperty<any>> : K extends ColumnControlsKeys ? ColumnControlSchema<K, T extends ColumnControlProperty ? T : ColumnControlProperty> : K extends SearchControlsKeys ? SearchControlSchema<K, T extends SearchControlProperty ? T : SearchControlProperty> : K extends BaseControlsKeys ? BaseControlSchema<K, T extends Property ? T : Property> : BaseControlSchema<K, T extends Property ? T : Property>;
-export type DeepPartial<T> = {
+export declare type Schema<K extends ControlsKeys, T extends Property = InstanceType<Controls[K]['Property']>> = K extends FormControlsKeys ? FormControlSchema<K, T extends BaseControlProperty ? T : BaseControlProperty> : K extends LayoutControlsKeys ? LayoutControlSchema<K, T extends LayoutControlProperty ? T : LayoutControlProperty> : K extends ListControlsKeys ? ListControlSchema<K, T extends ListControlProperty<any> ? T : ListControlProperty<any>> : K extends ColumnControlsKeys ? ColumnControlSchema<K, T extends ColumnControlProperty ? T : ColumnControlProperty> : K extends SearchControlsKeys ? SearchControlSchema<K, T extends SearchControlProperty ? T : SearchControlProperty> : K extends BaseControlsKeys ? BaseControlSchema<K, T extends Property ? T : Property> : BaseControlSchema<K, T extends Property ? T : Property>;
+export declare type DeepPartial<T> = {
     [P in keyof T]?: DeepPartial<T[P]>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteluck-fe/model-driven-core",
-  "version": "2.5.0-alpha.9",
+  "version": "2.5.0-beta.4",
   "description": "model engine core",
   "author": "郝晨光 <2293885211@qq.com>",
   "homepage": "",
@@ -26,9 +26,9 @@
     "postpublish": "node ../../scripts/postpublish.js"
   },
   "dependencies": {
-    "@byteluck-fe/model-driven-shared": "2.5.0-alpha.9",
+    "@byteluck-fe/model-driven-shared": "2.5.0-beta.1",
     "async-validator": "3.5.1",
     "tslib": "^2.1.0"
   },
-  "gitHead": "2ac4e3593b1126537da3d3a62944a494bb30598d"
+  "gitHead": "9eab5e07d7c76a24510fe03a0fd768aecab71635"
 }