@fmdevui/fm-dev 1.0.115 → 1.0.117

package/es/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/es/core/plugins/index.d.ts

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

package/es/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/es/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/es/index.mjs

@@ -39,6 +39,9 @@ export { auth, authAll, auths, hAuth, hAuthAll, hAuths } from './packages/core/a
 export { useDateTimeShortCust } from './packages/core/hook/dateTimeShortCust.mjs';
 export { useVxeTable } from './packages/core/hook/useVxeTableOptionsHook.mjs';
 export { useChart, useChartComponent, useChartOps } from './packages/core/hook/useChart.mjs';
+import * as core from './node_modules/.pnpm/echarts@6.0.0/node_modules/echarts/core.mjs';
+export { core as echarts };
+export { graphic } from './packages/core/plugins/echarts.mjs';
 export { addressparsing } from './packages/core/utils/cityparess/index.mjs';
 
 const install = installer.install;

package/es/packages/core/hook/useChart.mjs

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

package/es/packages/core/index.mjs

@@ -10,6 +10,7 @@ export { auth, authAll, auths, hAuth, hAuthAll, hAuths } from './auth/index.mjs'
 export { useDateTimeShortCust } from './hook/dateTimeShortCust.mjs';
 export { useVxeTable } from './hook/useVxeTableOptionsHook.mjs';
 export { useChart, useChartComponent, useChartOps } from './hook/useChart.mjs';
+import './plugins/index.mjs';
 export { addressparsing } from './utils/cityparess/index.mjs';
 import './types/index.mjs';
 export { elSvg } from './ui/components/svgIcon/index.mjs';
@@ -38,3 +39,6 @@ export { AppItem, getAppItemData, getAppItemText } from './utils/comm/gloabdata.
 export { default as commonFunction } from './utils/comm/commonFunction.mjs';
 export { commonFunctionObj } from './utils/comm/index.mjs';
 export { PUB } from './utils/const/index.mjs';
+import * as core from '../../node_modules/.pnpm/echarts@6.0.0/node_modules/echarts/core.mjs';
+export { core as echarts };
+export { graphic } from './plugins/echarts.mjs';

package/es/packages/core/plugins/index.mjs

@@ -0,0 +1,3 @@
+export { graphic } from './echarts.mjs';
+import * as core from '../../../node_modules/.pnpm/echarts@6.0.0/node_modules/echarts/core.mjs';
+export { core as echarts };

package/es/packages/core/ui/components/fmHBarChart/index.vue2.mjs

@@ -6,21 +6,51 @@ var _sfc_main = /* @__PURE__ */ 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: useChartOps().chartHeight },
-    loading: { type: Boolean, default: false },
-    isEmpty: { type: Boolean, default: false },
-    colors: { default: () => useChartOps().colors },
+    // 基础配置
+    height: {
+      type: Number,
+      default: () => useChartOps().chartHeight
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    isEmpty: {
+      type: Boolean,
+      default: false
+    },
+    colors: {
+      type: Array,
+      default: () => 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/{lib/index.css → es/version.css}

@@ -1,4 +1,4 @@
-.drag_verify[data-v-9e8c9ed2]{background-color:#e8e8e8;overflow:hidden;position:relative;text-align:center}.drag_verify .dv_handler[data-v-9e8c9ed2]{cursor:move;left:0;position:absolute;top:0}.drag_verify .dv_handler i[data-v-9e8c9ed2]{color:#666;font-size:16px;padding-left:0}.drag_verify .dv_handler .el-icon-circle-check[data-v-9e8c9ed2]{color:#6c6;margin-top:9px}.drag_verify .dv_progress_bar[data-v-9e8c9ed2]{height:34px;position:absolute;width:0}.drag_verify .dv_text[data-v-9e8c9ed2]{background:-webkit-gradient(linear,left top,right top,color-stop(0,var(--textColor)),color-stop(.4,var(--textColor)),color-stop(.5,#fff),color-stop(.6,var(--textColor)),color-stop(1,var(--textColor)));-webkit-background-clip:text;color:transparent;position:absolute;top:0;-moz-user-select:none;-webkit-user-select:none;user-select:none;-o-user-select:none;-ms-user-select:none;-webkit-text-fill-color:transparent;-webkit-text-size-adjust:none;animation:slidetounlock 3s infinite}.drag_verify .dv_text[data-v-9e8c9ed2] *{-webkit-text-fill-color:var(--textColor)}.goFirst[data-v-9e8c9ed2]{left:0!important;transition:left .5s}.goOrigin[data-v-9e8c9ed2]{transition:transform .5s}.goKeep[data-v-9e8c9ed2]{transition:left .2s}.goFirst2[data-v-9e8c9ed2]{transition:width .5s;width:0!important}.drag-verify-container[data-v-9e8c9ed2]{border-radius:50%;line-height:0;position:relative}.move-bar[data-v-9e8c9ed2]{position:absolute;z-index:100}.clip-bar[data-v-9e8c9ed2]{background:hsla(0,0%,100%,.8);position:absolute}.refresh[data-v-9e8c9ed2]{cursor:pointer;font-size:20px;position:absolute;right:5px;top:5px;z-index:200}.tips[data-v-9e8c9ed2]{bottom:25px;font-size:12px;height:20px;line-height:20px;position:absolute;text-align:center;width:100%;z-index:200}.tips.success[data-v-9e8c9ed2]{background:hsla(0,0%,100%,.6);color:green}.tips.danger[data-v-9e8c9ed2]{background:rgba(0,0,0,.6);color:#ff0}.check-img[data-v-9e8c9ed2]{border-radius:50%;width:100%}
-
 .query-form[data-v-88872668]{z-index:9999}[data-v-88872668] .el-select-dropdown{.el-scrollbar>.el-scrollbar__bar{display:none!important}}.popper-class[data-v-88872668]{min-width:400px!important}[data-v-88872668] .popper-class :deep(.el-select-dropdown__wrap){max-height:600px!important}
+
+.drag_verify[data-v-9e8c9ed2]{background-color:#e8e8e8;overflow:hidden;position:relative;text-align:center}.drag_verify .dv_handler[data-v-9e8c9ed2]{cursor:move;left:0;position:absolute;top:0}.drag_verify .dv_handler i[data-v-9e8c9ed2]{color:#666;font-size:16px;padding-left:0}.drag_verify .dv_handler .el-icon-circle-check[data-v-9e8c9ed2]{color:#6c6;margin-top:9px}.drag_verify .dv_progress_bar[data-v-9e8c9ed2]{height:34px;position:absolute;width:0}.drag_verify .dv_text[data-v-9e8c9ed2]{background:-webkit-gradient(linear,left top,right top,color-stop(0,var(--textColor)),color-stop(.4,var(--textColor)),color-stop(.5,#fff),color-stop(.6,var(--textColor)),color-stop(1,var(--textColor)));-webkit-background-clip:text;color:transparent;position:absolute;top:0;-moz-user-select:none;-webkit-user-select:none;user-select:none;-o-user-select:none;-ms-user-select:none;-webkit-text-fill-color:transparent;-webkit-text-size-adjust:none;animation:slidetounlock 3s infinite}.drag_verify .dv_text[data-v-9e8c9ed2] *{-webkit-text-fill-color:var(--textColor)}.goFirst[data-v-9e8c9ed2]{left:0!important;transition:left .5s}.goOrigin[data-v-9e8c9ed2]{transition:transform .5s}.goKeep[data-v-9e8c9ed2]{transition:left .2s}.goFirst2[data-v-9e8c9ed2]{transition:width .5s;width:0!important}.drag-verify-container[data-v-9e8c9ed2]{border-radius:50%;line-height:0;position:relative}.move-bar[data-v-9e8c9ed2]{position:absolute;z-index:100}.clip-bar[data-v-9e8c9ed2]{background:hsla(0,0%,100%,.8);position:absolute}.refresh[data-v-9e8c9ed2]{cursor:pointer;font-size:20px;position:absolute;right:5px;top:5px;z-index:200}.tips[data-v-9e8c9ed2]{bottom:25px;font-size:12px;height:20px;line-height:20px;position:absolute;text-align:center;width:100%;z-index:200}.tips.success[data-v-9e8c9ed2]{background:hsla(0,0%,100%,.6);color:green}.tips.danger[data-v-9e8c9ed2]{background:rgba(0,0,0,.6);color:#ff0}.check-img[data-v-9e8c9ed2]{border-radius:50%;width:100%}
 .el-select-dropdown__wrap[max-height],.popper-class .el-select-dropdown__wrap{max-height:450px!important}.el-table .selected-row,.popper-class .selected-row{background-color:var(--el-color-primary-light-9)!important;border-left:3px solid var(--el-color-primary)!important}.el-table .selected-row:hover,.popper-class .selected-row:hover{background-color:var(--el-color-primary-light-8)!important}.el-table .selected-row td,.popper-class .selected-row td{background-color:var(--el-color-primary-light-9)!important}.el-table .selected-row:hover td,.popper-class .selected-row:hover td{background-color:var(--el-color-primary-light-8)!important}