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

隐藏规则链相关的节点和修改节点字段名

See merge request yunteng/thingskit-front!1049

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1701135308389" class="icon" viewBox="0 0 1079 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1473" xmlns:xlink="http://www.w3.org/1999/xlink" width="210.7421875" height="200"><path d="M602.973867 717.627733l342.024533-342.075733a48.759467 48.759467 0 0 0 14.344533-34.577067 48.896 48.896 0 0 0-83.456-34.5856l-307.5072 307.541334-307.464533-307.549867a48.913067 48.913067 0 0 0-69.128533 0 48.955733 48.955733 0 0 0 0 69.154133L533.845333 717.610667a48.930133 48.930133 0 0 0 69.128534 0.017066z" fill="#AAAAAA" p-id="1474"></path></svg>
\ No newline at end of file

@@ -25,7 +25,7 @@ export default {
     CLIENT_ATTRIBUTE_NAMES: '客户端属性',
     SHARED_ATTRIBUTE_NAMES: '共享属性',
     SERVER_ATTRIBUTE_NAMES: '服务器属性',
-    LATEST_TS_KEY_NAMES: '最新时间序列',
+    LATEST_TS_KEY_NAMES: '最新时序数据-标识符',
     GET_LATEST_VALUE_WITH_TS: '获取带有时间戳的最新遥测',
   },
   OriginatorFieldsNameEnum: {

@@ -28,24 +28,24 @@ export enum RelationTypeNameEnum {
  */
 export enum EntityTypeEnum {
   DEVICE = 'DEVICE',
-  ASSET = 'ASSET',
-  ENTITY_VIEW = 'ENTITY_VIEW',
+  // ASSET = 'ASSET',
+  // ENTITY_VIEW = 'ENTITY_VIEW',
   TENANT = 'TENANT',
   CUSTOMER = 'CUSTOMER',
   USER = 'USER',
-  DASHBOARD = 'DASHBOARD',
-  EDGE = 'EDGE',
+  // DASHBOARD = 'DASHBOARD',
+  // EDGE = 'EDGE',
 }
 
 export enum EntityTypeNameEnum {
   DEVICE = '设备',
-  ASSET = '资产',
-  ENTITY_VIEW = '实体视图',
+  // ASSET = '资产',
+  // ENTITY_VIEW = '实体视图',
   TENANT = '租户',
   CUSTOMER = '客户',
   USER = '用户',
-  DASHBOARD = '仪表板',
-  EDGE = '边缘',
+  // DASHBOARD = '仪表板',
+  // EDGE = '边缘',
 }
 
 /**

@@ -125,7 +125,7 @@ export function useAwaitPopupWindowBindData(
           CheckExistenceFieldsNameEnum.METADATA_NAMES
         )}最少选填一个`
       );
-      return false;
+      return true;
     }
     unref(resolveFn)?.({
       flag: true,

 <script setup lang="ts">
-  import { Spin } from 'ant-design-vue';
+  import { Spin, Tooltip } from 'ant-design-vue';
   import { Background, BackgroundVariant } from '@vue-flow/background';
   import { Controls } from '@vue-flow/controls';
   import { Panel, PanelPosition, VueFlow } from '@vue-flow/core';
@@ -24,6 +24,11 @@
   import { UpdateNodeDrawer } from './src/components/UpdateNodeDrawer';
   import { UpdateEdgeDrawer } from './src/components/UpdateEdgeDrawer';
   import { CreateRuleChainModal } from './src/components/CreateRuleChainModal';
+  import { useRouter } from 'vue-router';
+
+  // import { getRuleChinsList } from '/@/api/ruleengine/ruleengineApi';
+  // import { ApiSelect } from '/@/components/Form';
+  // import DownImage from '/@/assets/svg/down-svg.svg';
 
   const getId = Number(Math.random().toString().substring(2)).toString(16);
 
@@ -96,6 +101,20 @@
     useSaveAndRedoActionType.triggerChange?.();
   };
 
+  const ROUTER = useRouter();
+  // const isShowSelect = ref<boolean>(false);
+  const handleBack = () => {
+    ROUTER.go(-1);
+  };
+
+  // const handleDown = () => {
+  //   isShowSelect.value = !unref(isShowSelect);
+  // };
+
+  // const handleSelectChange = (e) => {
+  //   ROUTER.replace(`${e}`);
+  // };
+
   onMounted(() => {
     getCurrentPageMetaData(flowActionType);
     getCurrentRuleChainDetail();
@@ -131,9 +150,7 @@
         <template #edge-custom="props">
           <BasicEdge v-bind="props" />
         </template>
-
         <BasicConnectionArrow />
-
         <Background :variant="BackgroundVariant.Lines" :gap="25" pattern-color="#cfcfcf" />
 
         <Controls :position="PanelPosition.BottomLeft" />
@@ -171,14 +188,56 @@
           </section>
         </Panel>
 
-        <Panel position="top-right">
+        <Panel position="top-right" class="flex">
+          <Tooltip title="返回">
+            <button
+              class="w-10 h-10 bg-gray-300 flex justify-center items-center rounded-full dark:bg-dark-50"
+              @click="handleBack"
+              ><Icon icon="ant-design:rollback-outlined" class="cursor-pointer svg:text-xl" />
+            </button>
+          </Tooltip>
           <button
-            class="w-10 h-10 bg-gray-300 flex justify-center items-center rounded-full dark:bg-dark-50"
+            class="w-10 h-10 bg-gray-300 mx-1 flex justify-center items-center rounded-full dark:bg-dark-50"
             @click="handleFullScreen"
           >
             <Icon class="!text-2xl dark:text-light-50" :icon="getFullScreenIcon" />
           </button>
         </Panel>
+        <!-- <Panel position="top-left">
+          <h1 class="ml-10">{{ ruleChainDetail?.name }}</h1>
+        </Panel> -->
+        <!-- <Panel position="top-center" class="flex flex-col items-center">
+          <button
+            class="w-10 h-10 bg-gray-300 mx-1 flex justify-center items-center rounded-full dark:bg-dark-50"
+            @click="handleDown"
+          >
+            <img :src="DownImage" alt="avatar" />
+          </button>
+          <div v-if="isShowSelect" class="mt-1">
+            <ApiSelect
+              class="!mx-2 flex-auto w-40"
+              :api="
+                async (params) => {
+                  const options = await getRuleChinsList(params);
+                  return options?.data
+                    .map((item) => ({ label: item.name, value: item.id.id }))
+                    .filter((item) => item.label !== ruleChainDetail?.name);
+                }
+              "
+              :showSearch="true"
+              :filterOption="(inputValue: string, option: Record<'label' | 'value', string>) =>
+          option.label.includes(inputValue)"
+              placeholder="请选择规则链"
+              :params="{
+                page: 0,
+                pageSize: 100,
+                sortProperty: 'createdTime',
+                sortOrder: 'DESC',
+              }"
+              @change="handleSelectChange"
+            />
+          </div>
+        </Panel> -->
       </VueFlow>
     </Spin>
 
@@ -203,5 +262,9 @@
     .ant-spin-container {
       @apply w-full h-full;
     }
+
+    // :deep(.top .center) {
+    //   margin: 0 !important;
+    // }
   }
 </style>

@@ -8,54 +8,54 @@ import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
 
 export const formSchemas: FormSchema[] = [
-  {
-    field: OriginatorAttributesEnum.TELL_FAILURE_IF_ABSENT,
-    component: 'Checkbox',
-    label: t(OriginatorAttributesNameEnum.TELL_FAILURE_IF_ABSENT),
-    renderComponentContent: () => ({
-      default: () =>
-        'If at least one selected key doesn\'t exist the outbound message will report "Failure".',
-    }),
-  },
-  {
-    field: OriginatorAttributesEnum.CLIENT_ATTRIBUTE_NAMES,
-    component: 'Select',
-    label: t(OriginatorAttributesNameEnum.CLIENT_ATTRIBUTE_NAMES),
-    helpMessage: [
-      `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
-    ],
-    componentProps: {
-      mode: 'tags',
-      open: false,
-      placeholder: `请输入${t(OriginatorAttributesNameEnum.CLIENT_ATTRIBUTE_NAMES)}`,
-    },
-  },
-  {
-    field: OriginatorAttributesEnum.SHARED_ATTRIBUTE_NAMES,
-    component: 'Select',
-    label: t(OriginatorAttributesNameEnum.SHARED_ATTRIBUTE_NAMES),
-    helpMessage: [
-      `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
-    ],
-    componentProps: {
-      mode: 'tags',
-      open: false,
-      placeholder: `请输入${t(OriginatorAttributesNameEnum.SHARED_ATTRIBUTE_NAMES)}`,
-    },
-  },
-  {
-    field: OriginatorAttributesEnum.SERVER_ATTRIBUTE_NAMES,
-    component: 'Select',
-    label: t(OriginatorAttributesNameEnum.SERVER_ATTRIBUTE_NAMES),
-    helpMessage: [
-      `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
-    ],
-    componentProps: {
-      mode: 'tags',
-      open: false,
-      placeholder: `请输入${t(OriginatorAttributesNameEnum.SERVER_ATTRIBUTE_NAMES)}`,
-    },
-  },
+  // {
+  //   field: OriginatorAttributesEnum.TELL_FAILURE_IF_ABSENT,
+  //   component: 'Checkbox',
+  //   label: t(OriginatorAttributesNameEnum.TELL_FAILURE_IF_ABSENT),
+  //   renderComponentContent: () => ({
+  //     default: () =>
+  //       'If at least one selected key doesn\'t exist the outbound message will report "Failure".',
+  //   }),
+  // },
+  // {
+  //   field: OriginatorAttributesEnum.CLIENT_ATTRIBUTE_NAMES,
+  //   component: 'Select',
+  //   label: t(OriginatorAttributesNameEnum.CLIENT_ATTRIBUTE_NAMES),
+  //   helpMessage: [
+  //     `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
+  //   ],
+  //   componentProps: {
+  //     mode: 'tags',
+  //     open: false,
+  //     placeholder: `请输入${t(OriginatorAttributesNameEnum.CLIENT_ATTRIBUTE_NAMES)}`,
+  //   },
+  // },
+  // {
+  //   field: OriginatorAttributesEnum.SHARED_ATTRIBUTE_NAMES,
+  //   component: 'Select',
+  //   label: t(OriginatorAttributesNameEnum.SHARED_ATTRIBUTE_NAMES),
+  //   helpMessage: [
+  //     `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
+  //   ],
+  //   componentProps: {
+  //     mode: 'tags',
+  //     open: false,
+  //     placeholder: `请输入${t(OriginatorAttributesNameEnum.SHARED_ATTRIBUTE_NAMES)}`,
+  //   },
+  // },
+  // {
+  //   field: OriginatorAttributesEnum.SERVER_ATTRIBUTE_NAMES,
+  //   component: 'Select',
+  //   label: t(OriginatorAttributesNameEnum.SERVER_ATTRIBUTE_NAMES),
+  //   helpMessage: [
+  //     `Hint: use \${metadataKey} for value from metadata, $[messageKey] for value from message body`,
+  //   ],
+  //   componentProps: {
+  //     mode: 'tags',
+  //     open: false,
+  //     placeholder: `请输入${t(OriginatorAttributesNameEnum.SERVER_ATTRIBUTE_NAMES)}`,
+  //   },
+  // },
   {
     field: OriginatorAttributesEnum.LATEST_TS_KEY_NAMES,
     component: 'Select',
@@ -75,7 +75,7 @@ export const formSchemas: FormSchema[] = [
     label: t(OriginatorAttributesNameEnum.GET_LATEST_VALUE_WITH_TS),
     renderComponentContent: () => ({
       default: () =>
-        'If selected, latest telemetry values will be added to the outbound message metadata with timestamp, e.g: "temp": "{"ts":1574329385897, "value":42}"',
+        '如果选中，最新的遥测值将添加到带有时间戳的出站消息元数据中, 例如: "temp": "{"ts":1574329385897, "value":42}"',
     }),
   },
 ];

@@ -13,6 +13,7 @@ export const formSchemas: FormSchema[] = [
     component: 'AttributeConfiguration',
     label: t(OriginatorFieldsNameEnum.FIELDS_MAPPING),
     slot: OriginatorFieldsEnum.FIELDS_MAPPING,
+    helpMessage: '允许发起者类型: 租户、客户、用户、设备、告警、规则链',
     valueField: 'value',
     changeEvent: 'update:value',
   },

@@ -45,8 +45,8 @@
       <AttributeConfiguration
         v-model:value="model[field]"
         ref="fieldControlElRef"
-        keyLabel="Source Field"
-        valueLabel="Target attribute"
+        keyLabel="实体的字段"
+        valueLabel="目标属性"
       />
     </template>
   </BasicForm>

@@ -139,7 +139,7 @@ export const formSchemas: FormSchema[] = [
   {
     field: RelatedDeviceAttributeFieldsEnum.LATEST_TS_KEY_NAMES,
     component: 'Select',
-    label: t(RelatedDeviceAttributeFieldsNameEnum.LATEST_TS_KEY_NAMES),
+    label: t(RelatedDeviceAttributeFieldsNameEnum.LATEST_TS_KEY_NAMES) + '123',
     componentProps: {
       open: false,
       mode: 'tags',

 import type { CategoryConfigType, NodeItemConfigType } from '../../types/node';
 import { RuleNodeTypeEnum } from '../index.type';
-import { CustomerAttributesConfig } from './CustomerAttributes';
+// import { CustomerAttributesConfig } from './CustomerAttributes';
 import { OriginatorTelemetryConfig } from './OriginatorTelemetry';
 import { OriginatorFieldsConfig } from './OriginatorFields';
 import { CalculateDeltaConfig } from './CalculateDelta';
-import { TenantAttributesConfig } from './TenantAttributes';
-import { RelatedDeviceAttributesConfig } from './RelatedDeviceAttributes';
-import { RelatedAttributesConfig } from './RelatedAttributes';
-import { TenantDetailsConfig } from './TenantDetails';
+// import { TenantAttributesConfig } from './TenantAttributes';
+// import { RelatedDeviceAttributesConfig } from './RelatedDeviceAttributes';
+// import { RelatedAttributesConfig } from './RelatedAttributes';
+// import { TenantDetailsConfig } from './TenantDetails';
 import { OriginatorAttributesConfig } from './OriginatorAttributes';
-import { CustomerDetailsConfig } from './CustomerDetails';
+// import { CustomerDetailsConfig } from './CustomerDetails';
 import { useI18n } from '/@/hooks/web/useI18n';
 
 const { t } = useI18n(); // 加载国际化
@@ -23,13 +23,13 @@ export const EnrichmentCategoryConfig: CategoryConfigType = {
 
 export const EnrichmentComponents: NodeItemConfigType[] = [
   CalculateDeltaConfig,
-  CustomerAttributesConfig,
-  CustomerDetailsConfig,
+  // CustomerAttributesConfig,
+  // CustomerDetailsConfig,
   OriginatorAttributesConfig,
   OriginatorFieldsConfig,
   OriginatorTelemetryConfig,
-  RelatedAttributesConfig,
-  RelatedDeviceAttributesConfig,
-  TenantAttributesConfig,
-  TenantDetailsConfig,
+  // RelatedAttributesConfig,
+  // RelatedDeviceAttributesConfig,
+  // TenantAttributesConfig,
+  // TenantDetailsConfig,
 ];

@@ -56,7 +56,8 @@
   const handleModalOk = async () => {
     await validate();
     const data = getFieldsValue();
-    await handleSubmit(data);
+    const flag = await handleSubmit(data);
+    if (flag) return;
     resetFieldsValue();
   };
 

@@ -9,6 +9,7 @@
   import { useForm, BasicForm } from '/@/components/Form';
   import { BottomFormSchemas, TopFormSchemas } from '../CreateNodeModal/config';
   import { toRaw, unref } from 'vue';
+
   import { BasicEvents } from './BasicEvents';
 
   const [topFormRegister, topFormActionType] = useForm({
@@ -79,7 +80,7 @@
 <template>
   <BasicDrawer
     v-model:visible="visible"
-    :width="nodeData?.created ? '50%' : '40%'"
+    :width="!nodeData?.created ? '55%' : '40%'"
     showFooter
     showCancelBtn
     showOkBtn