@fmdevui/fm-dev 1.0.115 → 1.0.117

package/lib/core/index.d.ts

@@ -10,5 +10,6 @@ export * from './auth';
 export * from './hook/dateTimeShortCust';
 export * from './hook/useVxeTableOptionsHook';
 export * from './hook/useChart';
+export * from './plugins';
 export * from './utils/cityparess';
 export * from './types';

package/lib/core/plugins/index.d.ts

@@ -0,0 +1 @@
+export * from './echarts';

package/lib/core/ui/components/fmHBarChart/index.vue.d.ts

@@ -1,10 +1,123 @@
-import { BarChartProps, BarDataItem, LegendPosition } from '../../../types/chart';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
-declare const _default: DefineComponent<BarChartProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<BarChartProps> & Readonly<{}>, {
-    data: number[] | BarDataItem[];
-    height: string;
+import { PropType, DefineComponent, ExtractPropTypes, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+declare const _default: DefineComponent<ExtractPropTypes<{
+    height: {
+        type: NumberConstructor;
+        default: () => string;
+    };
+    loading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    colors: {
+        type: PropType<string[]>;
+        default: () => string[];
+    };
+    data: {
+        type: PropType<number[]>;
+        default: () => number[];
+    };
+    xAxisData: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+    barWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    stack: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLabel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showSplitLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showTooltip: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showLegend: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    legendPosition: {
+        type: PropType<"top" | "bottom" | "left" | "right">;
+        default: string;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
+    height: {
+        type: NumberConstructor;
+        default: () => string;
+    };
+    loading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    colors: {
+        type: PropType<string[]>;
+        default: () => string[];
+    };
+    data: {
+        type: PropType<number[]>;
+        default: () => number[];
+    };
+    xAxisData: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+    barWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    stack: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLabel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showSplitLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showTooltip: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showLegend: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    legendPosition: {
+        type: PropType<"top" | "bottom" | "left" | "right">;
+        default: string;
+    };
+}>> & Readonly<{}>, {
+    data: number[];
+    height: number;
     xAxisData: string[];
-    barWidth: string | number;
+    barWidth: string;
     stack: boolean;
     loading: boolean;
     isEmpty: boolean;
@@ -14,8 +127,8 @@ declare const _default: DefineComponent<BarChartProps, {}, {}, {}, {}, Component
     showSplitLine: boolean;
     showTooltip: boolean;
     showLegend: boolean;
-    legendPosition: LegendPosition;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {
+    legendPosition: "left" | "right" | "bottom" | "top";
+}, {}, {}, {}, string, ComponentProvideOptions, true, {
     chartRef: HTMLDivElement;
 }, HTMLDivElement>;
 export default _default;

package/lib/core/ui/components/index.d.ts

@@ -4,7 +4,6 @@ import { TreeKey } from 'element-plus';
 import { TQueryConditionProps } from './querycondition/type';
 import { FmSelectTableProps } from './selecttable/type';
 import { FmButtonSelfProps } from './fmbutton/type';
-import { BarChartProps, BarDataItem, LegendPosition } from 'fm-dev';
 export * from './selecttable/type';
 export * from './selecttable/ClickOutside';
 export * from './fmbutton/type';
@@ -2330,11 +2329,125 @@ declare const FmAddressParsing: DefineComponent<ExtractPropTypes<{
     fcity: string;
     fcounty: string;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
-declare const FmHBarChart: DefineComponent<BarChartProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< BarChartProps> & Readonly<{}>, {
-    data: number[] | BarDataItem[];
-    height: string;
+declare const FmHBarChart: DefineComponent<ExtractPropTypes<{
+    height: {
+        type: NumberConstructor;
+        default: () => string;
+    };
+    loading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    colors: {
+        type: PropType<string[]>;
+        default: () => string[];
+    };
+    data: {
+        type: PropType<number[]>;
+        default: () => number[];
+    };
+    xAxisData: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+    barWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    stack: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLabel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showSplitLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showTooltip: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showLegend: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    legendPosition: {
+        type: PropType<"top" | "bottom" | "left" | "right">;
+        default: string;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
+    height: {
+        type: NumberConstructor;
+        default: () => string;
+    };
+    loading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    colors: {
+        type: PropType<string[]>;
+        default: () => string[];
+    };
+    data: {
+        type: PropType<number[]>;
+        default: () => number[];
+    };
+    xAxisData: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+    barWidth: {
+        type: StringConstructor;
+        default: string;
+    };
+    stack: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLabel: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showAxisLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showSplitLine: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showTooltip: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    showLegend: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    legendPosition: {
+        type: PropType<"top" | "bottom" | "left" | "right">;
+        default: string;
+    };
+}>> & Readonly<{}>, {
+    data: number[];
+    height: number;
     xAxisData: string[];
-    barWidth: string | number;
+    barWidth: string;
     stack: boolean;
     loading: boolean;
     isEmpty: boolean;
@@ -2344,8 +2457,8 @@ declare const FmHBarChart: DefineComponent<BarChartProps, {}, {}, {}, {}, Compon
     showSplitLine: boolean;
     showTooltip: boolean;
     showLegend: boolean;
-    legendPosition: LegendPosition;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {
+    legendPosition: "left" | "right" | "bottom" | "top";
+}, {}, {}, {}, string, ComponentProvideOptions, true, {
     chartRef: HTMLDivElement;
 }, HTMLDivElement>;
 export { FmTransfer, FmNoticeBar, FmDragImg, Fmselect, FmAutocomplete, Fminputdropdown, Fminputtable, FmTree, Fmdatepicker, FmQueryCondition, FmMoreChoose, FmRenderComp, FmSelectTable, FmRenderCol, FmButton, FmAddressParsing, FmHBarChart, elSvg };

package/lib/index.js

@@ -43,6 +43,8 @@ var index$h = require('./packages/core/auth/index.js');
 var dateTimeShortCust = require('./packages/core/hook/dateTimeShortCust.js');
 var useVxeTableOptionsHook = require('./packages/core/hook/useVxeTableOptionsHook.js');
 var useChart = require('./packages/core/hook/useChart.js');
+var core = require('./node_modules/.pnpm/echarts@6.0.0/node_modules/echarts/core.js');
+var echarts = require('./packages/core/plugins/echarts.js');
 var index$i = require('./packages/core/utils/cityparess/index.js');
 
 const install = defaults.default.install;
@@ -176,5 +178,7 @@ exports.useVxeTable = useVxeTableOptionsHook.useVxeTable;
 exports.useChart = useChart.useChart;
 exports.useChartComponent = useChart.useChartComponent;
 exports.useChartOps = useChart.useChartOps;
+exports.echarts = core;
+exports.graphic = echarts.graphic;
 exports.addressparsing = index$i.addressparsing;
 exports.install = install;

package/lib/packages/core/hook/useChart.js

@@ -74,6 +74,8 @@ function useChart(options = {}) {
   let menuOpenStopHandle = null;
   let menuTypeStopHandle = null;
   const setupMenuWatchers = () => {
+    vue.nextTick(requestAnimationResize);
+    setTimeout(() => multiDelayResize(MENU_RESIZE_DELAYS), 0);
   };
   const cleanupMenuWatchers = () => {
     menuOpenStopHandle?.();

package/lib/packages/core/index.js

@@ -12,6 +12,7 @@ var index$g = require('./auth/index.js');
 var dateTimeShortCust = require('./hook/dateTimeShortCust.js');
 var useVxeTableOptionsHook = require('./hook/useVxeTableOptionsHook.js');
 var useChart = require('./hook/useChart.js');
+require('./plugins/index.js');
 var index$h = require('./utils/cityparess/index.js');
 require('./types/index.js');
 var index$1 = require('./ui/components/svgIcon/index.js');
@@ -40,6 +41,8 @@ var gloabdata = require('./utils/comm/gloabdata.js');
 var commonFunction = require('./utils/comm/commonFunction.js');
 var index$e = require('./utils/comm/index.js');
 var index$f = require('./utils/const/index.js');
+var core = require('../../node_modules/.pnpm/echarts@6.0.0/node_modules/echarts/core.js');
+var echarts = require('./plugins/echarts.js');
 
 
 
@@ -169,3 +172,5 @@ exports.getAppItemText = gloabdata.getAppItemText;
 exports.commonFunction = commonFunction.default;
 exports.commonFunctionObj = index$e.commonFunctionObj;
 exports.PUB = index$f.PUB;
+exports.echarts = core;
+exports.graphic = echarts.graphic;

package/lib/packages/core/plugins/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var echarts = require('./echarts.js');
+var core = require('../../../node_modules/.pnpm/echarts@6.0.0/node_modules/echarts/core.js');
+
+
+
+exports.graphic = echarts.graphic;
+exports.echarts = core;

package/lib/packages/core/ui/components/fmHBarChart/index.vue2.js

@@ -10,21 +10,51 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "FmHBarChart" },
   __name: "index",
   props: {
-    data: { default: () => [0, 0, 0, 0, 0, 0, 0] },
-    xAxisData: { default: () => [] },
-    barWidth: { default: "36%" },
-    stack: { type: Boolean, default: false },
-    borderRadius: {},
-    height: { default: useChart.useChartOps().chartHeight },
-    loading: { type: Boolean, default: false },
-    isEmpty: { type: Boolean, default: false },
-    colors: { default: () => useChart.useChartOps().colors },
+    // 基础配置
+    height: {
+      type: Number,
+      default: () => useChart.useChartOps().chartHeight
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    isEmpty: {
+      type: Boolean,
+      default: false
+    },
+    colors: {
+      type: Array,
+      default: () => useChart.useChartOps().colors
+    },
+    // 数据配置
+    data: {
+      type: Array,
+      default: () => [0, 0, 0, 0, 0, 0, 0]
+    },
+    xAxisData: {
+      type: Array,
+      default: () => []
+    },
+    barWidth: {
+      type: String,
+      default: "36%"
+    },
+    stack: {
+      type: Boolean,
+      default: false
+    },
+    // 轴线显示配置
     showAxisLabel: { type: Boolean, default: true },
     showAxisLine: { type: Boolean, default: true },
     showSplitLine: { type: Boolean, default: true },
+    // 交互配置
     showTooltip: { type: Boolean, default: true },
     showLegend: { type: Boolean, default: false },
-    legendPosition: { default: "bottom" }
+    legendPosition: {
+      type: String,
+      default: "bottom"
+    }
   },
   setup(__props) {
     const props = __props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmdevui/fm-dev",
-  "version": "1.0.115",
+  "version": "1.0.117",
   "description": "Page level components developed based on Element Plus.",
   "author": "fmdevui",
   "keywords": [