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

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

@@ -11,20 +11,26 @@ 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
      * @defaultValue false
      */
     isHide: boolean;
+    /**
+     * 类名
+     * @public
+     * @noSchema
+     */
     className?: string[];
+    /**
+     * 样式
+     * @public
+     * @noSchema
+     */
     style: BaseStyle;
     /**
      * 标题
@@ -33,12 +39,25 @@ declare class Property {
      */
     caption: string;
     /**
-     * 标题
+     * 默认状态
      * @public
-     * @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/BaseControl/types.d.ts

@@ -12,6 +12,10 @@ export declare interface SettingOption {
     label?: string;
     name?: string;
     tip?: string;
+    children?: SettingOption[];
+    layout?: 'horizontal' | 'vertical';
+    min?: number;
+    max?: number;
 }
 export declare interface HideOptions {
     key: string;

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'
@@ -57,6 +52,27 @@ declare class ColumnControlProperty extends Property {
      * @defaultValue false
      */
     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>);
 }
@@ -71,4 +87,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,7 +14,7 @@ declare class BaseControlPropertyRules extends PropertyRules {
 declare class BaseControlPropertyRuntimeRules extends PropertyRuntimeRules {
     constructor(props: BaseControlProperty);
 }
-type BaseControlPropertyTypes = {
+interface BaseControlPropertyInterface extends PropertyInterface {
     /**
      * 标题
      * @defaultValue ''
@@ -39,6 +39,18 @@ type BaseControlPropertyTypes = {
      * @public
      */
     isCaptionItalic: boolean;
+    /**
+     * 标题字重；取值：normal：常规；bold：粗体；lighter：更细；
+     * @defaultValue 'normal'
+     * @public
+     */
+    captionFontWeight: 'normal' | 'bold' | 'lighter';
+    /**
+     * 样式类
+     * @defaultValue []
+     * @public
+     */
+    className: string[];
     /**
      * 隐藏标题
      * @defaultValue false
@@ -96,94 +108,29 @@ type BaseControlPropertyTypes = {
      * @defaultValue ''
      */
     requiredMessage: string;
-};
+}
 /**
  * 表单控件公共属性
  * @public
  */
-declare class BaseControlProperty extends Property implements BaseControlPropertyTypes {
+declare class BaseControlProperty extends Property implements BaseControlPropertyInterface {
     static readonly Rules: typeof BaseControlPropertyRules;
     static readonly RuntimeRules: typeof BaseControlPropertyRuntimeRules;
-    /**
-     * 标题
-     * @defaultValue ''
-     * @public
-     */
     caption: string;
-    /**
-   * 标题大小
-   * @defaultValue ''
-   * @public
-   */
     captionSize: string;
-    /**
-     * 标题颜色
-     * @defaultValue ''
-     * @public
-     */
     captionColor: string;
-    /**
-     * 标题斜体
-     * @defaultValue false
-     * @public
-     */
     isCaptionItalic: boolean;
-    /**
-     * 隐藏标题
-     * @defaultValue false
-     * @public
-     */
+    captionFontWeight: 'normal' | 'bold' | 'lighter';
+    className: string[];
     isHideCaption: boolean;
-    /**
-     * 显示气泡提示
-     * @defaultValue false
-     * @public
-     */
     isShowCaptionTip: boolean;
-    /**
-     * 气泡提示语
-     * @defaultValue ''
-     * @public
-     */
     captionTip: string;
-    /**
-     * 标题布局
-     * @defaultValue ''
-     * @public
-     */
     labelPosition: 'top' | 'left';
-    /**
-     * 绑定数据项
-     * @public
-     */
     dataBind: DataBind | ObjectDataBind;
-    /**
-     * 默认值
-     * @public
-     */
     defaultValue: string | number | string[] | number[] | unknown;
-    /**
-     * 提示文字
-     * @defaultValue ''
-     * @public
-     */
     placeholder: string;
-    /**
-     * 默认状态
-     * @defaultValue 'default'
-     * @public
-     */
     defaultState: 'default' | 'readonly';
-    /**
-     * 必填
-     * @defaultValue false
-     * @public
-     */
     required: boolean;
-    /**
-     * 必填提示文案
-     * @defaultValue ''
-     */
     requiredMessage: string;
     constructor(props?: Partial<BaseControlProperty>);
 }
@@ -198,4 +145,4 @@ declare class OptionAndDataSourcePropertyRules extends BaseControlPropertyRules
     });
 }
 export default BaseControlProperty;
-export { BaseControlProperty, BaseControlPropertyTypes, 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,35 @@
-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 +42,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,14 @@
-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 {
@@ -669,6 +669,16 @@ export declare class RangeDateValue {
  * @public
  */
 export declare class AddressValue {
+    /**
+     * 国家编码
+     * @defaultValue ''
+     */
+    country?: string;
+    /**
+     * 国家显示文字
+     * @defaultValue ''
+     */
+    countryDisplay?: string;
     /**
      * 市编码
      * @defaultValue ''
@@ -811,6 +821,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 +970,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-props.1",
+  "version": "7.0.0-props.101",
   "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-props.1",
+    "@byteluck-fe/model-driven-shared": "7.0.0-props.101",
     "async-validator": "3.5.1",
     "tslib": "^2.1.0"
   },
-  "gitHead": "c3fbedbd71dd7e651bff25a86e3a781287b6a1e8"
+  "gitHead": "e9c876a5f0429d763f3608b9ca325073d96c404c"
 }