@byteluck-fe/model-driven-core 2.7.0-beta.4 → 2.8.0-alpha.1a

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

@@ -23,6 +23,12 @@ export declare class DataBind {
      * @public
      */
     fieldType: string;
+    /**
+     * 表别名
+     * @defaultValue undefined
+     * @public
+     */
+    aliasCode?: string;
     constructor(props?: Partial<DataBind>);
 }
 export declare class AutoWidth {
@@ -193,6 +199,15 @@ export declare class FieldFilterCondition {
     rightVariableBo: RightVariable;
     constructor(props?: Partial<FieldFilterCondition>);
 }
+export declare class JoinRelation {
+    aliasCode: string;
+    datasourceBind: DataSourceBind;
+    relationFields: {
+        main_field_code: string;
+        join_field_code: string;
+    }[];
+    constructor(props?: Partial<JoinRelation>);
+}
 /**
  * 数据填充项
  * @public
@@ -379,6 +394,7 @@ export declare class LinkOperationOption {
     confirmMessage: undefined;
     defaultState: string;
     formKey: undefined | string;
+    formType?: string;
     icon: string;
     needConfirm: boolean;
     openType: string;
@@ -580,7 +596,7 @@ export declare class RangeDataBind extends ObjectDataBind {
      * 结束日期字段绑定项
      */
     max: DataBind;
-    constructor(props?: Partial<AmountDataBind>);
+    constructor(props?: Partial<RangeDataBind>);
 }
 /**
  * 日期区间值
@@ -732,7 +748,6 @@ export declare enum COMMON_SETTING_TYPE {
     VIEW_FORM_MODEL_TYPE = "viewFormModelType",
     SERVER_PAGINATION = "serverPagination",
     IS_SHOW_CAPTION_TIP = "isShowCaptionTip",
-    IS_SHOW_WATERMARK = "isShowWatermark",
     ENCRYPTED = "encrypted",
     IS_INLINE_EDIT = "isInlineEdit",
     REVISIONS_MODE = "revisionsMode",
@@ -812,3 +827,18 @@ export declare class BaseStyle {
     heightConfig: 'px' | '%' | 'fill' | 'hug';
     constructor(props?: Partial<BaseStyle>);
 }
+export declare class OptObject {
+    /**
+     * 操作项编码
+     * @defaultValue ''
+     * @public
+     */
+    optCode: string;
+    /**
+     * 操作项类型
+     * @defaultValue ''
+     * @public
+     */
+    optType: string;
+    constructor(props?: Partial<OptObject>);
+}

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

@@ -0,0 +1,2 @@
+import { DataBind, ObjectDataBind } from "framework";
+export declare function isDataBind(dataBind: DataBind | ObjectDataBind): boolean;

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './common';
 export * from './framework';
 export * from './type';
+export * from './framework/isDataBind';

package/dist/types/type.d.ts

@@ -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 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 WrapControlsKeys ? WrapControlSchema<K, T extends WrapControlProperty ? T : WrapControlProperty> : K extends BaseControlsKeys ? BaseControlSchema<K, T extends Property ? T : Property> : BaseControlSchema<K, T extends Property ? T : Property>;
 export 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.7.0-beta.4",
+  "version": "2.8.0-alpha.1a",
   "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.7.0-beta.4",
+    "@byteluck-fe/model-driven-shared": "2.7.0-alpha.38a",
     "async-validator": "3.5.1",
     "tslib": "^2.1.0"
   },
-  "gitHead": "1bf9f693724f41f144a37e4f81f2c06dfe2069de"
+  "gitHead": "94f33265fbf14e4859f865af60018c9ec820550d"
 }