From a4f87604150de55b3b2877eaa1a157d8bd650135 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 7 Jun 2026 01:46:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mes):=20=E7=A7=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E5=86=9C=E5=8E=86=E6=8F=92=E4=BB=B6=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除节假日页面未使用的 dayjs-plugin-lunar 扩展 - 统一使用 tyme4ts 计算农历、节日和节气信息 - 清理 package.json 和 pnpm-lock.yaml 中的冗余依赖 --- package.json | 1 - pnpm-lock.yaml | 14 -------------- src/views/mes/cal/holiday/index.vue | 2 -- 3 files changed, 17 deletions(-) diff --git a/package.json b/package.json index c78fc4456..77dc52c2c 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "cropperjs": "^2.1.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.20", - "dayjs-plugin-lunar": "^1.4.1", "dhtmlx-gantt": "^9.1.1", "diagram-js": "^15.14.0", "driver.js": "^1.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 14012d4fc..9da2080f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,9 +65,6 @@ importers: dayjs: specifier: ^1.11.20 version: 1.11.20 - dayjs-plugin-lunar: - specifier: ^1.4.1 - version: 1.4.1(dayjs@1.11.20)(tyme4ts@1.4.6) dhtmlx-gantt: specifier: ^9.1.1 version: 9.1.4 @@ -3493,12 +3490,6 @@ packages: resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==} engines: {node: '>=0.12'} - dayjs-plugin-lunar@1.4.1: - resolution: {integrity: sha512-nHKJMKoVAGt/Wp6x3xH8GrjWhB25YBYd6iYTCfLkCm4GAS6q3jvfHpLwRnIX8bjHgl8sPlTPiLFcylcEaEnj8Q==} - peerDependencies: - dayjs: ^1.0.0 - tyme4ts: ^1.0.0 - dayjs@1.11.20: resolution: {integrity: sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==} @@ -9430,11 +9421,6 @@ snapshots: es5-ext: 0.10.64 type: 2.7.3 - dayjs-plugin-lunar@1.4.1(dayjs@1.11.20)(tyme4ts@1.4.6): - dependencies: - dayjs: 1.11.20 - tyme4ts: 1.4.6 - dayjs@1.11.20: {} debug@4.4.3: diff --git a/src/views/mes/cal/holiday/index.vue b/src/views/mes/cal/holiday/index.vue index 84dbbf736..121e936b2 100644 --- a/src/views/mes/cal/holiday/index.vue +++ b/src/views/mes/cal/holiday/index.vue @@ -34,14 +34,12 @@ import { CalHolidayApi, CalHolidayVO } from '@/api/mes/cal/holiday' import { formatDate } from '@/utils/formatTime' import dayjs from 'dayjs' import 'dayjs/locale/zh-cn' -import PluginLunar from 'dayjs-plugin-lunar' import { SolarDay } from 'tyme4ts' import HolidayForm from './HolidayForm.vue' import { checkPermi } from '@/utils/permission' import { HolidayType } from '@/views/mes/utils/constants' dayjs.locale('zh-cn') -dayjs.extend(PluginLunar) defineOptions({ name: 'MesCalHoliday' })