Merge branch 'fix/rule-chain-field' into 'main_dev'

fix: 规则链字段修改

See merge request yunteng/thingskit-front!1062

@@ -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: '主题模板',

 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>