Merge branch 'main_dev' into ft

@@ -5,6 +5,13 @@ export enum DataActionModeEnum {
   DELETE = 'DELETE',
   DELETE = 'DELETE',
 }
 }
 
 
+export enum DataActionModeNameEnum {
+  CREATE = '创建',
+  READ = '查看',
+  UPDATE = '编辑',
+  DELETE = '删除',
+}
+
 export enum TimeUnitEnum {
 export enum TimeUnitEnum {
   SECOND = 'SECOND',
   SECOND = 'SECOND',
   MINUTE = 'MINUTE',
   MINUTE = 'MINUTE',

@@ -3,9 +3,13 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { FieldsEnum, schemas, ViewTypeEnum } from './config';
   import { FieldsEnum, schemas, ViewTypeEnum } from './config';
   import { DataBoardRecord } from '/@/api/dataBoard/model';
   import { DataBoardRecord } from '/@/api/dataBoard/model';
-  import { Alert } from 'ant-design-vue';
+  import { Alert, Button, Tooltip } from 'ant-design-vue';
   import { ref, unref } from 'vue';
   import { ref, unref } from 'vue';
   import { nextTick } from 'vue';
   import { nextTick } from 'vue';
+  import { ModalParamsType } from '/#/utils';
+  import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { computed } from 'vue';
 
 
   const props = defineProps<{
   const props = defineProps<{
     shareApi?: (...args: any[]) => Promise<any>;
     shareApi?: (...args: any[]) => Promise<any>;
@@ -13,15 +17,20 @@
 
 
   const loading = ref(false);
   const loading = ref(false);
   const record = ref<DataBoardRecord>({} as unknown as DataBoardRecord);
   const record = ref<DataBoardRecord>({} as unknown as DataBoardRecord);
+  const link = ref('');
 
 
-  const [register, { closeModal }] = useModalInner(async (data: DataBoardRecord) => {
-    record.value = data;
-    await nextTick();
-    setFieldsValue({
-      [FieldsEnum.IS_SHARE]: data.viewType === ViewTypeEnum.PUBLIC_VIEW,
-      [FieldsEnum.ACCESS_CREDENTIALS]: data.accessCredentials,
-    });
-  });
+  const [register, { closeModal }] = useModalInner(
+    async (data: ModalParamsType<DataBoardRecord>) => {
+      const { record: value, href } = data;
+      record.value = value;
+      link.value = href;
+      await nextTick();
+      setFieldsValue({
+        [FieldsEnum.IS_SHARE]: value.viewType === ViewTypeEnum.PUBLIC_VIEW,
+        [FieldsEnum.ACCESS_CREDENTIALS]: value.accessCredentials,
+      });
+    }
+  );
 
 
   const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
   const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
     schemas,
     schemas,
@@ -32,6 +41,10 @@
 
 
   const emit = defineEmits(['register', 'success']);
   const emit = defineEmits(['register', 'success']);
 
 
+  const handleOpenLink = () => {
+    window.open(unref(link));
+  };
+
   const handleSubmit = async () => {
   const handleSubmit = async () => {
     try {
     try {
       loading.value = true;
       loading.value = true;
@@ -44,6 +57,19 @@
       loading.value = false;
       loading.value = false;
     }
     }
   };
   };
+
+  const isPublicState = computed(() => {
+    return unref(record).viewType === ViewTypeEnum.PUBLIC_VIEW;
+  });
+
+  const { clipboardRef, isSuccessRef } = useCopyToClipboard();
+  const { createMessage } = useMessage();
+  const handleCopy = () => {
+    clipboardRef.value = unref(link);
+    if (unref(isSuccessRef)) {
+      createMessage.success('复制成功~');
+    }
+  };
 </script>
 </script>
 
 
 <template>
 <template>
@@ -54,5 +80,27 @@
       message="私有视图只有项目成员可以浏览,公开视图拥有一个公开的 URL,任何人无需登录即可浏览."
       message="私有视图只有项目成员可以浏览,公开视图拥有一个公开的 URL,任何人无需登录即可浏览."
     />
     />
     <BasicForm @register="registerForm" />
     <BasicForm @register="registerForm" />
+    <section>
+      <div v-if="isPublicState" class="mt-4">
+        <span> 设置分享后, 可通过如下 </span>
+        <Button type="link" class="!px-1" @click="handleOpenLink"> 链接 </Button>
+        <span>访问:</span>
+      </div>
+      <Tooltip v-if="isPublicState" title="点击复制链接">
+        <div
+          class="px-4 py-2 my-2 bg-gray-50 font-semibold tracking-wider text-base cursor-pointer truncate"
+          @click="handleCopy"
+        >
+          <span>{{ link }}</span>
+        </div>
+      </Tooltip>
+
+      <Alert type="warning">
+        <template #message>
+          <span class="font-bold mr-1">提示:</span>
+          <span>不要忘记将相关设备 <span class="mx-1 font-bold">公开</span> 以访问其数据</span>
+        </template>
+      </Alert>
+    </section>
   </BasicModal>
   </BasicModal>
 </template>
 </template>

@@ -28,6 +28,7 @@
   import { ViewTypeNameEnum } from '../../common/ShareModal/config';
   import { ViewTypeNameEnum } from '../../common/ShareModal/config';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
+  import { ViewType } from '../../visual/board/config/panelDetail';
 
 
   const listColumn = ref(5);
   const listColumn = ref(5);
 
 
@@ -153,17 +154,20 @@
     getListData();
     getListData();
   };
   };
 
 
-  const { clipboardRef, isSuccessRef } = useCopyToClipboard();
-  const handleCreateShareUrl = (record: ConfigurationCenterItemsModal) => {
-    if (!unref(getShareFlag)) return;
-    const { origin } = location;
+  const createShareUrl = (record: ConfigurationCenterItemsModal) => {
     const searchParams = new URLSearchParams();
     const searchParams = new URLSearchParams();
     isDev && searchParams.set('dev', '1');
     isDev && searchParams.set('dev', '1');
     searchParams.set('share', 'SCADA');
     searchParams.set('share', 'SCADA');
     searchParams.set('configurationId', record.id);
     searchParams.set('configurationId', record.id);
     searchParams.set('publicId', record.publicId || '');
     searchParams.set('publicId', record.publicId || '');
     searchParams.set('lightbox', '1');
     searchParams.set('lightbox', '1');
-    const url = `${origin}${configurationPrefix}/?${searchParams.toString()}`;
+    return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
+  };
+
+  const { clipboardRef, isSuccessRef } = useCopyToClipboard();
+  const handleCreateShareUrl = (record: ConfigurationCenterItemsModal) => {
+    if (!unref(getShareFlag)) return;
+    const url = createShareUrl(record);
     clipboardRef.value = url;
     clipboardRef.value = url;
     if (unref(isSuccessRef)) {
     if (unref(isSuccessRef)) {
       createMessage.success('复制成功～');
       createMessage.success('复制成功～');
@@ -173,7 +177,7 @@
   const [registerShareModal, { openModal }] = useModal();
   const [registerShareModal, { openModal }] = useModal();
 
 
   const handleOpenShareModal = (record: ConfigurationCenterItemsModal) => {
   const handleOpenShareModal = (record: ConfigurationCenterItemsModal) => {
-    openModal(true, record);
+    openModal(true, { record, href: createShareUrl(record) });
   };
   };
 
 
   const listEl = ref<Nullable<ComponentElRef>>(null);
   const listEl = ref<Nullable<ComponentElRef>>(null);
@@ -228,7 +232,13 @@
         </template>
         </template>
         <template #renderItem="{ item }">
         <template #renderItem="{ item }">
           <List.Item>
           <List.Item>
-            <Card hoverable class="card-container">
+            <Card
+              :style="{
+                '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#1890ff' : '#faad14',
+              }"
+              hoverable
+              class="card-container"
+            >
               <template #cover>
               <template #cover>
                 <div
                 <div
                   class="img-container h-full w-full !flex justify-center items-center text-center p-1 relative"
                   class="img-container h-full w-full !flex justify-center items-center text-center p-1 relative"
@@ -357,6 +367,6 @@
   }
   }
 
 
   .card-container:deep(.ant-card-cover) {
   .card-container:deep(.ant-card-cover) {
-    background-color: #2db7f5;
+    background-color: var(--viewType);
   }
   }
 </style>
 </style>

@@ -29,6 +29,7 @@
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ViewTypeNameEnum } from '../common/ShareModal/config';
   import { ViewTypeNameEnum } from '../common/ShareModal/config';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
+  import { ViewType } from '../visual/board/config/panelDetail';
 
 
   const listColumn = ref(5);
   const listColumn = ref(5);
 
 
@@ -163,15 +164,18 @@
   const getPublicApiListData = () => {};
   const getPublicApiListData = () => {};
 
 
   const [registerShareModal, { openModal }] = useModal();
   const [registerShareModal, { openModal }] = useModal();
-  const handleOpenShareModal = (item: BigScreenCenterItemsModel) => {
-    openModal(true, item);
+  const handleOpenShareModal = (record: BigScreenCenterItemsModel) => {
+    openModal(true, { record, href: createShareUrl(record) });
+  };
+
+  const createShareUrl = (record: BigScreenCenterItemsModel) => {
+    const { origin } = location;
+    return `${origin}${largeDesignerPrefix}/#/share/preview/${record.id}/${record.publicId}`;
   };
   };
 
 
   const { clipboardRef, isSuccessRef } = useCopyToClipboard();
   const { clipboardRef, isSuccessRef } = useCopyToClipboard();
   const handleCreateShareUrl = (record: BigScreenCenterItemsModel) => {
   const handleCreateShareUrl = (record: BigScreenCenterItemsModel) => {
-    const { origin } = location;
-    const { largeDesignerPrefix } = useGlobSetting();
-    clipboardRef.value = `${origin}${largeDesignerPrefix}/#/share/preview/${record.id}/${record.publicId}`;
+    clipboardRef.value = createShareUrl(record);
     if (unref(isSuccessRef)) {
     if (unref(isSuccessRef)) {
       createMessage.success('复制成功～');
       createMessage.success('复制成功～');
     }
     }
@@ -223,7 +227,12 @@
         </template>
         </template>
         <template #renderItem="{ item }">
         <template #renderItem="{ item }">
           <List.Item>
           <List.Item>
-            <Card class="card-container">
+            <Card
+              :style="{
+                '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#1890ff' : '#faad14',
+              }"
+              class="card-container"
+            >
               <template #cover>
               <template #cover>
                 <div class="h-full w-full relative hover-show-modal-content img-container">
                 <div class="h-full w-full relative hover-show-modal-content img-container">
                   <img
                   <img
@@ -421,6 +430,6 @@
   }
   }
 
 
   .card-container:deep(.ant-card-cover) {
   .card-container:deep(.ant-card-cover) {
-    background-color: #2db7f5;
+    background-color: var(--viewType);
   }
   }
 </style>
 </style>

+import { DescItem } from '/@/components/Description';
+import {
+  ExecuteTimeTypeEnum,
+  ExecuteTimeTypeNameEnum,
+  FormFieldsEnum,
+  PeriodTypeNameEnum,
+} from '../DetailModal/config';
+import { TaskStatusEnum, TaskTargetEnum, TaskTargetNameEnum } from '../../config';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+import { TaskStatusNameEnum } from '../../config';
+import { TaskRecordType } from '/@/api/task/model';
+import { TaskTypeNameEnum } from '../../config';
+import { TimeUnitNameEnum } from '/@/enums/toolEnum';
+import { PeriodTypeEnum } from '../DetailModal/config';
+
+enum WeekEnum {
+  MON = 'MON',
+  TUES = 'TUES',
+  WED = 'WED',
+  THUR = 'THUR',
+  FRI = 'FRI',
+  SAT = 'SAT',
+  SUN = 'SUN',
+}
+
+enum WeekNameEnum {
+  MON = '星期一',
+  TUES = '星期二',
+  WED = '星期三',
+  THUR = '星期四',
+  FRI = '星期五',
+  SAT = '星期六',
+  SUN = '星期天',
+}
+
+const isWeek = (string: string) => {
+  return Object.keys(WeekEnum).some((item) => string.includes(item));
+};
+
+const extractCronExpression = (expression: string) => {
+  const flag = isWeek(expression);
+  const list = expression.split(' ');
+  const unit = flag ? list[list.length - 1] : list[3];
+  return flag ? WeekNameEnum[unit] : unit;
+};
+
+export const schemas: DescItem[] = [
+  {
+    field: FormFieldsEnum.NAME,
+    label: '任务名',
+  },
+  {
+    field: FormFieldsEnum.TARGET_TYPE,
+    label: '目标类型',
+    render(val: TaskTargetEnum) {
+      return h(
+        Tag,
+        { color: val === TaskTargetEnum.DEVICES ? 'blue' : 'cyan' },
+        () => TaskTargetNameEnum[val]
+      );
+    },
+  },
+  {
+    field: 'state',
+    label: '任务状态',
+    render(val: TaskStatusEnum) {
+      return h(
+        Tag,
+        { color: val === TaskStatusEnum.NORMAL ? 'success' : 'error' },
+        () => TaskStatusNameEnum[TaskStatusEnum[val]]
+      );
+    },
+  },
+  {
+    field: FormFieldsEnum.EXECUTE_CONTENT_TYPE,
+    label: '任务类型',
+    render(_val: any, data: TaskRecordType) {
+      return TaskTypeNameEnum[data.executeContent.type];
+    },
+  },
+  {
+    field: FormFieldsEnum.EXECUTE_TIME_TYPE,
+    label: '定时方式',
+    render(_val: any, data: TaskRecordType) {
+      return ExecuteTimeTypeNameEnum[data.executeTime.type];
+    },
+  },
+  {
+    field: FormFieldsEnum.EXECUTE_TIME_INTERVAL,
+    label: '间隔时间',
+    render(_val: any, data: TaskRecordType) {
+      const { executeTime } = data;
+      const { time, type, periodType, pollUnit, period } = executeTime;
+      console.log({ time, type, periodType, pollUnit });
+      return type === ExecuteTimeTypeEnum.POLL
+        ? `${time}${TimeUnitNameEnum[pollUnit]}`
+        : `${PeriodTypeNameEnum[periodType]} ${
+            periodType === PeriodTypeEnum.DAY
+              ? ''
+              : `/ ${extractCronExpression(period)}${isWeek(period) ? '' : '号'}`
+          } / ${time}`;
+    },
+  },
+  {
+    field: 'createTime',
+    label: '创建时间',
+  },
+  {
+    field: 'updateTime',
+    label: '修改时间',
+  },
+];

+export { default as DetailDrawer } from './index.vue';

+<script lang="ts" setup>
+  import { useDescription, Description } from '/@/components/Description';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { schemas } from './config';
+  import { ModalParamsType } from '/#/utils';
+  import { TaskRecordType } from '/@/api/task/model';
+  defineEmits(['register']);
+
+  const [registerDrawer] = useDrawerInner((data: ModalParamsType<TaskRecordType>) => {
+    const { record } = data;
+    setDescProps({ data: record });
+  });
+
+  const [registerDescription, { setDescProps }] = useDescription({
+    schema: schemas,
+    labelStyle: { width: '120px' },
+    column: 1,
+  });
+</script>
+
+<template>
+  <BasicDrawer title="任务详情" @register="registerDrawer" width="30%">
+    <Description @register="registerDescription" />
+  </BasicDrawer>
+</template>

@@ -263,14 +263,20 @@ export const formSchemas: FormSchema[] = [
     label: '周期',
     label: '周期',
     required: true,
     required: true,
     defaultValue: PeriodTypeEnum.MONTH,
     defaultValue: PeriodTypeEnum.MONTH,
-    componentProps: {
-      placeholder: '请选择周期',
-      options: [
-        { label: PeriodTypeNameEnum.DAY, value: PeriodTypeEnum.DAY },
-        { label: PeriodTypeNameEnum.WEEK, value: PeriodTypeEnum.WEEK },
-        { label: PeriodTypeNameEnum.MONTH, value: PeriodTypeEnum.MONTH },
-      ],
-      getPopupContainer: () => document.body,
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择周期',
+        options: [
+          { label: PeriodTypeNameEnum.DAY, value: PeriodTypeEnum.DAY },
+          { label: PeriodTypeNameEnum.WEEK, value: PeriodTypeEnum.WEEK },
+          { label: PeriodTypeNameEnum.MONTH, value: PeriodTypeEnum.MONTH },
+        ],
+        getPopupContainer: () => document.body,
+        onChange() {
+          setFieldsValue({ [FormFieldsEnum.EXECUTE_TIME_PERIOD]: null });
+        },
+      };
     },
     },
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.CUSTOM,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.CUSTOM,
   },
   },

@@ -6,10 +6,11 @@
   import { composeData, parseData } from './util';
   import { composeData, parseData } from './util';
   import { createTask, updateTask } from '/@/api/task';
   import { createTask, updateTask } from '/@/api/task';
   import { ModalParamsType } from '/#/utils';
   import { ModalParamsType } from '/#/utils';
-  import { DataActionModeEnum } from '/@/enums/toolEnum';
+  import { DataActionModeEnum, DataActionModeNameEnum } from '/@/enums/toolEnum';
   import { TaskRecordType } from '/@/api/task/model';
   import { TaskRecordType } from '/@/api/task/model';
   import { FormValueType } from './util';
   import { FormValueType } from './util';
   import { unref } from 'vue';
   import { unref } from 'vue';
+  import { computed } from 'vue';
 
 
   const props = defineProps<{
   const props = defineProps<{
     reload: Fn;
     reload: Fn;
@@ -18,6 +19,8 @@
 
 
   const formMode = ref(DataActionModeEnum.CREATE);
   const formMode = ref(DataActionModeEnum.CREATE);
 
 
+  const modalMode = ref<DataActionModeEnum>(DataActionModeEnum.CREATE);
+
   const dataSource = ref<TaskRecordType>();
   const dataSource = ref<TaskRecordType>();
   const [registerModal, { closeModal }] = useModalInner(
   const [registerModal, { closeModal }] = useModalInner(
     (
     (
@@ -26,6 +29,7 @@
         mode: DataActionModeEnum.CREATE,
         mode: DataActionModeEnum.CREATE,
       }
       }
     ) => {
     ) => {
+      modalMode.value = mode;
       dataSource.value = record;
       dataSource.value = record;
       formMode.value = mode;
       formMode.value = mode;
       resetFields();
       resetFields();
@@ -62,12 +66,16 @@
       loading.value = false;
       loading.value = false;
     }
     }
   };
   };
+
+  const getTitle = computed(() => {
+    return `${DataActionModeNameEnum[unref(modalMode)]}任务`;
+  });
 </script>
 </script>
 
 
 <template>
 <template>
   <BasicModal
   <BasicModal
     @register="registerModal"
     @register="registerModal"
-    title="创建任务"
+    :title="getTitle"
     width="700px"
     width="700px"
     :okButtonProps="{ loading }"
     :okButtonProps="{ loading }"
     @ok="handleOk"
     @ok="handleOk"

-import CronParser, { CronFields, HourRange, SixtyRange } from 'cron-parser';
+import { HourRange, SixtyRange } from 'cron-parser';
 import { dateUtil } from '/@/utils/dateUtil';
 import { dateUtil } from '/@/utils/dateUtil';
-import { ExecuteTimeTypeEnum, FormFieldsEnum, PushWayEnum } from './config';
+import { ExecuteTimeTypeEnum, FormFieldsEnum, PeriodTypeEnum, PushWayEnum } from './config';
 import { CreateTaskRecordType, TaskRecordType } from '/@/api/task/model';
 import { CreateTaskRecordType, TaskRecordType } from '/@/api/task/model';
 import { DeviceCascadePickerValueType } from '../DevicePicker';
 import { DeviceCascadePickerValueType } from '../DevicePicker';
 import { TaskTargetEnum } from '../../config';
 import { TaskTargetEnum } from '../../config';
@@ -12,52 +12,31 @@ export interface FormValueType extends Partial<Record<FormFieldsEnum, any>> {
   [FormFieldsEnum.DEVICE_PROFILE]: ProductCascadePickerValueType;
   [FormFieldsEnum.DEVICE_PROFILE]: ProductCascadePickerValueType;
 }
 }
 
 
-type CanWrite<T> = {
-  -readonly [K in keyof T]: T[K];
-};
-
 interface GenCronExpressionResultType {
 interface GenCronExpressionResultType {
   effective: boolean;
   effective: boolean;
   expression?: string;
   expression?: string;
 }
 }
 
 
-export const usePluginGenCronExpression = (
-  time: string,
-  expression = '* * * * * * *',
-  includesYear = true
-): GenCronExpressionResultType => {
-  try {
-    const separator = ' ';
-    const removeYear = expression.split(separator).slice(0, 6).join(separator);
-
-    const date = dateUtil(time, 'HH:mm:ss');
-
-    const second = date.get('second') as SixtyRange;
-    const minute = date.get('minute') as SixtyRange;
-    const hour = date.get('hour') as HourRange;
-
-    const result = CronParser.parseExpression(removeYear, { utc: true, nthDayOfWeek: 4 });
-    const fields = JSON.parse(JSON.stringify(result.fields)) as CanWrite<CronFields>;
-    fields.second = [second];
-    fields.minute = [minute];
-    fields.hour = [hour];
-
-    // console.log(CronParser.fieldsToExpression(CronParser.parseExpression('').fields).stringify());
-
-    let newExpression = CronParser.fieldsToExpression(fields).stringify(true);
-    newExpression = includesYear ? `${newExpression} *` : newExpression;
-    return { effective: true, expression: newExpression };
-  } catch (error) {
-    // throw error;
-    return { effective: false };
-  }
+export const genPollCronExpression = (value: number, type: TimeUnitEnum) => {
+  const placeholder = 'placeholder';
+  const expression = {
+    [TimeUnitEnum.SECOND]: `${placeholder} * * * * ? *`,
+    [TimeUnitEnum.MINUTE]: `* ${placeholder} * * * ? *`,
+    [TimeUnitEnum.HOUR]: `* * ${placeholder} * * ? *`,
+  };
+  const newExpression = expression[type];
+  return newExpression.replace(placeholder, `0/${value}`);
 };
 };
 
 
 export const genCronExpression = (
 export const genCronExpression = (
   time: string,
   time: string,
-  expression = '* * * * * * *'
+  expression = '* * * * * * *',
+  periodType: PeriodTypeEnum
 ): GenCronExpressionResultType => {
 ): GenCronExpressionResultType => {
   try {
   try {
+    if (periodType === PeriodTypeEnum.DAY) {
+      expression = '* * * * * ? *';
+    }
     const separator = ' ';
     const separator = ' ';
     const list: (string | number)[] = expression.split(separator);
     const list: (string | number)[] = expression.split(separator);
 
 
@@ -103,10 +82,12 @@ export const composeData = (result: Required<FormValueType>): CreateTaskRecordTy
     deviceType: productDeviceType,
     deviceType: productDeviceType,
   } = deviceProfile || {};
   } = deviceProfile || {};
 
 
-  const { expression } = genCronExpression(time, period);
+  const { expression } = genCronExpression(time, period, periodType);
 
 
   const cron =
   const cron =
-    executeTimeType === ExecuteTimeTypeEnum.POLL ? `0/${interval} * * * * ? *` : expression!;
+    executeTimeType === ExecuteTimeTypeEnum.POLL
+      ? genPollCronExpression(interval, pollUnit)
+      : expression!;
 
 
   return {
   return {
     name,
     name,

@@ -63,8 +63,9 @@ export const formSchemas: FormSchema[] = [
   {
   {
     field: FormFieldsEnum.TARGET_IDS,
     field: FormFieldsEnum.TARGET_IDS,
     component: 'ApiSelect',
     component: 'ApiSelect',
-    label: '制定目标设备',
+    label: '指定目标设备',
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TARGET_TYPE] === TargetType.ASSIGN,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TARGET_TYPE] === TargetType.ASSIGN,
+    rules: [{ required: true, message: '请选择指定目标设备' }],
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
       const record = JSON.parse(formModel[FormFieldsEnum.TASK_RECORD]) as TaskRecordType;
       const record = JSON.parse(formModel[FormFieldsEnum.TASK_RECORD]) as TaskRecordType;
       const isDevices = record.targetType === TaskTargetEnum.DEVICES;
       const isDevices = record.targetType === TaskTargetEnum.DEVICES;

@@ -24,7 +24,7 @@
     }
     }
   });
   });
 
 
-  const [registerForm, { setFieldsValue, getFieldsValue, resetFields }] = useForm({
+  const [registerForm, { setFieldsValue, getFieldsValue, resetFields, validate }] = useForm({
     schemas: formSchemas,
     schemas: formSchemas,
     showActionButtonGroup: false,
     showActionButtonGroup: false,
   });
   });
@@ -37,7 +37,8 @@
           ? TaskTargetEnum.DEVICES
           ? TaskTargetEnum.DEVICES
           : unref(dataSource)!.targetType,
           : unref(dataSource)!.targetType,
       id: unref(dataSource)!.id,
       id: unref(dataSource)!.id,
-      targetIds,
+      targetIds:
+        executeTarget === TargetType.ASSIGN ? targetIds : unref(dataSource)?.executeTarget.data,
       cronExpression: unref(dataSource)!.executeTime.cron,
       cronExpression: unref(dataSource)!.executeTime.cron,
       name: unref(dataSource)!.name,
       name: unref(dataSource)!.name,
     };
     };
@@ -46,6 +47,7 @@
   const loading = ref(false);
   const loading = ref(false);
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
   const handleOk = async () => {
   const handleOk = async () => {
+    await validate();
     const record = getFieldsValue() as FormValue;
     const record = getFieldsValue() as FormValue;
     const value = composeData(record);
     const value = composeData(record);
     try {
     try {

@@ -21,6 +21,7 @@
   enum DropMenuEvent {
   enum DropMenuEvent {
     DELETE = 'DELETE',
     DELETE = 'DELETE',
     EDIT = 'EDIT',
     EDIT = 'EDIT',
+    DETAIL = 'DETAIL',
   }
   }
 
 
   const props = withDefaults(
   const props = withDefaults(
@@ -35,7 +36,7 @@
     }
     }
   );
   );
 
 
-  const emit = defineEmits(['edit', 'runTask']);
+  const emit = defineEmits(['edit', 'runTask', 'detail']);
 
 
   const loading = ref(false);
   const loading = ref(false);
 
 
@@ -131,6 +132,12 @@
         :trigger="['hover']"
         :trigger="['hover']"
         :drop-menu-list="[
         :drop-menu-list="[
           {
           {
+            text: '详情',
+            event: DropMenuEvent.DETAIL,
+            icon: 'ant-design:eye-outlined',
+            onClick: emit.bind(null, 'detail', getRecord),
+          },
+          {
             text: '编辑',
             text: '编辑',
             event: DropMenuEvent.DELETE,
             event: DropMenuEvent.DELETE,
             disabled: !!getRecord.state,
             disabled: !!getRecord.state,
@@ -190,12 +197,14 @@
       </div>
       </div>
     </div>
     </div>
     <div class="mt-4 flex justify-between items-center gap-3">
     <div class="mt-4 flex justify-between items-center gap-3">
-      <Button size="small" @click="handleRunTask">
-        <div class="text-xs px-1">
-          <PlayCircleOutlined class="mr-1" />
-          <span>运行任务</span>
-        </div>
-      </Button>
+      <Authority :value="PermissionEnum.EXECUTE">
+        <Button size="small" @click="handleRunTask">
+          <div class="text-xs px-1">
+            <PlayCircleOutlined class="mr-1" />
+            <span>运行任务</span>
+          </div>
+        </Button>
+      </Authority>
       <Tooltip
       <Tooltip
         v-if="getLastExecuteTime"
         v-if="getLastExecuteTime"
         overlay-class-name="task-last-execute-time-tooltip"
         overlay-class-name="task-last-execute-time-tooltip"

@@ -6,6 +6,7 @@ export enum PermissionEnum {
   START_TASK = 'api:yt:task_center:update:state',
   START_TASK = 'api:yt:task_center:update:state',
   DELETE = 'api:yt:task_center:delete',
   DELETE = 'api:yt:task_center:delete',
   ALLOW = 'api:yt:task_center:cancel:allow',
   ALLOW = 'api:yt:task_center:cancel:allow',
+  EXECUTE = 'api:yt:task_center:immediate:execute',
 }
 }
 
 
 export enum FormFieldsEnum {
 export enum FormFieldsEnum {
@@ -17,13 +18,11 @@ export enum FormFieldsEnum {
 export enum TaskTargetEnum {
 export enum TaskTargetEnum {
   DEVICES = 'DEVICES',
   DEVICES = 'DEVICES',
   PRODUCTS = 'PRODUCTS',
   PRODUCTS = 'PRODUCTS',
-  ALL = 'all',
 }
 }
 
 
 export enum TaskTargetNameEnum {
 export enum TaskTargetNameEnum {
   DEVICES = '设备',
   DEVICES = '设备',
   PRODUCTS = '产品',
   PRODUCTS = '产品',
-  ALL = '不限任务目标类型',
 }
 }
 
 
 export enum TaskTypeEnum {
 export enum TaskTypeEnum {
@@ -43,7 +42,7 @@ export enum TaskStatusEnum {
 
 
 export enum TaskStatusNameEnum {
 export enum TaskStatusNameEnum {
   DEACTIVATE = '已停用',
   DEACTIVATE = '已停用',
-  NORMAL = '正常',
+  NORMAL = '已启用',
 }
 }
 
 
 export const formSchemas: FormSchema[] = [
 export const formSchemas: FormSchema[] = [

@@ -17,8 +17,11 @@
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import { RunTaskModal } from './components/RunTaskModal';
   import { RunTaskModal } from './components/RunTaskModal';
+  import { DetailDrawer } from './components/DetailDrawer';
+  import { useDrawer } from '/@/components/Drawer';
 
 
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
+  const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerRunTaskModal, { openModal: openRunTaskModal }] = useModal();
   const [registerRunTaskModal, { openModal: openRunTaskModal }] = useModal();
 
 
   const [registerForm, { getFieldsValue }] = useForm({
   const [registerForm, { getFieldsValue }] = useForm({
@@ -28,7 +31,6 @@
     showAdvancedButton: true,
     showAdvancedButton: true,
     labelWidth: 100,
     labelWidth: 100,
     submitFunc: async () => {
     submitFunc: async () => {
-      pagination.params = getFieldsValue();
       getDataSource();
       getDataSource();
     },
     },
   });
   });
@@ -39,7 +41,6 @@
     showQuickJumper: true,
     showQuickJumper: true,
     size: 'small',
     size: 'small',
     showTotal: (total: number) => `共 ${total} 条数据`,
     showTotal: (total: number) => `共 ${total} 条数据`,
-    params: {} as Recordable,
   });
   });
 
 
   const dataSource = ref<TaskRecordType[]>([]);
   const dataSource = ref<TaskRecordType[]>([]);
@@ -47,7 +48,8 @@
   const getDataSource = async () => {
   const getDataSource = async () => {
     try {
     try {
       loading.value = true;
       loading.value = true;
-      const { items } = await getTaskCenterList({ page: 1, pageSize: 10, ...pagination.params });
+      const params = getFieldsValue();
+      const { items } = await getTaskCenterList({ page: 1, pageSize: 10, ...params });
       dataSource.value = items;
       dataSource.value = items;
     } catch (error) {
     } catch (error) {
       throw error;
       throw error;
@@ -67,6 +69,10 @@
     openRunTaskModal(true, record);
     openRunTaskModal(true, record);
   };
   };
 
 
+  const handleDetail = (record: TaskRecordType) => {
+    openDrawer(true, { mode: DataActionModeEnum.READ, record } as ModalParamsType);
+  };
+
   const reload = () => getDataSource();
   const reload = () => getDataSource();
 
 
   const listElRef = ref<Nullable<ComponentElRef>>(null);
   const listElRef = ref<Nullable<ComponentElRef>>(null);
@@ -137,11 +143,18 @@
         </template>
         </template>
         <template #renderItem="{ item }">
         <template #renderItem="{ item }">
           <List.Item :key="item.id">
           <List.Item :key="item.id">
-            <TaskCard :record="item" :reload="reload" @runTask="handleRunTask" @edit="handleEdit" />
+            <TaskCard
+              :record="item"
+              :reload="reload"
+              @runTask="handleRunTask"
+              @detail="handleDetail"
+              @edit="handleEdit"
+            />
           </List.Item>
           </List.Item>
         </template>
         </template>
       </List>
       </List>
     </section>
     </section>
+    <DetailDrawer @register="registerDrawer" />
     <DetailModal @register="registerModal" :reload="reload" />
     <DetailModal @register="registerModal" :reload="reload" />
     <RunTaskModal :reload="reload" @register="registerRunTaskModal" />
     <RunTaskModal :reload="reload" @register="registerRunTaskModal" />
   </PageWrapper>
   </PageWrapper>

@@ -55,10 +55,10 @@ export function useSendCommand() {
         },
         },
       });
       });
       createMessage.success('命令下发成功');
       createMessage.success('命令下发成功');
+      return true;
     } catch (msg) {
     } catch (msg) {
+      console.log('enter');
       return error();
       return error();
-    } finally {
-      return true;
     }
     }
   };
   };
   return {
   return {

@@ -60,7 +60,8 @@
   const resetFormFields = async () => {
   const resetFormFields = async () => {
     const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
     const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
     for (const id of hasExistEl) {
     for (const id of hasExistEl) {
-      await dataSourceEl[id]?.resetFields();
+      const oldValues = dataSourceEl[id]?.getFieldsValue();
+      dataSourceEl[id]?.setFieldsValue({ ...oldValues, [DataSourceField.ATTRIBUTE]: null });
     }
     }
   };
   };
 
 
@@ -268,10 +269,8 @@
   watch(
   watch(
     () => props.frontId,
     () => props.frontId,
     async (target, oldTarget) => {
     async (target, oldTarget) => {
-      if (isControlComponent(oldTarget!)) return;
-      if (isControlComponent(target!)) {
-        await resetFormFields();
-      }
+      if (isControlComponent(oldTarget!) && isControlComponent(target!)) return;
+      await resetFormFields();
     }
     }
   );
   );
 
 

@@ -16,7 +16,7 @@
     list: Recordable[];
     list: Recordable[];
   }
   }
   const props = defineProps<{
   const props = defineProps<{
-    value: string;
+    value?: string;
   }>();
   }>();
   const emit = defineEmits(['update:value', 'change']);
   const emit = defineEmits(['update:value', 'change']);
 
 

@@ -10,7 +10,6 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
-import { nextTick } from 'vue';
 
 
 export enum BasicConfigField {
 export enum BasicConfigField {
   NAME = 'name',
   NAME = 'name',
@@ -183,7 +182,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
       colProps: { span: 8 },
       colProps: { span: 8 },
       rules: [{ required: true, message: '组织为必填项' }],
       rules: [{ required: true, message: '组织为必填项' }],
       componentProps({ formActionType }) {
       componentProps({ formActionType }) {
-        const { setFieldsValue, getFieldsValue } = formActionType;
+        const { setFieldsValue } = formActionType;
         return {
         return {
           placeholder: '请选择组织',
           placeholder: '请选择组织',
           api: async () => {
           api: async () => {
@@ -195,9 +194,6 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
             setFieldsValue({
             setFieldsValue({
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.DEVICE_ID]: null,
             });
             });
-            nextTick(() => {
-              console.log('org change', getFieldsValue());
-            });
           },
           },
           getPopupContainer: () => document.body,
           getPopupContainer: () => document.body,
         };
         };

@@ -76,7 +76,7 @@
   });
   });
 
 
   const getSharePageData = computed(() => {
   const getSharePageData = computed(() => {
-    return props.value;
+    return props.value!;
   });
   });
 
 
   const getIsSharePage = computed(() => {
   const getIsSharePage = computed(() => {
@@ -230,8 +230,9 @@
   const getDataBoradDetail = async () => {
   const getDataBoradDetail = async () => {
     try {
     try {
       return unref(getIsSharePage) ? unref(getSharePageData) : await getBasePageComponentData();
       return unref(getIsSharePage) ? unref(getSharePageData) : await getBasePageComponentData();
-    } catch (error) {}
-    return {} as ComponentInfoDetail;
+    } catch (error) {
+      return {} as ComponentInfoDetail;
+    }
   };
   };
 
 
   const loading = ref(false);
   const loading = ref(false);

@@ -22,6 +22,8 @@
   import { useForm, BasicForm } from '/@/components/Form';
   import { useForm, BasicForm } from '/@/components/Form';
   import { formSchema } from './config/searchForm';
   import { formSchema } from './config/searchForm';
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ShareModal } from '/@/views/common/ShareModal';
+  import { ModalParamsType } from '/#/utils';
+  import { DataActionModeEnum } from '/@/enums/toolEnum';
 
 
   const ListItem = List.Item;
   const ListItem = List.Item;
   const router = useRouter();
   const router = useRouter();
@@ -133,7 +135,11 @@
   };
   };
 
 
   const handleOpenShareModal = (record: DataBoardRecord) => {
   const handleOpenShareModal = (record: DataBoardRecord) => {
-    openShareModal(true, record);
+    openShareModal(true, {
+      record,
+      mode: DataActionModeEnum.READ,
+      href: createShareUrl(record),
+    } as ModalParamsType<DataBoardRecord>);
   };
   };
 
 
   const handleMenuEvent = (event: DropMenu, record: DataBoardRecord) => {
   const handleMenuEvent = (event: DropMenu, record: DataBoardRecord) => {

@@ -8,4 +8,5 @@ export type DynamicProps<T> = {
 export interface ModalParamsType<T = Recordable> {
 export interface ModalParamsType<T = Recordable> {
   mode: DataActionModeEnum;
   mode: DataActionModeEnum;
   record: T;
   record: T;
+  [key: string]: any;
 }
 }