mrxy-yk 1.2.3 → 1.2.4-alpha.2

package/dist/config/index.d.ts

@@ -22,3 +22,10 @@ export interface EmptyTypeInterface {
  * }
  */
 export declare const EmptyStatusExtendConfig: Record<Capitalize<string>, EmptyOption>;
+/**
+ * ECharts主题配置
+ * 配置的主题会和默认主题合并，如果需要覆盖请使用echarts.registerTheme方法注册主题
+ */
+export declare const EChartsThemeConfig: {
+    dark: Record<string, any>;
+};

package/dist/config/index.js

@@ -9,8 +9,12 @@ const AMapConfig = {
   mapSecret: null
 };
 const EmptyStatusExtendConfig = {};
+const EChartsThemeConfig = {
+  dark: null
+};
 export {
   AMapConfig,
+  EChartsThemeConfig,
   ElImagesGlobal,
   ElUploadGlobal,
   ElUploadImagesGlobal,

package/dist/element-plus/components/date-picker/index.js

@@ -28,7 +28,7 @@ class DatePickerType {
   }
   defaultDateStandardHandle(unit) {
     if (!this.props.defaultDate) return;
-    const value = dayjs().subtract(this.props.defaultDate - 1, unit).format("YYYY-MM-DD HH:mm:ss");
+    const value = dayjs().startOf(unit).subtract(this.props.defaultDate - 1, unit).format("YYYY-MM-DD HH:mm:ss");
     this.setModelValue(value);
   }
   // endregion

package/dist/element-plus/components/upload/select-file/SelectFile.d.ts

@@ -417,8 +417,8 @@ declare const __VLS_component: DefineComponent<__VLS_Props, {}, {}, {}, {}, Comp
     onChange?: (...args: any[]) => any;
     onError?: (...args: any[]) => any;
 }>, {
-    maxSize: number;
     accept: string;
+    maxSize: number;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {
     uploadRef: {
         $: ComponentInternalInstance;

package/dist/element-plus/components/upload/upload-files/UploadFiles.d.ts

@@ -436,10 +436,10 @@ declare const __VLS_component: DefineComponent<__VLS_Props, {
     width: string;
     height: string;
     drag: boolean;
-    maxSize: number;
     isJoin: boolean;
     uploadClass: string;
     accept: string;
+    maxSize: number;
     limit: number;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     uploadRef: {

package/dist/element-plus/components/upload/upload-images/UploadImages.d.ts

@@ -434,10 +434,10 @@ declare const __VLS_component: DefineComponent<__VLS_Props, {
 }>, {
     width: string;
     height: string;
-    maxSize: number;
     isJoin: boolean;
     uploadClass: string;
     accept: string;
+    maxSize: number;
     limit: number;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     uploadRef: {

package/dist/utils/echarts/modules/coordinate/basic.js

@@ -49,7 +49,8 @@ class EcBasicOption {
   // 获取EChartOption配置
   valueOf() {
     const option = this.currentOption;
-    const series = option.series.map((item) => {
+    const optionSeries = option.series;
+    const series = optionSeries.map((item) => {
       return item instanceof EcBasicSeries ? item.valueOf() : item;
     });
     const defaultGrid = ObjectUtil.copy(this.defaultGrid);

package/dist/utils/echarts/modules/type.d.ts

@@ -1,8 +1,8 @@
 import { BarSeriesOption, EChartsOption, LineSeriesOption, SeriesOption } from 'echarts';
 import { EcBasicSeries } from '.';
 // region 根配置
-export type EcOptionBasicOption = EChartsOption & {
-  series?: EcSeriesBasicOption[]
+export type EcOptionBasicOption = Omit<EChartsOption, 'series'> & {
+  series?: EcSeriesBasicOption | EcSeriesBasicOption[]
 }
 export type EcSeriesBasicOption<T = SeriesOption> = EcBasicSeries | T
 // endregion

package/dist/utils/echarts/themes/dark.js

@@ -1,3 +1,5 @@
+import { EChartsThemeConfig } from "../../../config/index.js";
+import { ObjectUtil } from "../../prototype/lib/ObjectUtil.js";
 const contrastColor = "#ededf3";
 const backgroundColor = "rgba(0, 0, 0, 0)";
 const axisCommon = function() {
@@ -156,8 +158,16 @@ const theme = {
   logAxis: axisCommon(),
   valueAxis: axisCommon(),
   categoryAxis: axisCommon(),
+  bar: {
+    label: {
+      color: contrastColor
+    }
+  },
   line: {
-    symbol: "circle"
+    symbol: "emptyCircle",
+    label: {
+      color: contrastColor
+    }
   },
   graph: {
     color: colorPalette
@@ -177,6 +187,9 @@ const theme = {
   }
 };
 theme.categoryAxis.splitLine.show = false;
+if (EChartsThemeConfig.dark) {
+  ObjectUtil.assignDeep(theme, EChartsThemeConfig.dark);
+}
 export {
   theme as default
 };

package/dist/utils/echarts/utils/assignOption.js

@@ -18,7 +18,8 @@ function assignEcOptionBasicOption(target, source) {
       source.series = [series];
     }
     if (target.series) {
-      for (let i = 0, len = source.series.length; i < len; i++) {
+      const sourceSeries = source.series;
+      for (let i = 0, len = sourceSeries.length; i < len; i++) {
         const targetItem = target.series[i];
         const sourceItem = source.series[i];
         if (!targetItem || sourceItem instanceof EcBasicSeries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrxy-yk",
-  "version": "1.2.3",
+  "version": "1.2.4-alpha.2",
   "private": false,
   "type": "module",
   "description": "A collection of Vue 3 components and utilities",
@@ -83,12 +83,12 @@
   },
   "peerDependencies": {
     "element-plus": "^2.6.0",
-    "vue": "^3.5.0"
+    "vue": "^3.5.0",
+    "dayjs": "^1.11.0"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "1.0.1",
     "@element-plus/icons-vue": "2.3.2",
-    "dayjs": "1.11.19",
     "echarts": "6.0.0",
     "ezuikit-js": "8.2.4",
     "jszip": "3.10.1",

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "mrxy-yk",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "js-types-syntax": "typescript",
   "contributions": {
     "html": {