@byteluck-fe/model-driven-controls 7.0.0-props.102 → 7.0.0-props.104

package/dist/types/baseControls/BarChart/property.d.ts

@@ -1,6 +1,6 @@
-import { MultistageFillingItem, Property, PropertyInterface, TreeDataSourceBind } from '@byteluck-fe/model-driven-core';
+import { MultistageFillingItem, Property, PropertyInterface, PropertyRules, DataSourceBind } from '@byteluck-fe/model-driven-core';
 import { FONT_WEIGHT } from '../../framework';
-type BarChartDataMode = 'static' | 'dynamic';
+import { RuleItem } from 'async-validator';
 interface BarChartYFieldItem {
     field: string;
     name: string;
@@ -11,6 +11,12 @@ interface BarChartSeriesConfigItem {
      */
     valueField?: string;
 }
+declare class BarChartPropertyRules extends PropertyRules {
+    xField: RuleItem;
+    yField: RuleItem;
+    seriesConfig: RuleItem;
+    constructor(props: BarChartProperty);
+}
 interface BarChartPropertyInterface extends PropertyInterface {
     /**
      * 标题
@@ -30,6 +36,12 @@ interface BarChartPropertyInterface extends PropertyInterface {
      * @public
      */
     isShowCaptionTip: boolean;
+    /**
+     * 标题布局；取值：top：上方；left：左侧；
+     * @defaultValue 'top'
+     * @public
+     */
+    labelPosition: 'top' | 'left';
     /**
      * 气泡提示语
      * @defaultValue ''
@@ -72,12 +84,6 @@ interface BarChartPropertyInterface extends PropertyInterface {
      * @public
      */
     template: string;
-    /**
-     * 数据模式；取值：static：静态数据；dynamic：动态数据源；
-     * @defaultValue 'static'
-     * @public
-     */
-    dataMode: BarChartDataMode;
     /**
      * 图表 option JSON
      * @defaultValue '{}'
@@ -92,16 +98,16 @@ interface BarChartPropertyInterface extends PropertyInterface {
     optionConfig: 'datasource';
     /**
      * 数据源绑定
-     * @defaultValue new TreeDataSourceBind({ attributes: BarChartControl.controlCustomAttributes })
+     * @defaultValue new DataSourceBind()
      * @public
      */
-    datasourceBind: TreeDataSourceBind;
+    datasourceBind: DataSourceBind;
     /**
      * 筛选项数据源绑定
-     * @defaultValue new TreeDataSourceBind({ attributes: BarChartControl.controlCustomAttributes })
+     * @defaultValue new DataSourceBind()
      * @public
      */
-    filterItemDatasourceBind: TreeDataSourceBind;
+    filterItemDatasourceBind: DataSourceBind;
     /**
      * 多级填充
      * @defaultValue []
@@ -140,9 +146,11 @@ interface BarChartPropertyInterface extends PropertyInterface {
     seriesConfig: BarChartSeriesConfigItem[];
 }
 declare class BarChartProperty extends Property implements BarChartPropertyInterface {
+    static readonly Rules: typeof BarChartPropertyRules;
     caption: string;
     isHideCaption: boolean;
     isShowCaptionTip: boolean;
+    labelPosition: 'top' | 'left';
     captionTip: string;
     captionSize: string;
     captionColor: string;
@@ -150,11 +158,10 @@ declare class BarChartProperty extends Property implements BarChartPropertyInter
     captionFontWeight: FONT_WEIGHT;
     isHide: boolean;
     template: string;
-    dataMode: BarChartDataMode;
     optionJson: string;
     optionConfig: 'datasource';
-    datasourceBind: TreeDataSourceBind;
-    filterItemDatasourceBind: TreeDataSourceBind;
+    datasourceBind: DataSourceBind;
+    filterItemDatasourceBind: DataSourceBind;
     multistageFilling: MultistageFillingItem[];
     defaultValue: string[];
     openMultistageFilling: boolean;
@@ -164,5 +171,5 @@ declare class BarChartProperty extends Property implements BarChartPropertyInter
     constructor(props?: Partial<BarChartProperty>);
 }
 export default BarChartProperty;
-export type { BarChartDataMode, BarChartSeriesConfigItem, BarChartPropertyInterface, BarChartYFieldItem, };
-export { BarChartProperty };
+export type { BarChartSeriesConfigItem, BarChartPropertyInterface, BarChartYFieldItem, };
+export { BarChartProperty, BarChartPropertyRules };

package/dist/types/baseControls/LineChart/property.d.ts

@@ -1,6 +1,6 @@
-import { MultistageFillingItem, Property, PropertyInterface, TreeDataSourceBind } from '@byteluck-fe/model-driven-core';
+import { MultistageFillingItem, Property, PropertyInterface, PropertyRules, DataSourceBind } from '@byteluck-fe/model-driven-core';
 import { FONT_WEIGHT } from '../../framework';
-type LineChartDataMode = 'static' | 'dynamic';
+import { RuleItem } from 'async-validator';
 declare enum LineChartTemplate {
     LINE_BASIC = "line-basic",
     LINE_SMOOTH = "line-smooth",
@@ -14,6 +14,12 @@ interface LineChartSeriesConfigItem {
      */
     valueField?: string;
 }
+declare class LineChartPropertyRules extends PropertyRules {
+    xField: RuleItem;
+    yField: RuleItem;
+    seriesConfig: RuleItem;
+    constructor(props: LineChartProperty);
+}
 interface LineChartPropertyInterface extends PropertyInterface {
     /**
      * 标题
@@ -33,6 +39,12 @@ interface LineChartPropertyInterface extends PropertyInterface {
      * @public
      */
     isShowCaptionTip: boolean;
+    /**
+     * 标题布局；取值：top：上方；left：左侧；
+     * @defaultValue 'top'
+     * @public
+     */
+    labelPosition: 'top' | 'left';
     /**
      * 气泡提示语
      * @defaultValue ''
@@ -75,12 +87,6 @@ interface LineChartPropertyInterface extends PropertyInterface {
      * @public
      */
     template: string;
-    /**
-     * 数据模式；取值：static：静态数据；dynamic：动态数据源；
-     * @defaultValue 'static'
-     * @public
-     */
-    dataMode: LineChartDataMode;
     /**
      * 图表 option JSON
      * @defaultValue '{}'
@@ -95,16 +101,16 @@ interface LineChartPropertyInterface extends PropertyInterface {
     optionConfig: 'datasource';
     /**
      * 数据源绑定
-     * @defaultValue new TreeDataSourceBind({ attributes: LineChartControl.controlCustomAttributes })
+     * @defaultValue new DataSourceBind()
      * @public
      */
-    datasourceBind: TreeDataSourceBind;
+    datasourceBind: DataSourceBind;
     /**
      * 筛选项数据源绑定
-     * @defaultValue new TreeDataSourceBind({ attributes: LineChartControl.controlCustomAttributes })
+     * @defaultValue new DataSourceBind()
      * @public
      */
-    filterItemDatasourceBind: TreeDataSourceBind;
+    filterItemDatasourceBind: DataSourceBind;
     /**
      * 多级填充
      * @defaultValue []
@@ -143,9 +149,11 @@ interface LineChartPropertyInterface extends PropertyInterface {
     seriesConfig: LineChartSeriesConfigItem[];
 }
 declare class LineChartProperty extends Property implements LineChartPropertyInterface {
+    static readonly Rules: typeof LineChartPropertyRules;
     caption: string;
     isHideCaption: boolean;
     isShowCaptionTip: boolean;
+    labelPosition: 'top' | 'left';
     captionTip: string;
     captionSize: string;
     captionColor: string;
@@ -153,11 +161,10 @@ declare class LineChartProperty extends Property implements LineChartPropertyInt
     captionFontWeight: FONT_WEIGHT;
     isHide: boolean;
     template: string;
-    dataMode: LineChartDataMode;
     optionJson: string;
     optionConfig: 'datasource';
-    datasourceBind: TreeDataSourceBind;
-    filterItemDatasourceBind: TreeDataSourceBind;
+    datasourceBind: DataSourceBind;
+    filterItemDatasourceBind: DataSourceBind;
     multistageFilling: MultistageFillingItem[];
     defaultValue: string[];
     openMultistageFilling: boolean;
@@ -167,5 +174,5 @@ declare class LineChartProperty extends Property implements LineChartPropertyInt
     constructor(props?: Partial<LineChartProperty>);
 }
 export default LineChartProperty;
-export type { LineChartDataMode, LineChartSeriesConfigItem, LineChartPropertyInterface, };
-export { LineChartProperty, LineChartTemplate };
+export type { LineChartSeriesConfigItem, LineChartPropertyInterface };
+export { LineChartProperty, LineChartTemplate, LineChartPropertyRules };

package/dist/types/baseControls/PieChart/property.d.ts

@@ -1,6 +1,5 @@
-import { MultistageFillingItem, Property, PropertyInterface, TreeDataSourceBind } from '@byteluck-fe/model-driven-core';
+import { MultistageFillingItem, Property, PropertyInterface, DataSourceBind } from '@byteluck-fe/model-driven-core';
 import { FONT_WEIGHT } from '../../framework';
-type PieChartDataMode = 'static' | 'dynamic';
 type PieSeriesDataConfig = {
     nameField?: string;
     valueField?: string;
@@ -24,6 +23,12 @@ interface PieChartPropertyInterface extends PropertyInterface {
      * @public
      */
     isShowCaptionTip: boolean;
+    /**
+     * 标题布局；取值：top：上方；left：左侧；
+     * @defaultValue 'top'
+     * @public
+     */
+    labelPosition: 'top' | 'left';
     /**
      * 气泡提示语
      * @defaultValue ''
@@ -66,12 +71,6 @@ interface PieChartPropertyInterface extends PropertyInterface {
      * @public
      */
     template: string;
-    /**
-     * 数据模式；取值：static：静态数据；dynamic：动态数据源；
-     * @defaultValue 'static'
-     * @public
-     */
-    dataMode: PieChartDataMode;
     /**
      * 图表 option JSON
      * @defaultValue '{}'
@@ -86,16 +85,16 @@ interface PieChartPropertyInterface extends PropertyInterface {
     optionConfig: 'datasource';
     /**
      * 数据源绑定
-     * @defaultValue new TreeDataSourceBind({ attributes: PieChartControl.controlCustomAttributes })
+     * @defaultValue new DataSourceBind()
      * @public
      */
-    datasourceBind: TreeDataSourceBind;
+    datasourceBind: DataSourceBind;
     /**
      * 筛选项数据源绑定
-     * @defaultValue new TreeDataSourceBind({ attributes: PieChartControl.controlCustomAttributes })
+     * @defaultValue new DataSourceBind()
      * @public
      */
-    filterItemDatasourceBind: TreeDataSourceBind;
+    filterItemDatasourceBind: DataSourceBind;
     /**
      * 多级填充
      * @defaultValue []
@@ -125,6 +124,7 @@ declare class PieChartProperty extends Property implements PieChartPropertyInter
     caption: string;
     isHideCaption: boolean;
     isShowCaptionTip: boolean;
+    labelPosition: 'top' | 'left';
     captionTip: string;
     captionSize: string;
     captionColor: string;
@@ -132,11 +132,10 @@ declare class PieChartProperty extends Property implements PieChartPropertyInter
     captionFontWeight: FONT_WEIGHT;
     isHide: boolean;
     template: string;
-    dataMode: PieChartDataMode;
     optionJson: string;
     optionConfig: 'datasource';
-    datasourceBind: TreeDataSourceBind;
-    filterItemDatasourceBind: TreeDataSourceBind;
+    datasourceBind: DataSourceBind;
+    filterItemDatasourceBind: DataSourceBind;
     multistageFilling: MultistageFillingItem[];
     defaultValue: string[];
     openMultistageFilling: boolean;
@@ -144,5 +143,5 @@ declare class PieChartProperty extends Property implements PieChartPropertyInter
     constructor(props?: Partial<PieChartProperty>);
 }
 export default PieChartProperty;
-export type { PieChartDataMode, PieChartPropertyInterface, PieSeriesDataConfig, };
+export type { PieChartPropertyInterface, PieSeriesDataConfig };
 export { PieChartProperty };

package/dist/types/baseControls/utils.d.ts

@@ -1,2 +1,11 @@
 import { RuleItem } from 'async-validator';
+type ChartAxisKey = 'xAxis' | 'yAxis';
+interface ChartOptionProps {
+    optionJson: string;
+}
+export declare function isBlankChartField(value: unknown): boolean;
+export declare function isCategoryChartAxis(optionJson: string, axisKey: ChartAxisKey): boolean;
+export declare function createChartAxisFieldRule(props: ChartOptionProps, axisKey: ChartAxisKey, message: string): RuleItem;
+export declare function createChartSeriesConfigRule(message: string): RuleItem;
 export declare function createFillBindRules(): Record<string, RuleItem>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteluck-fe/model-driven-controls",
-  "version": "7.0.0-props.102",
+  "version": "7.0.0-props.104",
   "description": "> TODO: description",
   "author": "郝晨光 <2293885211@qq.com>",
   "homepage": "",
@@ -31,5 +31,5 @@
     "@byteluck-fe/model-driven-shared": "7.0.0-props.101",
     "async-validator": "3.5.1"
   },
-  "gitHead": "e3215fe4f9d14e37be72eb9ea2e85e5a969595ce"
+  "gitHead": "96c6724eec770458f3536c12017e108e231a15fd"
 }