@byteluck-fe/model-driven-core 7.0.0-1-beta9 → 7.0.0-props.10

package/dist/types/common/BaseControl/property.d.ts

@@ -11,13 +11,9 @@ declare class PropertyRuntimeRules extends Array<RuleItem> {
     constructor(props: Property);
 }
 /**
- * 全局属性
- * @public
+ * 属性定义
  */
-declare class Property {
-    static mode: MODE;
-    static readonly Rules: typeof PropertyRules;
-    static readonly RuntimeRules: typeof PropertyRuntimeRules;
+interface PropertyInterface {
     /**
      * 是否隐藏
      * @public
@@ -38,7 +34,21 @@ declare class Property {
      * @defaultValue ''
      */
     defaultState: 'readonly' | 'default';
+}
+/**
+ * 属性实现
+ * @public
+ */
+declare class Property implements PropertyInterface {
+    static mode: MODE;
+    static readonly Rules: typeof PropertyRules;
+    static readonly RuntimeRules: typeof PropertyRuntimeRules;
+    isHide: boolean;
+    className?: string[];
+    style: BaseStyle;
+    caption: string;
+    defaultState: 'readonly' | 'default';
     constructor(props?: Partial<Property>, caption?: string);
 }
 export default Property;
-export { Property, PropertyRules, PropertyRuntimeRules };
+export { Property, PropertyInterface, PropertyRules, PropertyRuntimeRules };

package/dist/types/common/ColumnControl/designer.d.ts

@@ -7,13 +7,13 @@ declare class ColumnControl extends DesignerControl {
     children: DesignerControl[];
     constructor(props?: Partial<ColumnControlSchema<ColumnControlsKeys>>);
     toSchema(): {
-        children: import("../../type").BaseControlSchema<never, import("../BaseControl").Property>[];
+        children: import("../../type").BaseControlSchema<never, import("../BaseControl/property").default>[];
         id: string;
         type: never;
-        props: import("../BaseControl").Property;
+        props: import("../BaseControl/property").default;
         controlType: import("../../type").BaseControlTypes;
-        fieldType?: import("@byteluck-fe/model-driven-shared").FieldTypes;
-        pageStatus?: import("../..").PAGE_STATUS;
+        fieldType?: import("@byteluck-fe/model-driven-shared/dist/types").FieldTypes | undefined;
+        pageStatus?: import("../..").PAGE_STATUS | undefined;
     };
 }
 export default ColumnControl;

package/dist/types/common/ColumnControl/property.d.ts

@@ -1,4 +1,4 @@
-import { Property, PropertyRules, RuntimeControl } from '../BaseControl';
+import { Property, PropertyInterface, PropertyRules, RuntimeControl } from '../BaseControl';
 import { RuleItem } from 'async-validator';
 import { DataBind, DataSourceBind, OptionSetting, AutoWidth } from '../../framework';
 declare class ColumnControlPropertyRules extends PropertyRules {
@@ -6,12 +6,7 @@ declare class ColumnControlPropertyRules extends PropertyRules {
     width: RuleItem;
     constructor(props: ColumnControlProperty);
 }
-/**
- * 列基本属性
- * @public
- */
-declare class ColumnControlProperty extends Property {
-    static readonly Rules: typeof ColumnControlPropertyRules;
+interface ColumnControlPropertyInterface extends PropertyInterface {
     /**
      * 宽度类型
      * @defaultValue 'auto'
@@ -58,6 +53,24 @@ declare class ColumnControlProperty extends Property {
      */
     autoHeight: boolean;
     children: RuntimeControl[];
+}
+/**
+ * 列基本属性
+ * @public
+ */
+declare class ColumnControlProperty extends Property implements ColumnControlPropertyInterface {
+    static readonly Rules: typeof ColumnControlPropertyRules;
+    widthType: 'px' | 'auto' | 'percent';
+    width: number;
+    caption: string;
+    dataBind: DataBind;
+    autoWidth: AutoWidth;
+    fixed: 'left' | 'right' | 'none';
+    sort: boolean;
+    align?: 'left' | 'right' | 'center';
+    colSpan?: string;
+    autoHeight: boolean;
+    children: RuntimeControl[];
     constructor(props?: Partial<ColumnControlProperty>);
 }
 declare class ColumnOptionAndDataSourcePropertyRules extends ColumnControlPropertyRules {
@@ -71,4 +84,4 @@ declare class ColumnOptionAndDataSourcePropertyRules extends ColumnControlProper
     });
 }
 export default ColumnControlProperty;
-export { ColumnControlProperty, ColumnControlPropertyRules, ColumnOptionAndDataSourcePropertyRules, };
+export { ColumnControlProperty, ColumnControlPropertyInterface, ColumnControlPropertyRules, ColumnOptionAndDataSourcePropertyRules, };

package/dist/types/common/FormControl/property.d.ts

@@ -1,4 +1,4 @@
-import { Property, PropertyRules, PropertyRuntimeRules } from '../BaseControl';
+import { Property, PropertyInterface, PropertyRules, PropertyRuntimeRules } from '../BaseControl';
 import { RuleItem } from '../Validator';
 import { DataBind, DataSourceBind, ObjectDataBind, OptionSetting } from '../../framework';
 declare class BaseControlPropertyRules extends PropertyRules {
@@ -14,13 +14,7 @@ declare class BaseControlPropertyRules extends PropertyRules {
 declare class BaseControlPropertyRuntimeRules extends PropertyRuntimeRules {
     constructor(props: BaseControlProperty);
 }
-/**
- * 表单控件公共属性
- * @public
- */
-declare class BaseControlProperty extends Property {
-    static readonly Rules: typeof BaseControlPropertyRules;
-    static readonly RuntimeRules: typeof BaseControlPropertyRuntimeRules;
+interface BaseControlPropertyInterface extends PropertyInterface {
     /**
      * 标题
      * @defaultValue ''
@@ -102,6 +96,28 @@ declare class BaseControlProperty extends Property {
      * @defaultValue ''
      */
     requiredMessage: string;
+}
+/**
+ * 表单控件公共属性
+ * @public
+ */
+declare class BaseControlProperty extends Property implements BaseControlPropertyInterface {
+    static readonly Rules: typeof BaseControlPropertyRules;
+    static readonly RuntimeRules: typeof BaseControlPropertyRuntimeRules;
+    caption: string;
+    captionSize: string;
+    captionColor: string;
+    isCaptionItalic: boolean;
+    isHideCaption: boolean;
+    isShowCaptionTip: boolean;
+    captionTip: string;
+    labelPosition: 'top' | 'left';
+    dataBind: DataBind | ObjectDataBind;
+    defaultValue: string | number | string[] | number[] | unknown;
+    placeholder: string;
+    defaultState: 'default' | 'readonly';
+    required: boolean;
+    requiredMessage: string;
     constructor(props?: Partial<BaseControlProperty>);
 }
 declare class OptionAndDataSourcePropertyRules extends BaseControlPropertyRules {
@@ -115,4 +131,4 @@ declare class OptionAndDataSourcePropertyRules extends BaseControlPropertyRules
     });
 }
 export default BaseControlProperty;
-export { BaseControlProperty, BaseControlPropertyRules, BaseControlPropertyRuntimeRules, OptionAndDataSourcePropertyRules, };
+export { BaseControlProperty, BaseControlPropertyInterface, BaseControlPropertyRules, BaseControlPropertyRuntimeRules, OptionAndDataSourcePropertyRules, };

package/dist/types/common/LayoutControl/property.d.ts

@@ -1,6 +1,8 @@
-import { Property } from '../BaseControl';
-declare class LayoutControlProperty extends Property {
+import { Property, PropertyInterface } from '../BaseControl';
+interface LayoutControlPropertyInterface extends PropertyInterface {
+}
+declare class LayoutControlProperty extends Property implements LayoutControlPropertyInterface {
     constructor(props?: Partial<LayoutControlProperty>);
 }
 export default LayoutControlProperty;
-export { LayoutControlProperty };
+export { LayoutControlProperty, LayoutControlPropertyInterface };

package/dist/types/common/ListControl/property.d.ts

@@ -1,8 +1,17 @@
-import { DesignerControl, Property, RuntimeControl } from '../BaseControl';
+import { DesignerControl, Property, PropertyInterface, RuntimeControl } from '../BaseControl';
 import { ControlsKeys, BaseControlSchema, MODE } from '../../type';
 import { DesignerListControl } from './designer';
 import { RuntimeListControl } from './runtime';
-declare class ListControlProperty<Mode extends MODE | 'Schema', Control extends object = Mode extends 'Runtime' ? RuntimeControl : Mode extends 'Designer' ? DesignerControl : BaseControlSchema<ControlsKeys, any>> extends Property {
+type ControlType<Mode extends MODE | 'Schema'> = Mode extends 'Runtime' ? RuntimeControl : Mode extends 'Designer' ? DesignerControl : BaseControlSchema<ControlsKeys, any>;
+interface ListControlPropertyInterface<Mode extends MODE | 'Schema', Control extends object = ControlType<Mode>> extends PropertyInterface {
+    headers: Control[];
+    footers?: Control[];
+    pageIndex: number;
+    pageSize: number;
+    pageSizeOptions: number[];
+    totalCount: number;
+}
+declare class ListControlProperty<Mode extends MODE | 'Schema', Control extends object = ControlType<Mode>> extends Property implements ListControlPropertyInterface<Mode, Control> {
     headers: Control[];
     footers?: Control[];
     pageIndex: number;
@@ -15,4 +24,4 @@ declare class ListControlProperty<Mode extends MODE | 'Schema', Control extends
     }>, mode?: MODE);
 }
 export default ListControlProperty;
-export { ListControlProperty };
+export { ListControlProperty, ListControlPropertyInterface };

package/dist/types/common/SearchViewControl/property.d.ts

@@ -1,8 +1,11 @@
-import { LayoutControlProperty } from '../LayoutControl';
+import { LayoutControlProperty, LayoutControlPropertyInterface } from '../LayoutControl';
 import { DataBind } from '../../framework';
-declare class SearchControlProperty extends LayoutControlProperty {
+interface SearchControlPropertyInterface extends LayoutControlPropertyInterface {
+    dataBind: DataBind;
+}
+declare class SearchControlProperty extends LayoutControlProperty implements SearchControlPropertyInterface {
     dataBind: DataBind;
     constructor(props?: Partial<SearchControlProperty>);
 }
 export default SearchControlProperty;
-export { SearchControlProperty };
+export { SearchControlProperty, SearchControlPropertyInterface };

package/dist/types/common/WrapControl/property.d.ts

@@ -1,6 +1,8 @@
-import { LayoutControlProperty } from '../LayoutControl';
-declare class WrapControlProperty extends LayoutControlProperty {
+import { LayoutControlProperty, LayoutControlPropertyInterface } from '../LayoutControl';
+interface WrapControlPropertyInterface extends LayoutControlPropertyInterface {
+}
+declare class WrapControlProperty extends LayoutControlProperty implements WrapControlPropertyInterface {
     constructor(props?: Partial<WrapControlProperty>);
 }
 export default WrapControlProperty;
-export { WrapControlProperty };
+export { WrapControlProperty, WrapControlPropertyInterface };

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

@@ -574,7 +574,7 @@ export declare class OptionSetting {
      * @defaultValue
      * @public
      */
-    color: string;
+    color?: string;
     constructor(props?: Partial<OptionSetting>);
 }
 export declare class ImageOptionSetting extends OptionSetting {
@@ -734,32 +734,32 @@ export declare class CalcValue {
     constructor(props?: Partial<CalcValue>);
 }
 export declare enum AMOUNT_TYPE {
-    CNY = "CNY",// 人民币
-    USD = "USD",// 美元
-    JPY = "JPY",// 日元
-    EUR = "EUR",// 欧元
-    INR = "INR",// 印度卢比
-    IDR = "IDR",// 印度盾
-    BRL = "BRL",// 巴西雷亚尔
-    AED = "AED",// 迪拉姆
-    AUD = "AUD",// 澳大利亚元
-    CAD = "CAD",// 加元
-    EGP = "EGP",// 埃及镑
-    GBP = "GBP",// 英镑
-    ZAR = "ZAR",// 南非兰特
-    KRW = "KRW",// 韩元
-    MAD = "MAD",// 摩洛哥迪拉姆
-    MXN = "MXN",// 墨西哥比索
-    MYR = "MYR",// 马来西亚林吉特
-    PHP = "PHP",// 菲律宾比索
-    PLN = "PLN",// 波兰兹罗提
-    RUB = "RUB",// 俄罗斯卢布
-    SGD = "SGD",// 新加坡元
-    THB = "THB",// 泰铢
-    TRY = "TRY",// 新土耳其里拉
-    TWD = "TWD",// 新台币
-    VND = "VND",// 越南盾
-    HKD = "HKD",// 港币
+    CNY = "CNY",
+    USD = "USD",
+    JPY = "JPY",
+    EUR = "EUR",
+    INR = "INR",
+    IDR = "IDR",
+    BRL = "BRL",
+    AED = "AED",
+    AUD = "AUD",
+    CAD = "CAD",
+    EGP = "EGP",
+    GBP = "GBP",
+    ZAR = "ZAR",
+    KRW = "KRW",
+    MAD = "MAD",
+    MXN = "MXN",
+    MYR = "MYR",
+    PHP = "PHP",
+    PLN = "PLN",
+    RUB = "RUB",
+    SGD = "SGD",
+    THB = "THB",
+    TRY = "TRY",
+    TWD = "TWD",
+    VND = "VND",
+    HKD = "HKD",
     IEP = "IEP"
 }
 /**
@@ -811,6 +811,7 @@ export declare enum COMMON_SETTING_TYPE {
     CAPTION_SIZE = "captionSize",
     CAPTION_COLOR = "captionColor",
     IS_CAPTION_ITALIC = "isCaptionItalic",
+    CAPTION_FONT_WEIGHT = "captionFontWeight",
     SHOW_TABLE_INDEX = "showTableIndex"
 }
 export declare enum PAGE_STATUS {
@@ -959,6 +960,7 @@ export declare class ListTreeData {
     groupFields: {
         field: string;
         orderType: 'desc' | 'asc';
+        columnType: string;
     }[];
     groupHeaderName: any;
     showFooterStatistics: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteluck-fe/model-driven-core",
-  "version": "7.0.0-1-beta9",
+  "version": "7.0.0-props.10",
   "description": "model engine core",
   "author": "郝晨光 <2293885211@qq.com>",
   "homepage": "",
@@ -26,9 +26,9 @@
     "postpublish": "node ../../scripts/postpublish.js"
   },
   "dependencies": {
-    "@byteluck-fe/model-driven-shared": "7.0.0-1-beta9",
+    "@byteluck-fe/model-driven-shared": "7.0.0-props.10",
     "async-validator": "3.5.1",
     "tslib": "^2.1.0"
   },
-  "gitHead": "06eb423735c35d0dbb0bb16f3d2030ac53f8633c"
+  "gitHead": "57a18bcb85857454a22df86d45d2512022f467c6"
 }