From 8727d91415ef5786555b37542647f5482417880a Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Mon, 29 Sep 2025 09:12:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=92=8CCRON=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在设备详情页新增权限访问控制，防止无权限用户访问产品详情
- 引入并集成 shiyzhangcron 组件库实现 CRON 表达式可视化配置
- 新增 CronPickerModal 弹窗组件用于选择和确认 CRON 表达式
- 更新 package.json 添加 shiyzhangcron 依赖
- 调整按钮权限控制逻辑以适配新的权限校验方式
- 优化部分页面样式与交互逻辑
---
 apps/web-antd/package.json                    |  1 +
 .../src/components/CronPickerModal/index.vue  | 65 +++++++++++++++++++
 apps/web-antd/src/views/demo/test/detail.vue  | 51 ++++++++++++++-
 .../src/views/device/device/detail/index.vue  |  7 ++
 .../src/views/device/device/index.vue         |  5 +-
 .../detail/components/DeviceAccess.vue        |  2 +-
 apps/web-antd/types/shiyzhangcron.d.ts        |  2 +
 .../pepicons-pencil--bulletin-notice.svg      |  1 +
 packages/icons/src/svg/index.ts               |  4 ++
 9 files changed, 131 insertions(+), 7 deletions(-)
 create mode 100644 apps/web-antd/src/components/CronPickerModal/index.vue
 create mode 100644 apps/web-antd/types/shiyzhangcron.d.ts
 create mode 100644 packages/icons/src/svg/icons/pepicons-pencil--bulletin-notice.svg

diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
index 110d9bc..9139186 100644
--- a/apps/web-antd/package.json
+++ b/apps/web-antd/package.json
@@ -53,6 +53,7 @@
     "monaco-editor": "^0.52.2",
     "pinia": "catalog:",
     "rxjs": "^7.8.2",
+    "shiyzhangcron": "^0.1.5",
     "tinymce": "^7.3.0",
     "unplugin-vue-components": "^0.27.3",
     "vite-plugin-monaco-editor": "^1.1.0",
diff --git a/apps/web-antd/src/components/CronPickerModal/index.vue b/apps/web-antd/src/components/CronPickerModal/index.vue
new file mode 100644
index 0000000..68b30e1
--- /dev/null
+++ b/apps/web-antd/src/components/CronPickerModal/index.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
+import { Modal } from 'ant-design-vue';
+import { EasyCronInner } from 'shiyzhangcron';
+
+import 'shiyzhangcron/dist/style.css';
+
+interface Props {
+  visible: boolean;
+  value: string;
+  title?: string;
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits(['update:visible', 'confirm', 'cancel']);
+
+const innerValue = ref(props.value);
+
+watch(
+  () => props.value,
+  (v) => {
+    innerValue.value = v;
+  },
+);
+
+const isVisible = computed({
+  get: () => props.visible,
+  set: (value) => emit('update:visible', value),
+});
+
+const onCancel = () => {
+  emit('update:visible', false);
+  emit('cancel');
+};
+
+const onOk = () => {
+  emit('confirm', innerValue.value);
+  emit('update:visible', false);
+};
+
+const onCronChange = (v: string) => {
+  innerValue.value = v;
+};
+</script>
+
+<template>
+  <Modal
+    :open="isVisible"
+    :title="title || 'Cron 配置'"
+    width="860px"
+    :mask-closable="false"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <EasyCronInner
+      v-model:value="innerValue"
+      input-area="true"
+      @change="onCronChange"
+    />
+    <div class="mt-4 flex items-center justify-between">
+      <div>当前选择: {{ innerValue }}</div>
+    </div>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/demo/test/detail.vue b/apps/web-antd/src/views/demo/test/detail.vue
index e4221e6..a124a00 100644
--- a/apps/web-antd/src/views/demo/test/detail.vue
+++ b/apps/web-antd/src/views/demo/test/detail.vue
@@ -1,10 +1,57 @@
 <script setup lang="ts">
+import { defineAsyncComponent, ref } from 'vue';
 
+import 'shiyzhangcron/dist/style.css';
+
+const CronPickerModal = defineAsyncComponent(
+  () => import('../../../components/CronPickerModal/index.vue'),
+);
+
+const easyCronInnerValue = ref('* * * * * ? *');
+
+const cronModalVisible = ref(false);
+
+const openCronModal = () => {
+  cronModalVisible.value = true;
+};
+
+const onCronConfirm = (val: string) => {
+  easyCronInnerValue.value = val;
+  cronModalVisible.value = false;
+};
+
+const onCronCancel = () => {
+  cronModalVisible.value = false;
+};
 </script>
 
 <template>
   <div class="p-4">
-    <h1 class="text-2xl font-bold mb-4">Test Detail Page</h1>
-    <p>This is a placeholder for the test detail page.</p>
+    <h1 class="mb-4 text-2xl font-bold">Test Detail Page</h1>
+
+    <div class="flex items-center gap-2" style="max-width: 640px">
+      <input
+        :value="easyCronInnerValue"
+        type="text"
+        placeholder="请输入 CRON 表达式"
+        class="flex-1 rounded border border-gray-300 px-3 py-1"
+      />
+      <button
+        class="rounded bg-blue-600 px-3 py-1 text-white"
+        @click="openCronModal"
+      >
+        配置
+      </button>
+    </div>
+
+    <p class="mt-4">当前cron值为: {{ easyCronInnerValue }}</p>
+
+    <CronPickerModal
+      v-if="cronModalVisible"
+      :visible="cronModalVisible"
+      :value="easyCronInnerValue"
+      @confirm="onCronConfirm"
+      @cancel="onCronCancel"
+    />
   </div>
 </template>
diff --git a/apps/web-antd/src/views/device/device/detail/index.vue b/apps/web-antd/src/views/device/device/detail/index.vue
index 6463b87..65d3dbf 100644
--- a/apps/web-antd/src/views/device/device/detail/index.vue
+++ b/apps/web-antd/src/views/device/device/detail/index.vue
@@ -2,6 +2,7 @@
 import { computed, defineAsyncComponent, onMounted, onUnmounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
+import { useAccess } from '@vben/access';
 import { Page } from '@vben/common-ui';
 
 import { ArrowLeftOutlined } from '@ant-design/icons-vue';
@@ -12,6 +13,8 @@ import { deviceStateOptions } from '#/constants/dicts';
 import { useDeviceStore } from '#/store/device';
 import { getWebSocket } from '#/utils/websocket';
 
+const { hasAccessByCodes } = useAccess();
+
 const BasicInfo = defineAsyncComponent(
   () => import('./components/BasicInfo.vue'),
 );
@@ -106,6 +109,10 @@ const handleTabChange = (key: string) => {
 };
 
 const handleProductClick = () => {
+  if (!hasAccessByCodes(['device:product:query'])) {
+    message.warning('暂无权限');
+    return;
+  }
   router.push(`/device/product/detail/${currentDevice.value.productId}`);
 };
 
diff --git a/apps/web-antd/src/views/device/device/index.vue b/apps/web-antd/src/views/device/device/index.vue
index 84b9509..9b821c4 100644
--- a/apps/web-antd/src/views/device/device/index.vue
+++ b/apps/web-antd/src/views/device/device/index.vue
@@ -349,10 +349,7 @@ const [DeviceDrawer, drawerApi] = useVbenDrawer({
               </template>
               <template v-else-if="column.key === 'action'">
                 <Space>
-                  <ghost-button
-                    v-access:code="['device:device:view']"
-                    @click.stop="handleView(record)"
-                  >
+                  <ghost-button @click.stop="handleView(record)">
                     详情
                   </ghost-button>
                   <ghost-button
diff --git a/apps/web-antd/src/views/device/product/detail/components/DeviceAccess.vue b/apps/web-antd/src/views/device/product/detail/components/DeviceAccess.vue
index fedc1f9..c1c327b 100644
--- a/apps/web-antd/src/views/device/product/detail/components/DeviceAccess.vue
+++ b/apps/web-antd/src/views/device/product/detail/components/DeviceAccess.vue
@@ -211,7 +211,7 @@ onMounted(() => {
     <div v-if="!accessInfo.id" class="empty-state">
       <Empty>
         <template #description>
-          <span v-if="hasAccessByCodes('device:product:edit')">
+          <span v-if="hasAccessByCodes(['device:product:edit'])">
             请先
             <a-button type="link" @click="handleSelectAccess">选择</a-button>
             设备接入网关，用以提供设备接入能力
diff --git a/apps/web-antd/types/shiyzhangcron.d.ts b/apps/web-antd/types/shiyzhangcron.d.ts
new file mode 100644
index 0000000..f39f93f
--- /dev/null
+++ b/apps/web-antd/types/shiyzhangcron.d.ts
@@ -0,0 +1,2 @@
+// types/shiyzhangcron.d.ts
+declare module 'shiyzhangcron';
diff --git a/packages/icons/src/svg/icons/pepicons-pencil--bulletin-notice.svg b/packages/icons/src/svg/icons/pepicons-pencil--bulletin-notice.svg
new file mode 100644
index 0000000..929f96d
--- /dev/null
+++ b/packages/icons/src/svg/icons/pepicons-pencil--bulletin-notice.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><rect width="20" height="20" fill="none"/><g fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"><path d="M18 6.923H2v11h16zm-16-1a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h16a1 1 0 0 0 1-1v-11a1 1 0 0 0-1-1z"/><path d="M6 9.423a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5m-1 3a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5m1 3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5m5.768-13.025a2.5 2.5 0 0 0-3.536 0L4.354 6.277a.5.5 0 1 1-.708-.708l3.88-3.878a3.5 3.5 0 0 1 4.949 0l3.879 3.879a.5.5 0 1 1-.708.707z"/></g></svg>
\ No newline at end of file
diff --git a/packages/icons/src/svg/index.ts b/packages/icons/src/svg/index.ts
index b9dd516..62cce99 100644
--- a/packages/icons/src/svg/index.ts
+++ b/packages/icons/src/svg/index.ts
@@ -63,6 +63,9 @@ const SvgMaterialSymbolsDashboardOutlineIcon = createIconifyIcon(
 const SvgAntDesignDashboardOutlinedIcon = createIconifyIcon(
   'svg:ant-design--dashboard-outlined',
 );
+const SvgPepiconsPencilBulletinNoticeIcon = createIconifyIcon(
+  'svg:pepicons-pencil--bulletin-notice',
+);
 
 export {
   SvgAntDesignDashboardOutlinedIcon,
@@ -87,6 +90,7 @@ export {
   SvgMaterialSymbolsDashboardOutlineIcon,
   SvgMaxKeyIcon,
   SvgMdiAccountOnlineOutlineIcon,
+  SvgPepiconsPencilBulletinNoticeIcon,
   SvgProiconsDocumentIcon,
   SvgQQIcon,
   SvgRiAlarmWarningLineIcon,