Merge branch 'main_dev' into local_devbranch_byft

@@ -2,6 +2,7 @@
  *规则链 变换 中文配置文件
  *规则链 变换 中文配置文件
   目前共有3个，分类按名称进行配置
   目前共有3个，分类按名称进行配置
  */
  */
+
 export default {
 export default {
   title: '变换',
   title: '变换',
   description: '更改消息载体和元数据',
   description: '更改消息载体和元数据',
@@ -16,7 +17,7 @@ export default {
     description: '使用JavaScript更改消息有效负载、元数据或消息类型。',
     description: '使用JavaScript更改消息有效负载、元数据或消息类型。',
   },
   },
   toEmail: {
   toEmail: {
-    name: '发送到电子邮件',
+    name: '发送到Email',
     details: `通过使用从元数据派生的值填充电子邮件字段，将消息转换为电子邮件内容并发送。设置SEND_EMAIL输出消息类型。`,
     details: `通过使用从元数据派生的值填充电子邮件字段，将消息转换为电子邮件内容并发送。设置SEND_EMAIL输出消息类型。`,
     description: '将消息转换为电子邮件内容并发送。',
     description: '将消息转换为电子邮件内容并发送。',
   },
   },

@@ -101,7 +101,7 @@ export default {
   },
   },
   SaveTimeseriesFieldsNameEnum: {
   SaveTimeseriesFieldsNameEnum: {
     DEFAULT_TTL: '默认TTL（秒）',
     DEFAULT_TTL: '默认TTL（秒）',
-    SKIP_LATEST_PERSISTENCE: '滑雪最新坚持',
+    SKIP_LATEST_PERSISTENCE: '跳过更新最新时序数据表(ts kv latest)',
     USE_SERVER_TS: '使用服务器时间戳',
     USE_SERVER_TS: '使用服务器时间戳',
   },
   },
   SaveToCustomTableFieldsNameEnum: {
   SaveToCustomTableFieldsNameEnum: {

@@ -12,7 +12,7 @@ export default {
   },
   },
   ToEmailFieldsNameEnum: {
   ToEmailFieldsNameEnum: {
     FROM_TEMPLATE: '来自模板',
     FROM_TEMPLATE: '来自模板',
-    TO_TEMPLATE: '发送到Email',
+    TO_TEMPLATE: '到模板',
     CC_TEMPLATE: '抄送模板',
     CC_TEMPLATE: '抄送模板',
     BCC_TEMPLATE: '密件抄送模板',
     BCC_TEMPLATE: '密件抄送模板',
     SUBJECT_TEMPLATE: '主题模板',
     SUBJECT_TEMPLATE: '主题模板',

@@ -62,7 +62,7 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
 export const searchFormSchema: FormSchema[] = [
   {
   {
     field: 'name',
     field: 'name',
-    label: '模板名称',
+    label: '模板',
     component: 'Input',
     component: 'Input',
     colProps: { span: 8 },
     colProps: { span: 8 },
     componentProps: {
     componentProps: {

@@ -25,7 +25,7 @@
   const [register, { reload }] = useCardList({
   const [register, { reload }] = useCardList({
     api: getPage,
     api: getPage,
     useSearchForm: true,
     useSearchForm: true,
-    title: '模版列表',
+    title: '模版',
     gutter: 4,
     gutter: 4,
     formConfig: {
     formConfig: {
       schemas: searchFormSchema,
       schemas: searchFormSchema,

 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ReloadOutlined } from '@ant-design/icons-vue';
-  import { Button, List, Tooltip } from 'ant-design-vue';
   import { TaskCard } from '/@/views/task/center/components/TaskCard';
   import { TaskCard } from '/@/views/task/center/components/TaskCard';
-  import { reactive, ref, unref } from 'vue';
-  import { PageWrapper } from '/@/components/Page';
-  import { BasicForm, useForm } from '/@/components/Form';
   import { formSchemas } from '/@/views/task/center/config';
   import { formSchemas } from '/@/views/task/center/config';
   import { getTaskCenterList } from '/@/api/task';
   import { getTaskCenterList } from '/@/api/task';
-  import { onMounted } from 'vue';
-  import { getBoundingClientRect } from '/@/utils/domUtils';
   import { TaskRecordType } from '/@/api/task/model';
   import { TaskRecordType } from '/@/api/task/model';
   import { RunTaskModal } from '/@/views/task/center/components/RunTaskModal';
   import { RunTaskModal } from '/@/views/task/center/components/RunTaskModal';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
+  import { useCardList, BasicCardList } from '/@/components/CardList';
 
 
   const props = defineProps<{
   const props = defineProps<{
     tbDeviceId: string;
     tbDeviceId: string;
   }>();
   }>();
 
 
-  const listElRef = ref<Nullable<ComponentElRef>>(null);
-
   const [registerRunTaskModal, { openModal }] = useModal();
   const [registerRunTaskModal, { openModal }] = useModal();
 
 
-  const [registerForm, { getFieldsValue }] = useForm({
-    schemas: formSchemas,
-    baseColProps: { span: 8 },
-    compact: true,
-    showAdvancedButton: true,
-    labelWidth: 100,
-    submitFunc: async () => {
-      getDataSource();
+  const [registerCardList, { reload }] = useCardList({
+    title: '任务列表',
+    api: getTaskCenterList,
+    baseLayout: { col: 2, row: 2 },
+    useSearchForm: true,
+    formConfig: {
+      schemas: formSchemas,
+      labelWidth: 100,
+      baseColProps: { span: 8 },
     },
     },
-    resetFunc: async () => {
-      getDataSource(true);
+    offsetHeight: 16,
+    beforeFetch: async (params: Recordable) => {
+      return { ...params, tbDeviceId: props.tbDeviceId };
     },
     },
   });
   });
 
 
-  const paginationChange = (page: number, pageSize: number) => {
-    pagination.current = page - 1 * pageSize > pagination.total ? 1 : page;
-    pagination.pageSize = pageSize;
-    getDataSource();
-  };
-
-  const pagination = reactive({
-    current: 1,
-    pageSize: 10,
-    total: 0,
-    showQuickJumper: true,
-    size: 'small',
-    showTotal: (total: number) => `共 ${total} 条数据`,
-    onChange: paginationChange,
-    onShowSizeChange: paginationChange,
-  });
-
-  const dataSource = ref<TaskRecordType[]>([]);
-  const loading = ref(false);
-
-  const getDataSource = async (reset = false) => {
-    try {
-      loading.value = true;
-      const params = getFieldsValue() || {};
-      const { items, total } = await getTaskCenterList({
-        page: pagination.current,
-        pageSize: pagination.pageSize,
-        tbDeviceId: props.tbDeviceId,
-        ...(reset ? {} : params),
-      });
-      pagination.total = total;
-      dataSource.value = items;
-    } catch (error) {
-      throw error;
-    } finally {
-      loading.value = false;
-    }
-  };
-
-  const reload = () => getDataSource();
-
-  const setListHeight = () => {
-    const clientHeight = document.documentElement.clientHeight;
-    const rect = getBoundingClientRect(unref(listElRef)!.$el!) as DOMRect;
-    // margin-top 24 height 24
-    const paginationHeight = 24 + 24 + 8;
-    // list pading top 8 maring-top 8 extra slot 56
-    const listContainerMarginBottom = 8 + 8 + 72;
-    const listContainerHeight =
-      clientHeight - rect.top - paginationHeight - listContainerMarginBottom;
-    const listContainerEl = (unref(listElRef)!.$el as HTMLElement).querySelector(
-      '.ant-spin-container'
-    ) as HTMLElement;
-    listContainerEl &&
-      (listContainerEl.style.height = listContainerHeight + 'px') &&
-      (listContainerEl.style.overflowY = 'auto') &&
-      (listContainerEl.style.overflowX = 'hidden');
-  };
-
   const handleRunTask = (record: TaskRecordType) => {
   const handleRunTask = (record: TaskRecordType) => {
     openModal(true, record);
     openModal(true, record);
   };
   };
-
-  onMounted(() => {
-    setListHeight();
-    getDataSource();
-  });
 </script>
 </script>
 
 
 <template>
 <template>
-  <PageWrapper
+  <!-- <PageWrapper
     class="bg-neutral-100 dark:text-gray-300 dark:bg-dark-700 device-task-list-container"
     class="bg-neutral-100 dark:text-gray-300 dark:bg-dark-700 device-task-list-container"
-  >
-    <section
-      class="form-container bg-light-50 px-4 pt-4 mt-4 x dark:text-gray-300 dark:bg-dark-900"
-    >
-      <BasicForm @register="registerForm" />
-    </section>
-    <section class="bg-light-50 my-4 p-4 x dark:text-gray-300 dark:bg-dark-900">
-      <List
-        ref="listElRef"
-        :dataSource="dataSource"
-        :pagination="pagination"
-        :grid="{ gutter: 16, xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 3, column: 3 }"
-        :loading="loading"
-      >
-        <template #header>
-          <section class="flex justify-between gap-4 min-h-12 items-center">
-            <div class="text-lg font-semibold">
-              <span>任务列表</span>
-            </div>
-            <Tooltip title="刷新">
-              <Button type="primary" @click="getDataSource">
-                <ReloadOutlined :spin="loading" />
-              </Button>
-            </Tooltip>
-          </section>
-        </template>
-        <template #renderItem="{ item }">
-          <List.Item :key="item.id">
-            <TaskCard
-              :record="item"
-              :reload="reload"
-              :tbDeviceId="tbDeviceId"
-              :deviceTaskCardMode="true"
-              @runTask="handleRunTask"
-            />
-          </List.Item>
-        </template>
-      </List>
-      <RunTaskModal :reload="reload" @register="registerRunTaskModal" />
-    </section>
-  </PageWrapper>
+  > -->
+  <section class="bg-neutral-100 dark:text-gray-300 dark:bg-dark-700 device-task-list-container">
+    <BasicCardList class="flex-auto w-full" @register="registerCardList">
+      <template #renderItem="{ item }">
+        <TaskCard
+          :record="item"
+          :reload="reload"
+          :tbDeviceId="tbDeviceId"
+          :deviceTaskCardMode="true"
+          @runTask="handleRunTask"
+        />
+      </template>
+    </BasicCardList>
+    <RunTaskModal :reload="reload" @register="registerRunTaskModal" />
+  </section>
+  <!-- </PageWrapper> -->
 </template>
 </template>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
@@ -156,8 +61,8 @@
       border: none;
       border: none;
     }
     }
 
 
-    :deep(.ant-card-body) {
-      padding: 16px 24px;
-    }
+    // :deep(.ant-card-body) {
+    //   padding: 16px 24px;
+    // }
   }
   }
 </style>
 </style>

@@ -18,9 +18,7 @@
 
 
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
   const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
-    schemas: serviceSchemas(
-      props.record.transportType === 'TCP' || props.record.ifShowClass === true
-    ),
+    schemas: serviceSchemas(props.record.transportType === 'TCP'),
     actionColOptions: {
     actionColOptions: {
       span: 14,
       span: 14,
     },
     },

 import { CreateAlarmFieldsEnum, CreateAlarmFieldsNameEnum } from '../../../enum/formField/action';
 import { CreateAlarmFieldsEnum, CreateAlarmFieldsNameEnum } from '../../../enum/formField/action';
 import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
 import { JavascriptEditorWithTestModal } from '../../../src/components/JavaScriptFilterModal';
+import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
 
 
@@ -80,6 +81,22 @@ export const formSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: CreateAlarmFieldsEnum.SEVERITY,
+    component: 'ApiSelect',
+    label: t(CreateAlarmFieldsNameEnum.SEVERITY),
+    show: ({ model }) => !model[CreateAlarmFieldsEnum.USE_MESSAGE_ALARM_DATA],
+    ifShow: ({ model }) => !model[CreateAlarmFieldsEnum.DYNAMIC_SEVERITY],
+    componentProps: {
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'severity_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+      placeholder: `请输入${t(CreateAlarmFieldsNameEnum.SEVERITY)}`,
+    },
+  },
+  {
     field: CreateAlarmFieldsEnum.PROPAGATE,
     field: CreateAlarmFieldsEnum.PROPAGATE,
     component: 'Checkbox',
     component: 'Checkbox',
     label: '',
     label: '',

@@ -23,7 +23,7 @@ export const formSchemas: FormSchema[] = [
     component: 'Checkbox',
     component: 'Checkbox',
     label: '',
     label: '',
     renderComponentContent: () => ({
     renderComponentContent: () => ({
-      default: () => t(SaveTimeseriesFieldsNameEnum.DEFAULT_TTL),
+      default: () => t(SaveTimeseriesFieldsNameEnum.SKIP_LATEST_PERSISTENCE),
     }),
     }),
   },
   },
   {
   {

@@ -60,6 +60,7 @@ export const formSchemas: FormSchema[] = [
     field: OriginatorAttributesEnum.LATEST_TS_KEY_NAMES,
     field: OriginatorAttributesEnum.LATEST_TS_KEY_NAMES,
     component: 'Select',
     component: 'Select',
     label: t(OriginatorAttributesNameEnum.LATEST_TS_KEY_NAMES),
     label: t(OriginatorAttributesNameEnum.LATEST_TS_KEY_NAMES),
+    required: true,
     helpMessage: [
     helpMessage: [
       `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
       `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
     ],
     ],

@@ -18,6 +18,10 @@
     return nodeDefinition || {};
     return nodeDefinition || {};
   });
   });
 
 
+  const getHasInEnabledFlag = computed(() => unref(getNodeDefinition).inEnabled);
+
+  const getHasOutEnabledFlag = computed(() => unref(getNodeDefinition).outEnabled);
+
   const getIcon = computed(() => {
   const getIcon = computed(() => {
     const { icon } = unref(getNodeDefinition);
     const { icon } = unref(getNodeDefinition);
     const { icon: categoryIcon } = props.categoryConfig || {};
     const { icon: categoryIcon } = props.categoryConfig || {};
@@ -87,8 +91,14 @@
           {{ config?.name }}
           {{ config?.name }}
         </span>
         </span>
       </div>
       </div>
-      <div class="w-4 h-4 bg-gray-300 rounded-md border absolute -left-3 border-gray-500"></div>
-      <div class="w-4 h-4 bg-gray-300 rounded-md border absolute -right-3 border-gray-500"></div>
+      <div
+        v-if="getHasInEnabledFlag"
+        class="w-4 h-4 bg-gray-300 rounded-md border absolute -left-3 border-gray-500"
+      ></div>
+      <div
+        v-if="getHasOutEnabledFlag"
+        class="w-4 h-4 bg-gray-300 rounded-md border absolute -right-3 border-gray-500"
+      ></div>
     </main>
     </main>
   </Tooltip>
   </Tooltip>
 </template>
 </template>