From 763e4ce876fc0ca5ba5d33ccc3f5107a11751369 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sun, 31 Mar 2024 20:35:41 +0800
Subject: [PATCH 01/38] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/selectType/empUserSelect.ts           |   4 +-
 .../default/header/components/OnlineCount.vue |  66 ----
 .../default/header/components/index.ts        |   2 +-
 src/views/sys/menu/form.vue                   | 300 ------------------
 src/views/sys/menu/index.vue                  |  75 -----
 src/views/sys/menu/list.vue                   | 256 ---------------
 src/views/sys/post/form.vue                   | 152 ---------
 src/views/sys/post/list.vue                   | 229 -------------
 8 files changed, 3 insertions(+), 1081 deletions(-)
 delete mode 100644 src/layouts/default/header/components/OnlineCount.vue
 delete mode 100644 src/views/sys/menu/form.vue
 delete mode 100644 src/views/sys/menu/index.vue
 delete mode 100644 src/views/sys/menu/list.vue
 delete mode 100644 src/views/sys/post/form.vue
 delete mode 100644 src/views/sys/post/list.vue

diff --git a/src/components/ListSelect/src/selectType/empUserSelect.ts b/src/components/ListSelect/src/selectType/empUserSelect.ts
index 8e16c7c..bb3ac25 100644
--- a/src/components/ListSelect/src/selectType/empUserSelect.ts
+++ b/src/components/ListSelect/src/selectType/empUserSelect.ts
@@ -1,7 +1,7 @@
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn, BasicTableProps, FormProps } from '/@/components/Table';
 import { officeTreeData } from '/@/api/sys/office';
-import { companyTreeData } from '/@/api/sys/company';
+// import { companyTreeData } from '/@/api/sys/company';
 import { empUserListData } from '/@/api/sys/empUser';
 
 const { t } = useI18n('sys.empUser');
@@ -48,7 +48,7 @@ const searchForm: FormProps = {
       field: 'employee.company.companyCode',
       component: 'TreeSelect',
       componentProps: {
-        api: companyTreeData,
+        // api: companyTreeData,
         allowClear: true,
       },
     },
diff --git a/src/layouts/default/header/components/OnlineCount.vue b/src/layouts/default/header/components/OnlineCount.vue
deleted file mode 100644
index 5c00b47..0000000
--- a/src/layouts/default/header/components/OnlineCount.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <Tooltip
-    :title="t('在线用户')"
-    placement="bottom"
-    :mouseEnterDelay="0.5"
-    @click="handleToOnlineList"
-  >
-    <Badge
-      :count="count"
-      :offset="[-6, 11]"
-      :overflowCount="99"
-      :number-style="{ backgroundColor: '#00a65a' }"
-    >
-      <Icon icon="icon-people" />
-    </Badge>
-  </Tooltip>
-</template>
-<script lang="ts">
-  import { defineComponent, onMounted, ref } from 'vue';
-  import { Tooltip, Badge } from 'ant-design-vue';
-  import Icon from '/@/components/Icon';
-
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { usePermission } from '/@/hooks/web/usePermission';
-  import { onlineCount } from '/@/api/sys/online';
-
-  import { useRouter } from 'vue-router';
-
-  export default defineComponent({
-    name: 'JeeSiteOnlineCount',
-    components: { Icon, Tooltip, Badge },
-
-    setup() {
-      const { t } = useI18n();
-      const { push } = useRouter();
-      const { hasPermission } = usePermission();
-
-      const count = ref<Number>(0);
-
-      async function refreshOnlineCount() {
-        let num = Number(await onlineCount());
-        if (!num || Number.isNaN(num)) {
-          num = 0;
-        }
-        count.value = num;
-      }
-
-      onMounted(async () => {
-        refreshOnlineCount(); // 先执行一次
-        setInterval(refreshOnlineCount, 180000); // 3分钟执行一次
-      });
-
-      function handleToOnlineList() {
-        if (hasPermission('sys:online:view')) {
-          push('/sys/online/list');
-        }
-      }
-
-      return {
-        t,
-        count,
-        handleToOnlineList,
-      };
-    },
-  });
-</script>
diff --git a/src/layouts/default/header/components/index.ts b/src/layouts/default/header/components/index.ts
index bd8eb25..2cbfd13 100644
--- a/src/layouts/default/header/components/index.ts
+++ b/src/layouts/default/header/components/index.ts
@@ -12,6 +12,6 @@ export const Notify = createAsyncComponent(() => import('./notify/index.vue'));
 
 export const ErrorAction = createAsyncComponent(() => import('./ErrorAction.vue'));
 
-export const OnlineCount = createAsyncComponent(() => import('./OnlineCount.vue'));
+// export const OnlineCount = createAsyncComponent(() => import('./OnlineCount.vue'));
 
 export { FullScreen, UserDropDown };
diff --git a/src/views/sys/menu/form.vue b/src/views/sys/menu/form.vue
deleted file mode 100644
index 12b9666..0000000
--- a/src/views/sys/menu/form.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-<!--
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author ThinkGem
--->
-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    :showFooter="true"
-    :okAuth="'sys:menu:edit'"
-    @register="registerDrawer"
-    @ok="handleSubmit"
-    width="60%"
-  >
-    <template #title>
-      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
-      <span> {{ getTitle.value }} </span>
-    </template>
-    <BasicForm @register="registerForm" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup name="ViewsSysMenuForm">
-  import { ref, unref, computed } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { Menu, menuSave, menuForm, menuTreeData } from '/@/api/sys/menu';
-
-  const emit = defineEmits(['success', 'register']);
-
-  const { t } = useI18n('sys.menu');
-  const { showMessage } = useMessage();
-  const { meta } = unref(router.currentRoute);
-  const record = ref<Menu>({} as Menu);
-  const getTitle = computed(() => ({
-    icon: meta.icon || 'ant-design:book-outlined',
-    value: record.value.isNewRecord ? t('新增菜单') : t('编辑菜单'),
-  }));
-
-  const inputFormSchemas: FormSchema[] = [
-    {
-      label: t('上级菜单'),
-      field: 'parentCode',
-      fieldLabel: 'parentName',
-      component: 'TreeSelect',
-      componentProps: {
-        allowClear: true,
-      },
-    },
-    {
-      label: t('菜单类型'),
-      field: 'menuType',
-      component: 'RadioButtonGroup',
-      componentProps: {
-        dictType: 'sys_menu_type',
-      },
-      defaultValue: '1',
-    },
-
-    {
-      label: t('菜单名称'),
-      field: 'menuNameRaw',
-      component: 'Input',
-      componentProps: {
-        maxlength: 50,
-      },
-      required: true,
-    },
-    {
-      label: t('归属模块'),
-      field: 'moduleCodes',
-      component: 'Select',
-      componentProps: {
-        mode: 'multiple',
-      },
-      defaultValue: 'core',
-      required: true,
-    },
-
-    {
-      label: t('链接地址'),
-      field: 'menuHref',
-      helpMessage: [
-        '一、路由规则：',
-        '　1、设置菜单的路由地址，对应组件目录为 /views/ 下的 vue 文件',
-        '　2、路由名称定义规则为：Views + 去除地址的 “/”，并后一个字母大写，',
-        '　　　例如：路由地址为：/sys/menu/list，路径名称为：ViewsSysMenuList，',
-        '　3、组件名称定义规则为：/views/ 目录 + 路由地址 目录，上面举例的路由地址',
-        '　4、对应的组件名称应为：/views/sys/menu/list，组件名称：与路由名称相同',
-        '　5、注意：如果组件名称与路由名称不同，会造成页面缓存失效。',
-        '二、链接前缀：',
-        '　1、链接支持 http(s):// 开头的链接，则自动使用 iframe 打开',
-        '　2、如果以  /// 开头，则代表是站点根路径（结果：http://localhost/{href}）',
-        '　3、如果以  // 开头，则代表是工程根路径（结果：http://localhost/{ctxPath}/{href}）',
-        '　4、如果以  / 开头，则代表是管理根路径（默认）（结果：',
-        '　　　http://localhost/{ctxPath}/{adminPath}/{href}）',
-        '三、可带变量： 格式为  {变量名} ',
-        '　1、{ssoToken} : 单点登录的token编码，url参数中的参数分隔符请使用“%26”进行转义，',
-        '　　　例如：{projectUrl}/sso/{ssoToken}?url=/sys/user/list?p1=v1%26p2=v2&relogin=true',
-        '　2、{userCode} : 当前用户编码',
-        '　3、{userName} : 当前用户名称',
-        '　4、{userType} : 当前用户类型',
-        '　5、{corpCode} : 当前用户编码',
-        '　6、{corpName} : 当前用户名称',
-        '　7、{menuCode} : 当前菜单编码',
-        '　8、{menuParentCode} : 当前菜单上级编码',
-        '　9、{menuParentCodes} : 当前菜单所有上级编码',
-        '　10、userCache 中的 Key 可作为变量名',
-        '　11、yml 或 sys_config 中的 Key 可作为变量名',
-      ],
-      component: 'Input',
-      componentProps: {
-        maxlength: 2000,
-      },
-    },
-    {
-      label: t('链接目标'),
-      field: 'menuTarget',
-      helpMessage: '如果 “链接地址” 为 http(s):// 开头，目标设置为 _blank，则为新窗口打开',
-      component: 'Input',
-      componentProps: {
-        maxlength: 10,
-      },
-    },
-
-    {
-      label: t('组件名称'),
-      field: 'component',
-      helpMessage: [
-        '设置 vue 组件名称，一般不需要填写，默认是根据 “链接地址” 进行自动生成，',
-        '只有个性化的时候才需要设置，如果填写 IFRAME 则强制使用 iframe 打开链接；',
-        '如果填写 LAYOUT 将不在 Beetl 视图中显示菜单项',
-        '如果填写 BEETL 则只在 Beetl 视图中显示菜单项',
-      ],
-      component: 'Input',
-      componentProps: {
-        maxlength: 500,
-      },
-      // show: ({ values }) => values.menuType === '1',
-    },
-    {
-      label: t('组件参数'),
-      field: 'params',
-      helpMessage: [
-        '可选，给组件传参，请填写 JSON 格式，前端通过定义 props 获取',
-        "举例：链接地址填写：/test/params   组件参数填写：{aa:'aa1',bb:'bb2'}",
-      ],
-      component: 'Input',
-      componentProps: {
-        maxlength: 500,
-      },
-      // show: ({ values }) => values.menuType === '1',
-    },
-
-    {
-      label: t('排序号'),
-      field: 'treeSort',
-      helpMessage: '升序',
-      component: 'InputNumber',
-      defaultValue: '30',
-      componentProps: {
-        maxlength: 10,
-      },
-      required: true,
-    },
-    {
-      label: t('权限标识'),
-      field: 'permission',
-      helpMessage: '控制器中定义的权限标识，如：@RequiresPermissions("权限标识")',
-      component: 'Input',
-      componentProps: {
-        maxlength: 100,
-      },
-    },
-
-    {
-      label: t('菜单图标'),
-      field: 'menuIcon',
-      component: 'IconPicker',
-      show: ({ values }) => values.menuType === '1',
-    },
-    {
-      label: t('字体颜色'),
-      field: 'menuColor',
-      component: 'Input',
-      componentProps: {
-        maxlength: 50,
-      },
-      show: ({ values }) => values.menuType === '1',
-    },
-
-    {
-      label: t('页签标题'),
-      field: 'menuTitle',
-      component: 'Input',
-      componentProps: {
-        maxlength: 50,
-      },
-      show: ({ values }) => values.menuType === '1',
-    },
-    {
-      label: t('是否可见'),
-      field: 'isShow',
-      component: 'RadioGroup',
-      defaultValue: '0',
-      componentProps: {
-        dictType: 'sys_show_hide',
-      },
-    },
-
-    {
-      label: t('菜单权重'),
-      field: 'weight',
-      component: 'Select',
-      defaultValue: 40,
-      componentProps: {
-        dictType: 'sys_menu_weight',
-      },
-      required: true,
-    },
-
-    {
-      label: t('备注信息'),
-      field: 'remarks',
-      component: 'InputTextArea',
-      componentProps: {
-        maxlength: 200,
-      },
-      colProps: { lg: 24, md: 24 },
-    },
-  ];
-
-  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
-    labelWidth: 120,
-    schemas: inputFormSchemas,
-    baseColProps: { lg: 12, md: 24 },
-  });
-
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
-    await resetFields();
-    const res = await menuForm(data);
-    record.value = (res.menu || {}) as Menu;
-    if (data.parentCode && data.parentName) {
-      record.value.parentCode = data.parentCode;
-      record.value.parentName = data.parentName;
-    }
-    setFieldsValue(record.value);
-    updateSchema([
-      {
-        field: 'parentCode',
-        componentProps: {
-          api: menuTreeData,
-          params: {
-            sysCode: record.value.sysCode,
-            excludeCode: record.value.menuCode,
-            isShowRawName: true,
-          },
-        },
-      },
-      {
-        field: 'moduleCodes',
-        componentProps: {
-          options: res.moduleList.map((item) => ({
-            label: item.moduleName,
-            value: item.moduleCode,
-          })),
-        },
-      },
-    ]);
-    setDrawerProps({ loading: false });
-  });
-
-  async function handleSubmit() {
-    try {
-      const data = await validate();
-      setDrawerProps({ confirmLoading: true });
-      const params: any = {
-        isNewRecord: record.value.isNewRecord,
-        menuCode: record.value.menuCode,
-      };
-      data.sysCode = record.value.sysCode;
-      // console.log('submit', params, data, record);
-      const res = await menuSave(params, data);
-      showMessage(res.message);
-      setTimeout(closeDrawer);
-      emit('success', data);
-    } catch (error: any) {
-      if (error && error.errorFields) {
-        showMessage(t('common.validateError'));
-      }
-      console.log('error', error);
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  }
-</script>
diff --git a/src/views/sys/menu/index.vue b/src/views/sys/menu/index.vue
deleted file mode 100644
index 8a7a2d2..0000000
--- a/src/views/sys/menu/index.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author ThinkGem
--->
-<template>
-  <PageWrapper :sidebarWidth="230">
-    <template #sidebar>
-      <BasicTree
-        :search="true"
-        :toolbar="true"
-        :showIcon="true"
-        :api="menuTreeData"
-        :params="apiParams"
-        :defaultExpandLevel="1"
-        @select="handleSelect"
-      >
-        <template #headerTitle>
-          <Dropdown class="cursor-pointer" :trigger="['hover']" :dropMenuList="dropMenuList">
-            {{ sysName }} <DownOutlined />
-          </Dropdown>
-        </template>
-      </BasicTree>
-    </template>
-    <ListView :treeCode="treeCode" :sysCode="sysCode" />
-  </PageWrapper>
-</template>
-<script lang="ts" setup name="ViewsSysMenuIndex">
-  import { ref, onMounted } from 'vue';
-  import { DownOutlined } from '@ant-design/icons-vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useDict } from '/@/components/Dict';
-  import { Dropdown, DropMenu } from '/@/components/Dropdown';
-  import { PageWrapper } from '/@/components/Page';
-  import { BasicTree } from '/@/components/Tree';
-  import { Menu, menuIndex, menuTreeData } from '/@/api/sys/menu';
-  import ListView from './list.vue';
-
-  const { t } = useI18n('sys.menu');
-  const treeCode = ref<string>('');
-  const apiParams = ref<Recordable>({ sysCode: 'default' });
-
-  const dropMenuList = ref<Array<DropMenu>>([]);
-  const sysCode = ref<string>('default');
-  const sysName = ref<string>(t('菜单'));
-
-  onMounted(async () => {
-    const res = await menuIndex();
-    const menu = (res.menu || {}) as Menu;
-    sysCode.value = menu.sysCode || 'default';
-    loadSysCode();
-  });
-
-  async function loadSysCode() {
-    dropMenuList.value = (await useDict().initGetDictList('sys_menu_sys_code')).map((item) => {
-      if (item.value == sysCode.value) {
-        sysName.value = item.name;
-      }
-      return {
-        text: item.name,
-        event: item.value,
-        icon: 'radix-icons:dot',
-        onClick: () => {
-          sysCode.value = item.value;
-          sysName.value = item.name;
-          apiParams.value.sysCode = item.value;
-        },
-      };
-    });
-  }
-
-  function handleSelect(keys: string[]) {
-    treeCode.value = keys[0];
-  }
-</script>
diff --git a/src/views/sys/menu/list.vue b/src/views/sys/menu/list.vue
deleted file mode 100644
index 1b32c8c..0000000
--- a/src/views/sys/menu/list.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<!--
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author ThinkGem
--->
-<template>
-  <div>
-    <BasicTable @register="registerTable" @fetchSuccess="fetchSuccess">
-      <template #tableTitle>
-        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
-        <span> {{ getTitle.value }} </span>
-      </template>
-      <template #toolbar>
-        <a-button @click="expandAll" :title="t('展开一级')">
-          <Icon icon="bi:chevron-double-down" /> {{ t('展开') }}
-        </a-button>
-        <a-button @click="collapseAll" :title="t('折叠全部')">
-          <Icon icon="bi:chevron-double-up" /> {{ t('折叠') }}
-        </a-button>
-        <a-button type="primary" @click="handleForm({})" v-auth="'sys:menu:edit'">
-          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
-        </a-button>
-      </template>
-      <template #firstColumn="{ record }">
-        <Icon
-          :icon="record.menuIcon || 'ant-design:file-outlined'"
-          @click="expandCollapse(record)"
-          class="text-base w-5 mr-2"
-        />
-        <a @click="handleForm(record)" :title="record.menuNameRaw">
-          {{ record.menuNameRaw }}
-        </a>
-      </template>
-    </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
-  </div>
-</template>
-<script lang="ts" setup name="ViewsSysMenuList">
-  import { unref, watch, nextTick } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
-  import { menuDelete, menuDisable, menuEnable, menuListData } from '/@/api/sys/menu';
-  import { useDrawer } from '/@/components/Drawer';
-  import { FormProps } from '/@/components/Form';
-  import InputForm from './form.vue';
-
-  const props = defineProps({
-    treeCode: String,
-    sysCode: String,
-  });
-
-  const { t } = useI18n('sys.menu');
-  const { showMessage } = useMessage();
-  const { meta } = unref(router.currentRoute);
-  const getTitle = {
-    icon: meta.icon || 'ant-design:book-outlined',
-    value: meta.title || t('菜单管理'),
-  };
-
-  const searchForm: FormProps = {
-    baseColProps: { lg: 6, md: 8 },
-    labelWidth: 90,
-    schemas: [
-      {
-        label: t('菜单名称'),
-        field: 'menuNameRaw',
-        component: 'Input',
-      },
-      {
-        label: t('状态'),
-        field: 'status',
-        component: 'Select',
-        componentProps: {
-          dictType: 'sys_search_status',
-          allowClear: true,
-          onChange: handleSuccess,
-        },
-      },
-    ],
-  };
-
-  const tableColumns: BasicColumn[] = [
-    {
-      title: t('菜单名称'),
-      dataIndex: 'menuNameRaw',
-      width: 230,
-      align: 'left',
-      slot: 'firstColumn',
-    },
-    {
-      title: t('归属模块'),
-      dataIndex: 'moduleCodes',
-      width: 110,
-    },
-    {
-      title: t('地址'),
-      dataIndex: 'menuHref',
-      align: 'left',
-      width: 130,
-    },
-    {
-      title: t('排序号'),
-      dataIndex: 'treeSort',
-      width: 80,
-    },
-    {
-      title: t('类型'),
-      dataIndex: 'menuType',
-      width: 70,
-      dictType: 'sys_menu_type',
-    },
-    {
-      title: t('可见'),
-      dataIndex: 'isShow',
-      width: 70,
-      dictType: 'sys_show_hide',
-    },
-    {
-      title: t('权限标识'),
-      dataIndex: 'permission',
-      width: 130,
-      align: 'left',
-    },
-    {
-      title: t('状态'),
-      dataIndex: 'status',
-      width: 70,
-      dictType: 'sys_status',
-    },
-    {
-      title: t('菜单权重'),
-      dataIndex: 'weight',
-      width: 120,
-      dictType: 'sys_menu_weight',
-    },
-  ];
-
-  const actionColumn: BasicColumn = {
-    width: 160,
-    actions: (record: Recordable) => [
-      {
-        icon: 'clarity:note-edit-line',
-        title: t('编辑菜单'),
-        onClick: handleForm.bind(this, record),
-        auth: 'sys:menu:edit',
-      },
-      {
-        icon: 'ant-design:stop-outlined',
-        color: 'error',
-        title: t('停用菜单'),
-        popConfirm: {
-          title: t('是否确认停用菜单'),
-          confirm: handleDisable.bind(this, record),
-        },
-        auth: 'sys:menu:edit',
-        ifShow: () => record.status === '0',
-      },
-      {
-        icon: 'ant-design:check-circle-outlined',
-        color: 'success',
-        title: t('启用菜单'),
-        popConfirm: {
-          title: t('是否确认启用菜单'),
-          confirm: handleEnable.bind(this, record),
-        },
-        auth: 'sys:menu:edit',
-        ifShow: () => record.status === '2',
-      },
-      {
-        icon: 'ant-design:delete-outlined',
-        color: 'error',
-        title: t('删除菜单'),
-        popConfirm: {
-          title: t('是否确认删除菜单'),
-          confirm: handleDelete.bind(this, record),
-        },
-        auth: 'sys:menu:edit',
-      },
-      {
-        icon: 'fluent:add-circle-24-regular',
-        title: t('新增下级菜单'),
-        onClick: handleForm.bind(this, {
-          parentCode: record.menuCode,
-          parentName: record.menuNameRaw,
-        }),
-        auth: 'sys:menu:edit',
-      },
-    ],
-  };
-
-  const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerTable, { reload, expandAll, collapseAll, expandCollapse }] = useTable({
-    api: menuListData,
-    beforeFetch: (params) => {
-      params.sysCode = props.sysCode || 'default';
-      params.menuCode = props.treeCode;
-      return params;
-    },
-    columns: tableColumns,
-    actionColumn: actionColumn,
-    formConfig: searchForm,
-    showTableSetting: true,
-    useSearchForm: true,
-    isTreeTable: true,
-    pagination: false,
-    canResize: true,
-  });
-
-  watch([() => props.treeCode, () => props.sysCode], () => {
-    reload();
-  });
-
-  function fetchSuccess() {
-    if (props.treeCode) {
-      nextTick(expandAll);
-    }
-  }
-
-  function handleForm(record: Recordable) {
-    const data = {
-      menuCode: record.menuCode,
-      parentCode: record.parentCode,
-      parentName: record.parentName,
-      sysCode: props.sysCode,
-    };
-    openDrawer(true, data);
-  }
-
-  async function handleDisable(record: Recordable) {
-    const data = { menuCode: record.menuCode };
-    const res = await menuDisable(data);
-    showMessage(res.message);
-    handleSuccess(record);
-  }
-
-  async function handleEnable(record: Recordable) {
-    const data = { menuCode: record.menuCode };
-    const res = await menuEnable(data);
-    showMessage(res.message);
-    handleSuccess(record);
-  }
-
-  async function handleDelete(record: Recordable) {
-    const data = { menuCode: record.menuCode };
-    const res = await menuDelete(data);
-    showMessage(res.message);
-    handleSuccess(record);
-  }
-
-  function handleSuccess(record: Recordable) {
-    reload({ parentCode: record.parentCode });
-  }
-</script>
diff --git a/src/views/sys/post/form.vue b/src/views/sys/post/form.vue
deleted file mode 100644
index 0a9ac44..0000000
--- a/src/views/sys/post/form.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<!--
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author ThinkGem
--->
-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    :showFooter="true"
-    :okAuth="'sys:post:edit'"
-    @register="registerDrawer"
-    @ok="handleSubmit"
-    width="60%"
-  >
-    <template #title>
-      <Icon :icon="getTitle.icon" class="pr-1 m-1" />
-      <span> {{ getTitle.value }} </span>
-    </template>
-    <BasicForm @register="registerForm" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup name="ViewsSysPostForm">
-  import { ref, unref, computed } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { Post, postSave, postForm } from '/@/api/sys/post';
-  import { roleTreeData } from '/@/api/sys/role';
-
-  const emit = defineEmits(['success', 'register']);
-
-  const { t } = useI18n('sys.post');
-  const { showMessage } = useMessage();
-  const { meta } = unref(router.currentRoute);
-  const record = ref<Post>({} as Post);
-  const getTitle = computed(() => ({
-    icon: meta.icon || 'ant-design:book-outlined',
-    value: record.value.isNewRecord ? t('新增岗位') : t('编辑岗位'),
-  }));
-
-  const inputFormSchemas: FormSchema[] = [
-    {
-      label: t('岗位名称'),
-      field: 'postName',
-      component: 'Input',
-      componentProps: {
-        maxlength: 100,
-      },
-      required: true,
-    },
-    {
-      label: t('岗位代码'),
-      field: 'viewCode',
-      component: 'Input',
-      componentProps: {
-        maxlength: 500,
-      },
-    },
-    {
-      label: t('岗位分类'),
-      field: 'postType',
-      component: 'Select',
-      componentProps: {
-        dictType: 'sys_post_type',
-        allowClear: true,
-      },
-    },
-    {
-      label: t('排序号'),
-      field: 'postSort',
-      helpMessage: '升序',
-      component: 'InputNumber',
-      defaultValue: '30',
-      componentProps: {
-        maxlength: 10,
-      },
-      required: true,
-    },
-    {
-      label: t('关联角色'),
-      field: 'roleCodes',
-      fieldLabel: 'roleNames',
-      component: 'TreeSelect',
-      componentProps: {
-        api: roleTreeData,
-        treeCheckable: true,
-      },
-      colProps: { lg: 24, md: 24 },
-    },
-    {
-      label: t('备注信息'),
-      field: 'remarks',
-      component: 'InputTextArea',
-      componentProps: {
-        maxlength: 500,
-      },
-      colProps: { lg: 24, md: 24 },
-    },
-  ];
-
-  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({
-    labelWidth: 120,
-    schemas: inputFormSchemas,
-    baseColProps: { lg: 12, md: 24 },
-  });
-
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
-    await resetFields();
-    const res = await postForm(data);
-    record.value = (res.post || {}) as Post;
-    record.value.roleCodes = res.roleCodes || '';
-    record.value.roleNames = res.roleNames || '';
-    setFieldsValue(record.value);
-    updateSchema([
-      {
-        field: 'viewCode',
-        componentProps: {
-          disabled: !record.value.isNewRecord,
-        },
-      },
-    ]);
-    setDrawerProps({ loading: false });
-  });
-
-  async function handleSubmit() {
-    try {
-      const data = await validate();
-      setDrawerProps({ confirmLoading: true });
-      const params: any = {
-        isNewRecord: record.value.isNewRecord,
-        postCode: record.value.postCode,
-        oldRoleName: record.value.postName,
-      };
-      // console.log('submit', params, data, record);
-      const res = await postSave(params, data);
-      showMessage(res.message);
-      setTimeout(closeDrawer);
-      emit('success', data);
-    } catch (error: any) {
-      if (error && error.errorFields) {
-        showMessage(t('common.validateError'));
-      }
-      console.log('error', error);
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  }
-</script>
diff --git a/src/views/sys/post/list.vue b/src/views/sys/post/list.vue
deleted file mode 100644
index 336b1f7..0000000
--- a/src/views/sys/post/list.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<!--
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author ThinkGem
--->
-<template>
-  <div>
-    <BasicTable @register="registerTable">
-      <template #tableTitle>
-        <Icon :icon="getTitle.icon" class="m-1 pr-1" />
-        <span> {{ getTitle.value }} </span>
-      </template>
-      <template #toolbar>
-        <a-button type="primary" @click="handleForm({})" v-auth="'sys:post:edit'">
-          <Icon icon="fluent:add-12-filled" /> {{ t('新增') }}
-        </a-button>
-      </template>
-      <template #firstColumn="{ record }">
-        <a @click="handleForm({ postCode: record.postCode })">
-          {{ record.postName }}
-        </a>
-      </template>
-    </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
-  </div>
-</template>
-<script lang="ts" setup name="ViewsSysPostList">
-  import { unref } from 'vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { router } from '/@/router';
-  import { Icon } from '/@/components/Icon';
-  import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
-  import { postDelete, postListData } from '/@/api/sys/post';
-  import { postDisable, postEnable } from '/@/api/sys/post';
-  import { useDrawer } from '/@/components/Drawer';
-  import { FormProps } from '/@/components/Form';
-  import InputForm from './form.vue';
-
-  const { t } = useI18n('sys.post');
-  const { showMessage } = useMessage();
-  const { meta } = unref(router.currentRoute);
-  const getTitle = {
-    icon: meta.icon || 'ant-design:book-outlined',
-    value: meta.title || t('岗位管理'),
-  };
-
-  const searchForm: FormProps = {
-    baseColProps: { lg: 6, md: 8 },
-    labelWidth: 90,
-    schemas: [
-      {
-        label: t('岗位名称'),
-        field: 'postName',
-        component: 'Input',
-      },
-      {
-        label: t('岗位代码'),
-        field: 'viewCode',
-        component: 'Input',
-      },
-      {
-        label: t('状态'),
-        field: 'status',
-        component: 'Select',
-        componentProps: {
-          dictType: 'sys_search_status',
-          allowClear: true,
-          onChange: handleSuccess,
-        },
-      },
-      {
-        label: t('岗位分类'),
-        field: 'postType',
-        component: 'Select',
-        componentProps: {
-          dictType: 'sys_post_type',
-          allowClear: true,
-        },
-      },
-    ],
-  };
-
-  const tableColumns: BasicColumn[] = [
-    {
-      title: t('岗位名称'),
-      dataIndex: 'postName',
-      key: 'a.post_name',
-      sorter: true,
-      width: 130,
-      align: 'center',
-      slot: 'firstColumn',
-    },
-    {
-      title: t('岗位代码'),
-      dataIndex: 'viewCode',
-      key: 'a.view_code',
-      sorter: true,
-      width: 130,
-      align: 'center',
-    },
-    {
-      title: t('岗位分类'),
-      dataIndex: 'postType',
-      key: 'a.post_type',
-      sorter: true,
-      width: 130,
-      align: 'center',
-      dictType: 'sys_post_type',
-    },
-    {
-      title: t('排序'),
-      dataIndex: 'postSort',
-      key: 'a.post_sort',
-      sorter: true,
-      width: 100,
-      align: 'center',
-    },
-    {
-      title: t('状态'),
-      dataIndex: 'status',
-      key: 'a.status',
-      sorter: true,
-      width: 100,
-      align: 'center',
-      dictType: 'sys_status',
-    },
-    {
-      title: t('更新时间'),
-      dataIndex: 'updateDate',
-      key: 'a.update_date',
-      sorter: true,
-      width: 130,
-      align: 'center',
-    },
-    {
-      title: t('备注信息'),
-      dataIndex: 'remarks',
-      key: 'a.remarks',
-      sorter: true,
-      width: 130,
-      align: 'left',
-    },
-  ];
-
-  const actionColumn: BasicColumn = {
-    width: 160,
-    actions: (record: Recordable) => [
-      {
-        icon: 'clarity:note-edit-line',
-        title: t('编辑岗位'),
-        onClick: handleForm.bind(this, { postCode: record.postCode }),
-        auth: 'sys:post:edit',
-      },
-      {
-        icon: 'ant-design:stop-outlined',
-        color: 'error',
-        title: t('停用岗位'),
-        popConfirm: {
-          title: t('是否确认停用岗位'),
-          confirm: handleDisable.bind(this, { postCode: record.postCode }),
-        },
-        auth: 'sys:role:edit',
-        ifShow: () => record.status === '0',
-      },
-      {
-        icon: 'ant-design:check-circle-outlined',
-        color: 'success',
-        title: t('启用岗位'),
-        popConfirm: {
-          title: t('是否确认启用岗位'),
-          confirm: handleEnable.bind(this, { postCode: record.postCode }),
-        },
-        auth: 'sys:role:edit',
-        ifShow: () => record.status === '2',
-      },
-      {
-        icon: 'ant-design:delete-outlined',
-        color: 'error',
-        title: t('删除岗位'),
-        popConfirm: {
-          title: t('是否确认删除岗位'),
-          confirm: handleDelete.bind(this, { postCode: record.postCode }),
-        },
-        auth: 'sys:post:edit',
-      },
-    ],
-  };
-
-  const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerTable, { reload }] = useTable({
-    api: postListData,
-    beforeFetch: (params) => {
-      return params;
-    },
-    columns: tableColumns,
-    actionColumn: actionColumn,
-    formConfig: searchForm,
-    showTableSetting: true,
-    useSearchForm: true,
-    canResize: true,
-  });
-
-  function handleForm(record: Recordable) {
-    openDrawer(true, record);
-  }
-
-  async function handleDisable(record: Recordable) {
-    const res = await postDisable(record);
-    showMessage(res.message);
-    handleSuccess();
-  }
-
-  async function handleEnable(record: Recordable) {
-    const res = await postEnable(record);
-    showMessage(res.message);
-    handleSuccess();
-  }
-
-  async function handleDelete(record: Recordable) {
-    const res = await postDelete(record);
-    showMessage(res.message);
-    handleSuccess();
-  }
-
-  function handleSuccess() {
-    reload();
-  }
-</script>
-- 
Gitee


From 1be78d0592deb6ac55d63b1172f14638d769bdd9 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Mon, 1 Apr 2024 18:03:49 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=E5=85=B1=E4=BA=AB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=95=B0=E6=8D=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/things/telemetry/attributeFrom.vue | 110 +++++++++++++++++++
 src/views/things/telemetry/index.vue         |  19 +++-
 2 files changed, 124 insertions(+), 5 deletions(-)
 create mode 100644 src/views/things/telemetry/attributeFrom.vue

diff --git a/src/views/things/telemetry/attributeFrom.vue b/src/views/things/telemetry/attributeFrom.vue
new file mode 100644
index 0000000..b965d9a
--- /dev/null
+++ b/src/views/things/telemetry/attributeFrom.vue
@@ -0,0 +1,110 @@
+<template>
+    <BasicModal v-bind="$attrs" @register="registerModal" @ok="handleSubmit" width="40%">
+        <template #title>
+            <span>
+                添加属性
+            </span>
+        </template>
+        <Form ref="formRef" :model="formState" layout="vertical">
+
+            <Form.Item label="键名" name="key" :rules="[{ required: true, message: '请输入键名!' }]">
+                <Input v-model:value="formState.key" placeholder="输入键名" />
+            </Form.Item>
+            <Row :gutter="20">
+                <Col :span="12">
+                <Form.Item label="值类型" name="type" :rules="[{ required: true, message: '请选择值类型!' }]">
+                    <Select v-model:value="formState.type" :default-value="'STRING'" :options="typeOptions" />
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item :label="typeOptions.find(type => type.value == formState.type)?.label + '值'" name="value"
+                    :rules="[{ required: true, message: '请输入数值!' }]">
+                    <Input v-if="formState.type == 'STRING'" v-model:value="formState.value" placeholder="请输入字符串值" />
+                    <InputNumber v-if="formState.type == 'NUMERIC'" :precision="0" :step="1" v-model:value="formState.value"
+                        :style="{ width: '100%' }" placeholder="请输入数值" />
+                    <InputNumber v-if="formState.type == 'DOUBLE'" :precision="2" :step="0.01"
+                        v-model:value="formState.value" :style="{ width: '100%' }" placeholder="请输入小数值" />
+                    <Radio.Group v-if="formState.type == 'BOOLEAN'" v-model:value="formState.value">
+                        <Radio :value=true>真</Radio>
+                        <Radio :value=false>假</Radio>
+                    </Radio.Group>
+                    <Textarea v-if="formState.type == 'JSON'" v-model:value="formState.value" placeholder="输入JSON值" />
+                </Form.Item>
+                </Col>
+
+            </Row>
+
+        </Form>
+    </BasicModal>
+</template>
+<script lang="ts" setup name="AttributeFrom">
+import { ref, reactive } from 'vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { Form, Input, Radio, Textarea, InputNumber, Row, Col, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { saveEntityAttributesV1 } from '/@/api/things/telemetry';
+import { Scope } from '/@/enums/telemetryEnum';
+
+const { showMessage } = useMessage();
+
+const formRef = ref<FormInstance>();
+
+const record = ref<any>();
+
+const entityType = ref('');
+const entityId = ref('');
+const scope = ref<Scope>(Scope.SERVER_SCOPE);
+
+const formState = reactive<any>({
+    key: '',
+    value: undefined,
+    type: '',
+});
+
+const typeOptions = [
+    { value: 'STRING', label: '字符串' },
+    { value: 'NUMERIC', label: '整数' },
+    { value: 'DOUBLE', label: '小数' },
+    { value: 'BOOLEAN', label: '布尔' },
+    { value: 'JSON', label: 'JSON' },
+]
+
+
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
+    clear();
+    entityType.value = data.entityType;
+    entityId.value = data.entityId;
+    scope.value = data.scope || Scope.SERVER_SCOPE;
+    record.value = data.attribute;
+    setModalProps({ loading: false });
+});
+
+function clear() {
+    entityType.value = '';
+    entityId.value = '';
+    scope.value = Scope.SERVER_SCOPE;
+    formState.key = '';
+    formState.value = undefined;
+    formState.type = 'STRING';
+}
+
+async function handleSubmit() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            let result = {};
+            result[data.key] = data.value
+            setModalProps({ confirmLoading: true });
+            const res = await saveEntityAttributesV1({ entityType: entityType.value, id: entityId.value }, scope.value, result);
+            showMessage(`添加属性成功！`);
+        }
+    } catch (error: any) {
+        throw error;
+    } finally {
+        setModalProps({ confirmLoading: false });
+    }
+}
+
+</script>
\ No newline at end of file
diff --git a/src/views/things/telemetry/index.vue b/src/views/things/telemetry/index.vue
index b403c56..0ad4625 100644
--- a/src/views/things/telemetry/index.vue
+++ b/src/views/things/telemetry/index.vue
@@ -7,6 +7,10 @@
             <Segmented v-model:value="selectedScope" :options="typeTabList" @change="handleScopeChange" />
           </div>
           <Space :size="1" class="mx-4">
+            <Tooltip title="添加属性"
+              v-if="selectedScope != LATEST_TELEMETRY && selectedScope != Scope.CLIENT_SCOPE && showSelectedButton != true">
+              <Icon icon="ant-design:plus-outlined" :size="20" class="cursor-pointer" @click="addAttribute" />
+            </Tooltip>
             <Tooltip title="刷新数据" v-if="selectedScope != LATEST_TELEMETRY && showSelectedButton != true">
               <Icon icon="ant-design:redo-outlined" :size="20" class="cursor-pointer" @click="fetchAttributes" />
             </Tooltip>
@@ -52,6 +56,7 @@
         </List.Item>
       </template>
     </List>
+    <AttributeModal @register="registerAttributeModal" @success="handleSuccess" />
     <TimeseriesModal @register="registerTimeseriesModal" />
     <DeleteModal @register="registerDeleteModal" @success="handleSuccess" />
   </div>
@@ -62,7 +67,7 @@ export default defineComponent({
 });
 </script>
 <script lang="ts" setup>
-import { PropType, defineComponent, ref, onMounted, computed, reactive, onBeforeUnmount, watchEffect } from 'vue';
+import { PropType, defineComponent, ref, onMounted, computed, reactive, onBeforeUnmount } from 'vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { Icon } from '/@/components/Icon';
@@ -78,6 +83,7 @@ import { getAttributesByScope, deleteEntityAttributes, getLatestTimeseries } fro
 import TimeseriesChart from './timeseriesChart.vue';
 import TimeseriesModal from './timeseriesModal.vue';
 import { isBoolean } from 'lodash';
+import AttributeModal from './attributeFrom.vue';
 import DeleteModal from './delete.vue';
 const LATEST_TELEMETRY = "LATEST_TELEMETRY";
 
@@ -102,8 +108,8 @@ const props = defineProps({
 
 const typeTabList = reactive([
   { value: LATEST_TELEMETRY, label: '时序数据', className: 'segment-tab' },
-  { value: Scope.SERVER_SCOPE, label: '服务端属性', className: 'segment-tab' },
   { value: Scope.CLIENT_SCOPE, label: '客户端属性', className: 'segment-tab' },
+  { value: Scope.SERVER_SCOPE, label: '服务端属性', className: 'segment-tab' },
   { value: Scope.SHARED_SCOPE, label: '共享属性', className: 'segment-tab' },
 ]);
 const selectedScope = ref(LATEST_TELEMETRY);
@@ -148,10 +154,10 @@ const tableColumns: BasicColumn[] = [
   },
 ]
 
-
+const [registerAttributeModal, { openModal: openAttributeModal }] = useModal();
 const [registerTimeseriesModal, { openModal: openTimeseriesModal }] = useModal();
 const [registerDeleteModal, { openModal: openDeleteModal }] = useModal();
-const [registerTable, { reload, updateColumn, setSelectedRowKeys }] = useTable({
+const [registerTable, { setSelectedRowKeys }] = useTable({
   rowKey: 'key',
   columns: tableColumns,
   showTableSetting: false,
@@ -175,7 +181,6 @@ async function handleScopeChange(scope: string) {
   }
 }
 
-
 async function fetchAttributes() {
   try {
     loading.value = true;
@@ -304,6 +309,10 @@ function handleTimeseriesModal() {
   openTimeseriesModal(true, { entityType: props.entityType, entityId: props.entityId, keys: selectedRowKeys.value })
 }
 
+function addAttribute() {
+  openAttributeModal(true, { entityType: props.entityType, entityId: props.entityId, scope: selectedScope.value, attribute: {} })
+}
+
 
 </script>
 
-- 
Gitee


From c66a992ad7dfb5ad36f99caeaa98ecedc5b90172 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 2 Apr 2024 15:31:26 +0800
Subject: [PATCH 03/38] =?UTF-8?q?websocket=20=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development           | 2 +-
 .env.production            | 2 +-
 src/hooks/setting/index.ts | 6 +++---
 src/utils/env.ts           | 4 ++--
 types/config.d.ts          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index a6c3ff9..2c6ac5c 100644
--- a/.env.development
+++ b/.env.development
@@ -22,7 +22,7 @@ VITE_GLOB_API_URL_PREFIX =
 # 访问接口的管理基础路径
 VITE_GLOB_ADMIN_PATH = 
 
-VITE_WS_URL_PREFIX = '/api/ws/plugins'
+VITE_GLOB_WS_PREFIX = '/api/ws/plugins'
 
 # 上传文件接口的根路径（5.5.2+弃用）
 # VITE_GLOB_UPLOAD_URL = /upload
diff --git a/.env.production b/.env.production
index bc05943..6e675f4 100644
--- a/.env.production
+++ b/.env.production
@@ -26,7 +26,7 @@ VITE_GLOB_API_URL_PREFIX =
 # 访问接口的管理基础路径
 VITE_GLOB_ADMIN_PATH = 
 
-VITE_WS_URL_PREFIX = '/api/ws/plugins'
+VITE_GLOB_WS_PREFIX = '/api/ws/plugins'
 
 # 上传文件接口的根路径（5.5.2+弃用）
 # VITE_GLOB_UPLOAD_URL = /upload
diff --git a/src/hooks/setting/index.ts b/src/hooks/setting/index.ts
index dd7e027..d0cd2d7 100644
--- a/src/hooks/setting/index.ts
+++ b/src/hooks/setting/index.ts
@@ -9,7 +9,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
-    VITE_WS_URL_PREFIX,
+    VITE_GLOB_WS_PREFIX,
     VITE_PROXY
     // VITE_GLOB_UPLOAD_URL,
   } = getAppEnvConfig();
@@ -37,10 +37,10 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
 
   const wsPath = ((): string => {
     if (isProdMode()) {
-      return `${location.protocol.replace('https:', 'wss://').replace('http:', 'ws://')}${location.host}${VITE_WS_URL_PREFIX}`;
+      return `${location.protocol.replace('https:', 'wss://').replace('http:', 'ws://')}${location.host}${VITE_GLOB_WS_PREFIX}`;
     }
     const proxyHost = VITE_PROXY[0][1].replace(VITE_PROXY[0][0], '');
-    return `${proxyHost.replace('https:', 'wss://').replace('http:', 'ws://')}${VITE_WS_URL_PREFIX}`;
+    return `${proxyHost.replace('https:', 'wss://').replace('http:', 'ws://')}${VITE_GLOB_WS_PREFIX}`;
   })();
 
 
diff --git a/src/utils/env.ts b/src/utils/env.ts
index fa7158f..5a393a7 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -28,7 +28,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
-    VITE_WS_URL_PREFIX,
+    VITE_GLOB_WS_PREFIX,
     // VITE_GLOB_UPLOAD_URL,
   } = ENV;
 
@@ -44,7 +44,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
-    VITE_WS_URL_PREFIX,
+    VITE_GLOB_WS_PREFIX,
     // VITE_GLOB_UPLOAD_URL,
   };
 }
diff --git a/types/config.d.ts b/types/config.d.ts
index 0ca21e6..4e2b55d 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -166,7 +166,7 @@ export interface GlobEnvConfig {
   // Project abbreviation
   VITE_GLOB_APP_SHORT_NAME: string;
 
-  VITE_WS_URL_PREFIX: string;
+  VITE_GLOB_WS_PREFIX: string;
   // Upload url（5.5.2+弃用）
   // VITE_GLOB_UPLOAD_URL?: string;
 }
-- 
Gitee


From 7ddfebe3f86f7ed05891dc34a0dd55263fe3ad84 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Wed, 3 Apr 2024 11:51:19 +0800
Subject: [PATCH 04/38] =?UTF-8?q?=E9=81=A5=E6=B5=8B=E6=95=B0=E6=8D=AE=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/things/telemetry.ts                  |  8 +++---
 src/enums/telemetryEnum.ts                   |  7 ++++++
 src/views/things/telemetry/attributeFrom.vue | 26 ++++++++++++--------
 src/views/things/telemetry/index.vue         | 13 +++++-----
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/api/things/telemetry.ts b/src/api/things/telemetry.ts
index ef99c5b..a88d40a 100644
--- a/src/api/things/telemetry.ts
+++ b/src/api/things/telemetry.ts
@@ -93,17 +93,17 @@ export function getTimeseries(params: TelemetryQuery) {
 }
 
 
-export function deleteDeviceAttributes(deviceId: string, scope: Scope, keys: string) {
+export function deleteDeviceAttributes(deviceId: string, scope: Scope, keys: Array<string>) {
   return defHttp.delete<void>({
     url: `/api/plugins/telemetry/${deviceId}/${scope}`,
-    params: { keys: keys }
+    params: { keys: keys.join(',') }
   });
 }
 
-export function deleteEntityAttributes(entityId: EntityId<any>, scope: Scope, keys: string) {
+export function deleteEntityAttributes(entityId: EntityId<any>, scope: Scope, keys: Array<string>) {
   return defHttp.delete<void>({
     url: `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/${scope}`,
-    params: { keys: keys }
+    params: { keys: keys.join(',') }
   });
 }
 
diff --git a/src/enums/telemetryEnum.ts b/src/enums/telemetryEnum.ts
index d819819..d56acda 100644
--- a/src/enums/telemetryEnum.ts
+++ b/src/enums/telemetryEnum.ts
@@ -41,4 +41,11 @@ export const AGGREGATION_OPTIONS = [
   { value: Aggregation.AVG, label: '平均值' },
   { value: Aggregation.SUM, label: '求和' },
   { value: Aggregation.COUNT, label: '计数' }
+]
+
+export const SCOPE_OPTIONS = [
+  { value: Scope.CLIENT_SCOPE, label: '客户端属性' },
+  { value: Scope.SERVER_SCOPE, label: '服务端属性' },
+  { value: Scope.SHARED_SCOPE, label: '共享属性' },
+  { value: 'LATEST_TELEMETRY', label: '遥测数据' },
 ]
\ No newline at end of file
diff --git a/src/views/things/telemetry/attributeFrom.vue b/src/views/things/telemetry/attributeFrom.vue
index b965d9a..059a090 100644
--- a/src/views/things/telemetry/attributeFrom.vue
+++ b/src/views/things/telemetry/attributeFrom.vue
@@ -2,7 +2,7 @@
     <BasicModal v-bind="$attrs" @register="registerModal" @ok="handleSubmit" width="40%">
         <template #title>
             <span>
-                添加属性
+                {{ getTitle.value }}
             </span>
         </template>
         <Form ref="formRef" :model="formState" layout="vertical">
@@ -38,22 +38,28 @@
     </BasicModal>
 </template>
 <script lang="ts" setup name="AttributeFrom">
-import { ref, reactive } from 'vue';
+import { ref, computed, reactive } from 'vue';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { Form, Input, Radio, Textarea, InputNumber, Row, Col, Select } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { saveEntityAttributesV1 } from '/@/api/things/telemetry';
-import { Scope } from '/@/enums/telemetryEnum';
+import { Scope, SCOPE_OPTIONS } from '/@/enums/telemetryEnum';
+import { EntityId } from '/#/store';
+
+const emit = defineEmits(['success', 'register']);
 
 const { showMessage } = useMessage();
 
+const getTitle = computed(() => ({
+    value: '添加' + SCOPE_OPTIONS.find(item => item.value == scope.value)?.label || '属性',
+}));
+
 const formRef = ref<FormInstance>();
 
 const record = ref<any>();
 
-const entityType = ref('');
-const entityId = ref('');
+const entityId = ref<EntityId<any>>();
 const scope = ref<Scope>(Scope.SERVER_SCOPE);
 
 const formState = reactive<any>({
@@ -74,16 +80,14 @@ const typeOptions = [
 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
     clear();
-    entityType.value = data.entityType;
-    entityId.value = data.entityId;
+    entityId.value = { entityType: data.entityType, id: data.entityId };
     scope.value = data.scope || Scope.SERVER_SCOPE;
     record.value = data.attribute;
     setModalProps({ loading: false });
 });
 
 function clear() {
-    entityType.value = '';
-    entityId.value = '';
+    entityId.value = undefined;
     scope.value = Scope.SERVER_SCOPE;
     formState.key = '';
     formState.value = undefined;
@@ -97,8 +101,10 @@ async function handleSubmit() {
             let result = {};
             result[data.key] = data.value
             setModalProps({ confirmLoading: true });
-            const res = await saveEntityAttributesV1({ entityType: entityType.value, id: entityId.value }, scope.value, result);
+            const res = await saveEntityAttributesV1(entityId.value, scope.value, result);
             showMessage(`添加属性成功！`);
+            setTimeout(closeModal);
+            emit('success', data);
         }
     } catch (error: any) {
         throw error;
diff --git a/src/views/things/telemetry/index.vue b/src/views/things/telemetry/index.vue
index 0ad4625..a22915e 100644
--- a/src/views/things/telemetry/index.vue
+++ b/src/views/things/telemetry/index.vue
@@ -7,9 +7,8 @@
             <Segmented v-model:value="selectedScope" :options="typeTabList" @change="handleScopeChange" />
           </div>
           <Space :size="1" class="mx-4">
-            <Tooltip title="添加属性"
-              v-if="selectedScope != LATEST_TELEMETRY && selectedScope != Scope.CLIENT_SCOPE && showSelectedButton != true">
-              <Icon icon="ant-design:plus-outlined" :size="20" class="cursor-pointer" @click="addAttribute" />
+            <Tooltip title="添加属性" v-if="selectedScope != Scope.CLIENT_SCOPE && showSelectedButton != true">
+              <Icon icon="ant-design:plus-outlined" :size="20" class="cursor-pointer" @click="handledAttributeForm({})" />
             </Tooltip>
             <Tooltip title="刷新数据" v-if="selectedScope != LATEST_TELEMETRY && showSelectedButton != true">
               <Icon icon="ant-design:redo-outlined" :size="20" class="cursor-pointer" @click="fetchAttributes" />
@@ -107,7 +106,7 @@ const props = defineProps({
 });
 
 const typeTabList = reactive([
-  { value: LATEST_TELEMETRY, label: '时序数据', className: 'segment-tab' },
+  { value: LATEST_TELEMETRY, label: '遥测数据', className: 'segment-tab' },
   { value: Scope.CLIENT_SCOPE, label: '客户端属性', className: 'segment-tab' },
   { value: Scope.SERVER_SCOPE, label: '服务端属性', className: 'segment-tab' },
   { value: Scope.SHARED_SCOPE, label: '共享属性', className: 'segment-tab' },
@@ -276,7 +275,7 @@ function handleDeleteKey() {
       },
       onOk: async () => {
         try {
-          await deleteEntityAttributes(entityId.value, selectedScope.value as Scope, selectedRowKeys.value.join(','));
+          await deleteEntityAttributes(entityId.value, selectedScope.value as Scope, selectedRowKeys.value);
           showMessage(`删除${selectedRowKeys.value.length}个属性成功！`);
         } catch (error: any) {
           console.log(error);
@@ -309,8 +308,8 @@ function handleTimeseriesModal() {
   openTimeseriesModal(true, { entityType: props.entityType, entityId: props.entityId, keys: selectedRowKeys.value })
 }
 
-function addAttribute() {
-  openAttributeModal(true, { entityType: props.entityType, entityId: props.entityId, scope: selectedScope.value, attribute: {} })
+function handledAttributeForm(data) {
+  openAttributeModal(true, { entityType: props.entityType, entityId: props.entityId, scope: selectedScope.value, attribute: data })
 }
 
 
-- 
Gitee


From 658b9dab7ef0ba59168f6f7795cad5c23672ce6f Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Wed, 3 Apr 2024 11:56:30 +0800
Subject: [PATCH 05/38] =?UTF-8?q?=E9=81=A5=E6=B5=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E5=BA=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/alarmEnum.ts                                        | 2 +-
 src/enums/entityTypeEnum.ts                                   | 4 ++--
 src/views/things/entityView/detail.vue                        | 2 +-
 src/views/things/entityView/form.vue                          | 4 ++--
 .../ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue  | 2 +-
 .../flow/nodeTpl/ENRICHMENT/originatorAttributes.vue          | 2 +-
 .../ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue | 2 +-
 src/views/things/telemetry/delete.vue                         | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/enums/alarmEnum.ts b/src/enums/alarmEnum.ts
index ba9a2fb..70a2699 100644
--- a/src/enums/alarmEnum.ts
+++ b/src/enums/alarmEnum.ts
@@ -52,7 +52,7 @@ export enum AlarmConditionKeyType {
 
 export const ALARM_CONDITION_KEY_TYPE_OPTIONS = [
   { value: AlarmConditionKeyType.ATTRIBUTE, label: '属性' },
-  { value: AlarmConditionKeyType.TIME_SERIES, label: '时序数据' },
+  { value: AlarmConditionKeyType.TIME_SERIES, label: '遥测数据' },
   { value: AlarmConditionKeyType.CONSTANT, label: '常量' },
 ];
 
diff --git a/src/enums/entityTypeEnum.ts b/src/enums/entityTypeEnum.ts
index daf1a3b..78207fd 100644
--- a/src/enums/entityTypeEnum.ts
+++ b/src/enums/entityTypeEnum.ts
@@ -103,8 +103,8 @@ export const ACTION_TYPE_OPTIONS = [
   { value: ActionType.LOCKOUT, label: '锁定' },
   { value: ActionType.ATTRIBUTES_UPDATED, label: '更新属性' },
   { value: ActionType.ATTRIBUTES_DELETED, label: '删除属性' },
-  { value: ActionType.TIMESERIES_UPDATED, label: '更新时序数据' },
-  { value: ActionType.TIMESERIES_DELETED, label: '删除时序数据' },
+  { value: ActionType.TIMESERIES_UPDATED, label: '更新遥测数据' },
+  { value: ActionType.TIMESERIES_DELETED, label: '删除遥测数据' },
   { value: ActionType.RPC_CALL, label: 'RCP 调用' },
   { value: ActionType.CREDENTIALS_UPDATED, label: '更新凭证' },
   { value: ActionType.ASSIGNED_TO_CUSTOMER, label: '委给客户' },
diff --git a/src/views/things/entityView/detail.vue b/src/views/things/entityView/detail.vue
index 55d1af7..11609dc 100644
--- a/src/views/things/entityView/detail.vue
+++ b/src/views/things/entityView/detail.vue
@@ -141,7 +141,7 @@
           <div class="p-4">
             <p class="text-help">配置目标实体的 Timeseries 数据键,以便实体视图可以访问这些键。此 Timeseries 数据是只读的。</p>
           </div>
-          <Form.Item label="时序数据" :name="['keys', 'timeseries']">
+          <Form.Item label="遥测数据" :name="['keys', 'timeseries']">
             <Select :value="record.keys?.timeseries" mode="tags">
             </Select>
           </Form.Item>
diff --git a/src/views/things/entityView/form.vue b/src/views/things/entityView/form.vue
index 1938cc9..408bea5 100644
--- a/src/views/things/entityView/form.vue
+++ b/src/views/things/entityView/form.vue
@@ -68,9 +68,9 @@
         <div class="p-4">
           <p class="text-help">配置目标实体的 Timeseries 数据键,以便实体视图可以访问这些键。此 Timeseries 数据是只读的。</p>
         </div>
-        <Form.Item label="时序数据" :name="['keys', 'timeseries']">
+        <Form.Item label="遥测数据" :name="['keys', 'timeseries']">
           <Select v-model:value="formState.keys.timeseries" :options="timeseriesOptions" :mode="'tags'"
-            :loading="selectFetchLoading" :allow-clear="true" @focus="fetchTimeseriesAttribute" placeholder="请选择时序数据">
+            :loading="selectFetchLoading" :allow-clear="true" @focus="fetchTimeseriesAttribute" placeholder="请选择遥测数据">
           </Select>
         </Form.Item>
       </CollapseContainer>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
index 3718580..7723d14 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
@@ -11,7 +11,7 @@
         </Form.Item>
 
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <Form.Item :label="formState.dataToFetch == 'ATTRIBUTES' ? '属性映射' : '时序数据映射'" name="dataMapping"
+            <Form.Item :label="formState.dataToFetch == 'ATTRIBUTES' ? '属性映射' : '遥测数据映射'" name="dataMapping"
                 :rules="[{ validator: validatorDataMapping }]">
                 <Table class="mapping-table">
                     <tr class="header">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
index ce48d24..09693d9 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
@@ -15,7 +15,7 @@
                     <Select v-model:value="formState.serverAttributeNames" mode="tags">
                     </Select>
                 </Form.Item>
-                <Form.Item label="时序数据" name="latestTsKeyNames" :rules="[{ validator: validatorAttributeNames }]">
+                <Form.Item label="遥测数据" name="latestTsKeyNames" :rules="[{ validator: validatorAttributeNames }]">
                     <Select v-model:value="formState.latestTsKeyNames" mode="tags">
                     </Select>
                 </Form.Item>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
index 9ab7d2e..0142b94 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
 
-        <Form.Item label="时序数据Keys" name="latestTsKeyNames" :rules="[{ required: true, message: '请选择时序数据Keys!' }]"
+        <Form.Item label="遥测数据Keys" name="latestTsKeyNames" :rules="[{ required: true, message: '请选择遥测数据Keys!' }]"
             help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
             <Select v-model:value="formState.latestTsKeyNames" mode="tags">
             </Select>
diff --git a/src/views/things/telemetry/delete.vue b/src/views/things/telemetry/delete.vue
index 28c8b4c..a8bb370 100644
--- a/src/views/things/telemetry/delete.vue
+++ b/src/views/things/telemetry/delete.vue
@@ -5,7 +5,7 @@
     <template #title>
       <Icon :icon="getTitle.icon" class="pr-1 m-1" color="red" />
       <span>
-        删除时序数据
+        删除遥测数据
       </span>
     </template>
 
@@ -102,7 +102,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
 async function handleDelete() {
   try {
     if (isEmpty(record.value)) {
-      showMessage('没有找到需要删除的时序数据！', 'error');
+      showMessage('没有找到需要删除的遥测数据！', 'error');
       return;
     }
     const data = await validate();
-- 
Gitee


From 07691377de19aef56975f08264b7a994df72aa95 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Wed, 3 Apr 2024 15:47:31 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E9=81=A5=E6=B5=8B=E6=95=B0=E6=8D=AEjson?=
 =?UTF-8?q?=20=E6=A0=BC=E5=BC=8F=20=E6=B7=BB=E5=8A=A0=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/things/telemetry/attributeFrom.vue |  45 +++++++-
 src/views/things/telemetry/index.vue         | 104 +++++++++++--------
 2 files changed, 101 insertions(+), 48 deletions(-)

diff --git a/src/views/things/telemetry/attributeFrom.vue b/src/views/things/telemetry/attributeFrom.vue
index 059a090..d927146 100644
--- a/src/views/things/telemetry/attributeFrom.vue
+++ b/src/views/things/telemetry/attributeFrom.vue
@@ -18,7 +18,7 @@
                 </Col>
                 <Col :span="12">
                 <Form.Item :label="typeOptions.find(type => type.value == formState.type)?.label + '值'" name="value"
-                    :rules="[{ required: true, message: '请输入数值!' }]">
+                    :rules="[{ required: true, message: '请输入数值!' }, { validator: validatorValue }]">
                     <Input v-if="formState.type == 'STRING'" v-model:value="formState.value" placeholder="请输入字符串值" />
                     <InputNumber v-if="formState.type == 'NUMERIC'" :precision="0" :step="1" v-model:value="formState.value"
                         :style="{ width: '100%' }" placeholder="请输入数值" />
@@ -28,7 +28,8 @@
                         <Radio :value=true>真</Radio>
                         <Radio :value=false>假</Radio>
                     </Radio.Group>
-                    <Textarea v-if="formState.type == 'JSON'" v-model:value="formState.value" placeholder="输入JSON值" />
+                    <CodeEditor v-if="formState.type == 'JSON'" v-model:value="formState.value"
+                        class="border border-gray-400" />
                 </Form.Item>
                 </Col>
 
@@ -40,19 +41,21 @@
 <script lang="ts" setup name="AttributeFrom">
 import { ref, computed, reactive } from 'vue';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { Form, Input, Radio, Textarea, InputNumber, Row, Col, Select } from 'ant-design-vue';
+import { Form, Input, Radio, InputNumber, Row, Col, Select } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { saveEntityAttributesV1 } from '/@/api/things/telemetry';
 import { Scope, SCOPE_OPTIONS } from '/@/enums/telemetryEnum';
+import { CodeEditor } from '/@/components/CodeEditor';
 import { EntityId } from '/#/store';
+import { isBoolean, isEmpty, isNumber, isString } from 'lodash';
 
 const emit = defineEmits(['success', 'register']);
 
 const { showMessage } = useMessage();
 
 const getTitle = computed(() => ({
-    value: '添加' + SCOPE_OPTIONS.find(item => item.value == scope.value)?.label || '属性',
+    value: (record.value?.key ? '修改' : '添加') + SCOPE_OPTIONS.find(item => item.value == scope.value)?.label || '属性',
 }));
 
 const formRef = ref<FormInstance>();
@@ -80,9 +83,15 @@ const typeOptions = [
 const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
     clear();
+    console.log(data);
     entityId.value = { entityType: data.entityType, id: data.entityId };
     scope.value = data.scope || Scope.SERVER_SCOPE;
     record.value = data.attribute;
+    if (!isEmpty(record.value)) {
+        formState.key = record.value.key;
+        formState.value = record.value.value;
+        formState.type = valueType(record.value.value);
+    }
     setModalProps({ loading: false });
 });
 
@@ -94,6 +103,22 @@ function clear() {
     formState.type = 'STRING';
 }
 
+function valueType(value: any) {
+    if (isBoolean(value)) {
+        return 'BOOLEAN';
+    } else if (isNumber(value)) {
+        if (/^-?\d+(\.\d+)?$/.test(value + '')) {
+            return 'DOUBLE';
+        }
+        return 'NUMERIC';
+    } else if (isString(value)) {
+        return 'STRING';
+    } else {
+        return 'JSON';
+    }
+
+}
+
 async function handleSubmit() {
     try {
         const data = await formRef.value?.validate();
@@ -113,4 +138,16 @@ async function handleSubmit() {
     }
 }
 
+function validatorValue(_rule: any, value: any) {
+    if (formState.type == 'JSON') {
+        try {
+            formState.value = JSON.parse(value);
+        } catch (e) {
+            return Promise.reject('请输入JSON格式数据');
+        }
+    }
+    return Promise.resolve();
+
+}
+
 </script>
\ No newline at end of file
diff --git a/src/views/things/telemetry/index.vue b/src/views/things/telemetry/index.vue
index a22915e..b0b62f2 100644
--- a/src/views/things/telemetry/index.vue
+++ b/src/views/things/telemetry/index.vue
@@ -7,36 +7,23 @@
             <Segmented v-model:value="selectedScope" :options="typeTabList" @change="handleScopeChange" />
           </div>
           <Space :size="1" class="mx-4">
-            <Tooltip title="添加属性" v-if="selectedScope != Scope.CLIENT_SCOPE && showSelectedButton != true">
+            <Tooltip title="添加属性" v-if="selectedScope != Scope.CLIENT_SCOPE">
               <Icon icon="ant-design:plus-outlined" :size="20" class="cursor-pointer" @click="handledAttributeForm({})" />
             </Tooltip>
-            <Tooltip title="刷新数据" v-if="selectedScope != LATEST_TELEMETRY && showSelectedButton != true">
+            <Tooltip title="刷新数据" v-if="selectedScope != LATEST_TELEMETRY">
               <Icon icon="ant-design:redo-outlined" :size="20" class="cursor-pointer" @click="fetchAttributes" />
             </Tooltip>
-            <Tooltip title="查询名称" v-if="showSelectedButton != true">
+            <Tooltip title="查询名称">
               <Icon icon="ant-design:search-outlined" :size="20" class="cursor-pointer" />
             </Tooltip>
-            <Tooltip title="查看图表"
-              v-if="selectedScope == LATEST_TELEMETRY && showChartView == false && showSelectedButton != true">
+            <Tooltip title="查看图表" v-if="selectedScope == LATEST_TELEMETRY && showChartView == false">
               <Icon icon="ant-design:line-chart-outlined" :size="20" class="cursor-pointer"
                 @click="() => { showChartView = true }" />
             </Tooltip>
-            <Tooltip title="查看表格"
-              v-if="selectedScope == LATEST_TELEMETRY && showChartView == true && showSelectedButton != true">
+            <Tooltip title="查看表格" v-if="selectedScope == LATEST_TELEMETRY && showChartView == true">
               <Icon icon="ant-design:insert-row-below-outlined" :size="20" class="cursor-pointer"
                 @click="() => { showChartView = false }" />
             </Tooltip>
-            <a-button v-if="selectedScope == LATEST_TELEMETRY && showSelectedButton == true"
-              @click="handleTimeseriesModal">
-              <Icon icon="ant-design:line-chart-outlined" :size="20" />
-              查看图表
-            </a-button>
-            <a-button type="primary" danger
-              v-if="showSelectedButton == true && userStore.getAuthority == Authority.TENANT_ADMIN"
-              @click="handleDeleteKey">
-              <Icon icon="ant-design:delete-outlined" :size="20" />
-              删除数据
-            </a-button>
             <template #split>
               <Divider type="vertical" />
             </template>
@@ -44,8 +31,11 @@
         </div>
       </template>
     </TableHeader>
-    <BasicTable @register="registerTable" :loading="loading" :dataSource="dataSource"
-      @selection-change="handleSelectionChange" v-show="!showChartView" />
+    <BasicTable @register="registerTable" :loading="loading" :dataSource="dataSource" v-show="!showChartView">
+      <template #valueColumn="{ record }">
+        {{ formatValue(record.value) }}
+      </template>
+    </BasicTable>
     <List v-if="showChartView" :loading="loading" :dataSource="dataSource"
       :grid="{ gutter: 5, xs: 1, sm: 1, md: 2, lg: 2, xl: 3, xxl: 3 }">
       <template #renderItem="{ item }">
@@ -81,7 +71,7 @@ import { BasicTable, BasicColumn, useTable, TableHeader } from '/@/components/Ta
 import { getAttributesByScope, deleteEntityAttributes, getLatestTimeseries } from '/@/api/things/telemetry';
 import TimeseriesChart from './timeseriesChart.vue';
 import TimeseriesModal from './timeseriesModal.vue';
-import { isBoolean } from 'lodash';
+import { isString, isBoolean } from 'lodash';
 import AttributeModal from './attributeFrom.vue';
 import DeleteModal from './delete.vue';
 const LATEST_TELEMETRY = "LATEST_TELEMETRY";
@@ -115,13 +105,9 @@ const selectedScope = ref(LATEST_TELEMETRY);
 
 const loading = ref(false);
 const dataSource = ref<any[]>([]);
-const selectedRowKeys = ref<string[]>([]);
 const LATEST_TELEMETRY_CMD_ID = ref(0);
 const ATTRIBUTE_CMD_ID = ref(0);
 
-const showSelectedButton = computed(() => {
-  return selectedRowKeys.value.length > 0;
-})
 const showChartView = ref(false);
 
 const entityId = computed(() => {
@@ -141,6 +127,7 @@ const tableColumns: BasicColumn[] = [
     dataIndex: 'value',
     key: 'value',
     align: 'center',
+    slot: 'valueColumn'
   },
   {
     title: t('最后更新时间'),
@@ -153,16 +140,41 @@ const tableColumns: BasicColumn[] = [
   },
 ]
 
+const actionColumn: BasicColumn = {
+  width: 100,
+  actions: (record: Recordable) => [
+    {
+      icon: 'clarity:note-edit-line',
+      title: t('编辑'),
+      onClick: handledAttributeForm.bind(this, { ...record }),
+      ifShow: selectedScope.value == Scope.SERVER_SCOPE || selectedScope.value == Scope.SHARED_SCOPE,
+    },
+    {
+      icon: 'ant-design:line-chart-outlined',
+      title: t('查看图表'),
+      ifShow: selectedScope.value == LATEST_TELEMETRY,
+      onClick: handleTimeseriesModal.bind(this, { ...record }),
+    },
+    {
+      icon: 'ant-design:delete-outlined',
+      color: 'error',
+      title: t('删除'),
+      ifShow: userStore.getAuthority == Authority.TENANT_ADMIN,
+      onClick: handleDelete.bind(this, { ...record }),
+    },
+  ],
+};
+
 const [registerAttributeModal, { openModal: openAttributeModal }] = useModal();
 const [registerTimeseriesModal, { openModal: openTimeseriesModal }] = useModal();
 const [registerDeleteModal, { openModal: openDeleteModal }] = useModal();
 const [registerTable, { setSelectedRowKeys }] = useTable({
   rowKey: 'key',
   columns: tableColumns,
+  actionColumn: actionColumn,
   showTableSetting: false,
   useSearchForm: false,
   canResize: true,
-  rowSelection: { type: 'checkbox' },
 });
 
 onMounted(async () => {
@@ -171,6 +183,7 @@ onMounted(async () => {
 
 async function handleScopeChange(scope: string) {
   showChartView.value = false;
+  setSelectedRowKeys([]);
   if (LATEST_TELEMETRY == scope) {
     await subLatestTimeseries();
   } else if (Scope.CLIENT_SCOPE == scope) {
@@ -186,7 +199,7 @@ async function fetchAttributes() {
     const dataList = await getAttributesByScope(entityId.value, selectedScope.value as Scope);
     dataSource.value = dataList.map(kvEntity => ({
       key: kvEntity.key,
-      value: isBoolean(kvEntity.value) ? kvEntity.value + '' : kvEntity.value,
+      value: kvEntity.value,
       lastUpdateTs: kvEntity.lastUpdateTs
     }));
   } catch (error: any) {
@@ -197,6 +210,16 @@ async function fetchAttributes() {
 
 }
 
+function formatValue(value: any) {
+  if (isString(value)) {
+    return value
+  } else if (isBoolean(value)) {
+    return value + ''
+  } else {
+    return JSON.stringify(value);
+  }
+}
+
 async function subClientScopeAttribute() {
   ATTRIBUTE_CMD_ID.value = getAndIncrementCmdId();
   const sendResult = await websocketSend(
@@ -257,15 +280,13 @@ function onWebsocketMessage(data: any) {
   }));
 }
 
-function handleDeleteKey() {
-  if (selectedRowKeys.value.length < 1) {
-    showMessage('请选择要删除的数值！');
-    return;
-  }
+
+
+function handleDelete(data: any) {
   if (LATEST_TELEMETRY != selectedScope.value) {
     createConfirm({
       iconType: 'error',
-      title: `确定删除属性[${selectedRowKeys.value.join(',')}]吗？`,
+      title: `确定删除属性[${data.key}]吗？`,
       content: '注意,确认后所有选中的属性都会被删除。',
       centered: false,
       okText: '删除',
@@ -275,8 +296,8 @@ function handleDeleteKey() {
       },
       onOk: async () => {
         try {
-          await deleteEntityAttributes(entityId.value, selectedScope.value as Scope, selectedRowKeys.value);
-          showMessage(`删除${selectedRowKeys.value.length}个属性成功！`);
+          await deleteEntityAttributes(entityId.value, selectedScope.value as Scope, [data.key]);
+          showMessage(`删除${data.key}属性成功！`);
         } catch (error: any) {
           console.log(error);
         } finally {
@@ -289,26 +310,21 @@ function handleDeleteKey() {
     openDeleteModal(true, {
       entityType: props.entityType,
       entityId: props.entityId,
-      keys: selectedRowKeys.value,
+      keys: [data.key],
     })
   }
 
 }
 
-function handleSelectionChange({ rows }) {
-  selectedRowKeys.value = rows.map((item) => item.key);
-}
-
 function handleSuccess() {
-  setSelectedRowKeys([]);
   handleScopeChange(selectedScope.value);
 }
 
-function handleTimeseriesModal() {
-  openTimeseriesModal(true, { entityType: props.entityType, entityId: props.entityId, keys: selectedRowKeys.value })
+function handleTimeseriesModal(data: any) {
+  openTimeseriesModal(true, { entityType: props.entityType, entityId: props.entityId, keys: data.key })
 }
 
-function handledAttributeForm(data) {
+function handledAttributeForm(data: any) {
   openAttributeModal(true, { entityType: props.entityType, entityId: props.entityId, scope: selectedScope.value, attribute: data })
 }
 
-- 
Gitee


From 764a522e931b5a71b3472d25967926ba082bed87 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sat, 6 Apr 2024 10:11:32 +0800
Subject: [PATCH 07/38] =?UTF-8?q?change-originator=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TRANSFORMATION/changeOriginator.vue       | 98 +++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  6 +-
 2 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
new file mode 100644
index 0000000..0b9d3e1
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
@@ -0,0 +1,98 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item label="实体类型" name="originatorSource" :rules="[{ required: true, message: '实体类型必选!' }]">
+      <Select v-model:value="formState.originatorSource" @change="handleEntityTypeChange">
+        <Select.Option value="CUSTOMER">CUSTOMER</Select.Option>
+        <Select.Option value="TENANT">TENANT</Select.Option>
+        <Select.Option value="RELATED">RELATED</Select.Option>
+        <Select.Option value="ALARM_ORIGINATOR">ALARM_ORIGINATOR</Select.Option>
+        <Select.Option value="ENTITY">ENTITY</Select.Option>
+      </Select>
+    </Form.Item>
+    <div class="border  border-neutral-400 p-2 rounded">
+      <p class="text-base font-medium">关系查询</p>
+    </div>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: "change-originator",
+});
+</script>
+
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { Aggregation, OrderBy, TimeUnit, TIME_UNIT_OPTIONS, AGGREGATION_OPTIONS } from '/@/enums/telemetryEnum';
+import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+
+interface Configuration {
+  entityNamePattern: any,
+  entityType: any,
+  originatorSource: 'CUSTOMER' | 'TENANT' | 'RELATED' | 'ALARM_ORIGINATOR' | 'ENTITY',
+  relationsQuery: {
+    direction: string,
+    fetchLastLevelOnly: boolean,
+    filters: [],
+    maxLevel: number
+  },
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  entityNamePattern: null,
+  entityType: null,
+  originatorSource: 'CUSTOMER',
+  relationsQuery: {
+    direction: "FROM",
+    fetchLastLevelOnly: false,
+    filters: [{ relationType: "Contains", entityTypes: [] }],
+    maxLevel: 1
+  }
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    formState.entityNamePattern = props.configuration.entityNamePattern;
+    formState.entityType = props.configuration.entityType;
+    formState.originatorSource = props.configuration.originatorSource;
+    formState.relationsQuery = props.configuration.relationsQuery;
+  },
+  { immediate: true }
+)
+
+async function handleEntityTypeChange(entityType) {
+    formState.entityId = undefined;
+    switch (entityType) {
+        case EntityType.CUSTOMER:
+           
+            break;
+        case EntityType.TENANT:
+           
+            break;
+    }
+    //TODO edge;
+
+}
+
+async function getConfiguration() {
+  try {
+    return await formRef.value?.validate();
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index d3e2936..2a7f1de 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -18,5 +18,7 @@
     "org.thingsboard.rule.engine.metadata.TbFetchDeviceCredentialsNode":"fetch-device-credentials",
     "org.thingsboard.rule.engine.metadata.TbGetAttributesNode":"originator-attributes",
     "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode":"originator-fields",
-    "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry"
-}
\ No newline at end of file
+    "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry",
+
+    "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator"
+}
-- 
Gitee


From 10ddce51b3fe3443edac96801cc92cfd9ab492a3 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sat, 6 Apr 2024 23:06:45 +0800
Subject: [PATCH 08/38] =?UTF-8?q?change-originator=E5=88=9D=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/entityTypeEnum.ts                   |  10 +-
 .../TRANSFORMATION/changeOriginator.vue       | 132 +++++++++++++++---
 2 files changed, 119 insertions(+), 23 deletions(-)

diff --git a/src/enums/entityTypeEnum.ts b/src/enums/entityTypeEnum.ts
index 78207fd..55001aa 100644
--- a/src/enums/entityTypeEnum.ts
+++ b/src/enums/entityTypeEnum.ts
@@ -130,4 +130,12 @@ export const ACTION_TYPE_OPTIONS = [
   { value: ActionType.ADDED_COMMENT, label: '添加评论' },
   { value: ActionType.UPDATED_COMMENT, label: '更新评论' },
   { value: ActionType.DELETED_COMMENT, label: '删除评论' }
-];
\ No newline at end of file
+];
+
+export enum OriginatorSource {
+  CUSTOMER = 'CUSTOMER',
+  TENANT = 'TENANT',
+  RELATED = 'RELATED',
+  ALARM_ORIGINATOR = 'ALARM_ORIGINATOR',
+  ENTITY = 'ENTITY'
+}
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
index 0b9d3e1..49dff6b 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
@@ -1,16 +1,89 @@
 <template>
   <Form ref="formRef" :model="formState" layout="vertical">
     <Form.Item label="实体类型" name="originatorSource" :rules="[{ required: true, message: '实体类型必选!' }]">
-      <Select v-model:value="formState.originatorSource" @change="handleEntityTypeChange">
-        <Select.Option value="CUSTOMER">CUSTOMER</Select.Option>
-        <Select.Option value="TENANT">TENANT</Select.Option>
-        <Select.Option value="RELATED">RELATED</Select.Option>
-        <Select.Option value="ALARM_ORIGINATOR">ALARM_ORIGINATOR</Select.Option>
-        <Select.Option value="ENTITY">ENTITY</Select.Option>
+      <Select v-model:value="formState.originatorSource" @change="handleOriginatorSourceChange">
+        <Select.Option value="CUSTOMER">客户</Select.Option>
+        <Select.Option value="TENANT">租户</Select.Option>
+        <Select.Option value="RELATED">关系</Select.Option>
+        <Select.Option value="ALARM_ORIGINATOR">发起者警报</Select.Option>
+        <Select.Option value="ENTITY">实体名称匹配</Select.Option>
       </Select>
     </Form.Item>
-    <div class="border  border-neutral-400 p-2 rounded">
+    <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4"
+      v-if="formState.originatorSource == OriginatorSource.RELATED">
       <p class="text-base font-medium">关系查询</p>
+      <div class="p-2">
+        <Row :gutter="20">
+          <Col :span="12">
+          <Form.Item label="方向" name="formState.relationsQuery.direction">
+            <Select v-model:value="formState.relationsQuery.direction">
+              <Select.Option value="FROM">从 发起者</Select.Option>
+              <Select.Option value="TO">到 发起者</Select.Option>
+            </Select>
+          </Form.Item>
+          </Col>
+          <Col :span="12">
+          <Form.Item label="层级" name="formState.relationsQuery.maxLevel">
+            <Input v-model:value="formState.relationsQuery.maxLevel">
+            </Input>
+          </Form.Item>
+          </Col>
+        </Row>
+      </div>
+      <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+        <Form.Item label="关联筛选器" name="relationsQuery">
+          <Table class="mapping-table">
+            <tr class="header">
+              <th>关联类型</th>
+              <th>实体类型</th>
+            </tr>
+            <tr class="content" v-for="(item, index) in formState.relationsQuery.filters" :key="index">
+              <td class="py-2 px-4">
+                <Input v-model:value="item.relationType" placeholder="任何类型" />
+              </td>
+              <td>
+                <Select name="originatorTypes" v-model:value="item.entityTypes" :options="allowedEntityTypes"
+                  placeholder="设备类型" mode="multiple">
+                </Select>
+              </td>
+              <td>
+                <Tooltip title="删除" class="pl-4">
+                  <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                    @click="handleDeleteFilter(index)" />
+                </Tooltip>
+              </td>
+            </tr>
+          </Table>
+          <Button class="my-4" type="primary" @click="handleAddFilter">添加筛选器</Button>
+        </Form.Item>
+      </div>
+    </div>
+    <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4"
+      v-if="formState.originatorSource == OriginatorSource.ENTITY">
+      <p class="text-base font-medium">实体名称匹配模式</p>
+      <div class="p-2">
+        <Row :gutter="20">
+          <Col :span="12">
+          <Form.Item label="类型" name="entityType">
+            <Select v-model:value="formState.entityType">
+              <Select.Option value="DEVICE">设备</Select.Option>
+              <Select.Option value="ASSET">资产</Select.Option>
+              <Select.Option value="ENTITY_VIEW">实体视图</Select.Option>
+              <Select.Option value="USER">用户</Select.Option>
+              <Select.Option value="EDGE">边缘</Select.Option>
+            </Select>
+          </Form.Item>
+          </Col>
+          <Col :span="12">
+          <Form.Item label="名称匹配" name="entityNamePattern">
+            <Input v-model:value="formState.entityNamePattern">
+            </Input>
+          </Form.Item>
+          </Col>
+        </Row>
+        <Alert type="success" message="名称匹配字段支持模板化使用$[messageKey]从消息中提取值;使用${metadataKey}从元数据中提取值。" />
+      </div>
+
     </div>
   </Form>
 </template>
@@ -24,8 +97,9 @@ export default defineComponent({
 import { ref, watch, defineComponent, reactive } from 'vue';
 import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
-import { Aggregation, OrderBy, TimeUnit, TIME_UNIT_OPTIONS, AGGREGATION_OPTIONS } from '/@/enums/telemetryEnum';
-import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
+import { isEmpty } from 'lodash';
+import { filter } from '/@/utils/helper/treeHelper';
 
 interface Configuration {
   entityNamePattern: any,
@@ -36,7 +110,7 @@ interface Configuration {
     fetchLastLevelOnly: boolean,
     filters: [],
     maxLevel: number
-  },
+  }
 }
 
 const props = defineProps({
@@ -46,6 +120,23 @@ const props = defineProps({
   },
 });
 
+const allowedEntityTypes = ENTITY_TYPE_OPTIONS.filter(item => {
+  return item.value == EntityType.TENANT
+    || item.value == EntityType.ASSET
+    || item.value == EntityType.ENTITY_VIEW
+    || item.value == EntityType.USER
+    || item.value == EntityType.EDGE
+});
+
+function handleAddFilter() {
+
+  formState.relationsQuery.filters.push({ relationType: "Contains", entityTypes: [] });
+}
+
+function handleDeleteFilter(index: number) {
+  formState.relationsQuery.filters.splice(index, 1);
+}
+
 const formRef = ref<FormInstance>();
 
 const formState = reactive<any>({
@@ -55,7 +146,7 @@ const formState = reactive<any>({
   relationsQuery: {
     direction: "FROM",
     fetchLastLevelOnly: false,
-    filters: [{ relationType: "Contains", entityTypes: [] }],
+    filters: [{ relationType: "", entityTypes: [] }],
     maxLevel: 1
   }
 });
@@ -71,18 +162,15 @@ watch(
   { immediate: true }
 )
 
-async function handleEntityTypeChange(entityType) {
-    formState.entityId = undefined;
-    switch (entityType) {
-        case EntityType.CUSTOMER:
-           
-            break;
-        case EntityType.TENANT:
-           
-            break;
-    }
-    //TODO edge;
+async function handleOriginatorSourceChange(originatorSource) {
+  switch (originatorSource) {
+    case OriginatorSource.RELATED:
+
+      break;
+    case OriginatorSource.ENTITY:
 
+      break;
+  }
 }
 
 async function getConfiguration() {
-- 
Gitee


From 50af725a7c000003e7d0900d176a8d1f955ab0b3 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sun, 7 Apr 2024 19:56:53 +0800
Subject: [PATCH 09/38] =?UTF-8?q?copy-key-value-pairs=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/TRANSFORMATION/copykeyValue.vue   | 76 +++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  3 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
new file mode 100644
index 0000000..5802390
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
@@ -0,0 +1,76 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item name="copyFrom">
+      <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+        <span>复制key</span>
+        <Radio.Group v-model:value="formState.copyFrom" button-style="solid">
+          <Radio.Button value="DATA">消息到元数据</Radio.Button>
+          <Radio.Button value="METADATA">元数据到消息</Radio.Button>
+        </Radio.Group>
+      </div>
+    </Form.Item>
+    <Form.Item label="keys" name="keys" :rules="[{ validator: validatorKeys }]">
+      <Select v-model:value="formState.keys" mode="tags">
+      </Select>
+    </Form.Item>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: 'copy-key-value-pairs',
+});
+</script>
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
+import { isEmpty } from 'lodash';
+import { filter } from '/@/utils/helper/treeHelper';
+
+interface Configuration {
+  copyFrom: string;
+  keys: [];
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  copyFrom: 'DATA',
+  keys: [],
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    formState.copyFrom = props.configuration.copyFrom;
+    formState.keys = props.configuration.keys;
+  },
+  { immediate: true },
+);
+
+async function getConfiguration() {
+  try {
+    return await formRef.value?.validate();
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+function validatorKeys() {
+  if (!isEmpty(formState.keys)) {
+    return Promise.resolve();
+  } else {
+    return Promise.reject('key必须填写一项！');
+  }
+}
+
+defineExpose({ getConfiguration });
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 2a7f1de..8b6eb24 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -20,5 +20,6 @@
     "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode":"originator-fields",
     "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry",
 
-    "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator"
+    "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
+    "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs"
 }
-- 
Gitee


From ed21386cdac39ecb14ed244945382f7b78fcf96f Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sun, 7 Apr 2024 20:20:07 +0800
Subject: [PATCH 10/38] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=87=E6=8D=A2=E9=87=8D=E6=96=B0=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/TRANSFORMATION/changeOriginator.vue      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
index 49dff6b..c515c6f 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
@@ -95,11 +95,12 @@ export default defineComponent({
 
 <script lang="ts" setup>
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { Form, Button, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
 import { isEmpty } from 'lodash';
 import { filter } from '/@/utils/helper/treeHelper';
+import { Icon } from '/@/components/Icon';
 
 interface Configuration {
   entityNamePattern: any,
@@ -165,10 +166,11 @@ watch(
 async function handleOriginatorSourceChange(originatorSource) {
   switch (originatorSource) {
     case OriginatorSource.RELATED:
-
+      formState.relationsQuery.filters = [{ relationType: "Contains", entityTypes: [] }];
       break;
     case OriginatorSource.ENTITY:
-
+      formState.entityNamePattern = '';
+      formState.entityType = [];
       break;
   }
 }
-- 
Gitee


From d87b1eddd916d95b3eae576ed37a4e930050a346 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sun, 7 Apr 2024 21:28:57 +0800
Subject: [PATCH 11/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9title=E5=92=8Chost?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env             | 2 +-
 .env.development | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 72fc454..699b3a1 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@
 VITE_PORT = 3100
 
 # 软件标题
-VITE_GLOB_APP_TITLE = 物联网设备接入平台
+VITE_GLOB_APP_TITLE = ThingsBoard适配Vue3
 
 # 软件英文名（小写、全英文、无空格、无特殊字符）
 VITE_GLOB_APP_SHORT_NAME = thingsPlat
diff --git a/.env.development b/.env.development
index 2c6ac5c..253a2ab 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_PUBLIC_PATH = /
 VITE_ROUTE_WEB_HISTORY = true
 
 # 代理设置，可配置多个，不能换行，格式：[访问接口的根路径, 代理地址, 是否保持Host头]
-VITE_PROXY = [["/api","http://127.0.0.1:8080/api",false]]
+VITE_PROXY = [["/api","http://47.120.7.144:8080/api",false]]
 
 # 是否删除 console 调试信息
 VITE_DROP_CONSOLE = false
-- 
Gitee


From 93a6c92e4adf15d7844f7efc2f179df23ffab22c Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sun, 7 Apr 2024 22:16:49 +0800
Subject: [PATCH 12/38] =?UTF-8?q?delete-key-value-pairs=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/TRANSFORMATION/deleteKeyValue.vue | 76 +++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  3 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
new file mode 100644
index 0000000..0e0b8ec
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
@@ -0,0 +1,76 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item name="deleteFrom">
+      <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+        <span>删除key</span>
+        <Radio.Group v-model:value="formState.deleteFrom" button-style="solid">
+          <Radio.Button value="DATA">消息</Radio.Button>
+          <Radio.Button value="METADATA">元数据</Radio.Button>
+        </Radio.Group>
+      </div>
+    </Form.Item>
+    <Form.Item label="keys" name="keys" :rules="[{ validator: validatorKeys }]">
+      <Select v-model:value="formState.keys" mode="tags">
+      </Select>
+    </Form.Item>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: 'delete-key-value-pairs',
+});
+</script>
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
+import { isEmpty } from 'lodash';
+import { filter } from '/@/utils/helper/treeHelper';
+
+interface Configuration {
+  deleteFrom: string;
+  keys: [];
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  deleteFrom: 'DATA',
+  keys: [],
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    formState.deleteFrom = props.configuration.deleteFrom;
+    formState.keys = props.configuration.keys;
+  },
+  { immediate: true },
+);
+
+async function getConfiguration() {
+  try {
+    return await formRef.value?.validate();
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+function validatorKeys() {
+  if (!isEmpty(formState.keys)) {
+    return Promise.resolve();
+  } else {
+    return Promise.reject('key必须填写一项！');
+  }
+}
+
+defineExpose({ getConfiguration });
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 8b6eb24..ad46fad 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -21,5 +21,6 @@
     "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
-    "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs"
+    "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
+    "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs"
 }
-- 
Gitee


From 0fd7b8651e9bc21ff36d3bf0786c01a1d4a17649 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sun, 7 Apr 2024 22:55:37 +0800
Subject: [PATCH 13/38] =?UTF-8?q?jsonpath=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=8F=8A=E5=85=B6=E5=AE=83=E4=B8=A4=E4=B8=AA=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=BF=85=E5=A1=AB=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/TRANSFORMATION/copykeyValue.vue   |  2 +-
 .../nodeTpl/TRANSFORMATION/deleteKeyValue.vue |  2 +-
 .../flow/nodeTpl/TRANSFORMATION/jsonPath.vue  | 64 +++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  3 +-
 4 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
index 5802390..14d906c 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
@@ -9,7 +9,7 @@
         </Radio.Group>
       </div>
     </Form.Item>
-    <Form.Item label="keys" name="keys" :rules="[{ validator: validatorKeys }]">
+    <Form.Item label="keys" name="Keys" :rules="[{ required: true, validator: validatorKeys, message: 'key值不能为空!' }]">
       <Select v-model:value="formState.keys" mode="tags">
       </Select>
     </Form.Item>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
index 0e0b8ec..454c613 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
@@ -9,7 +9,7 @@
         </Radio.Group>
       </div>
     </Form.Item>
-    <Form.Item label="keys" name="keys" :rules="[{ validator: validatorKeys }]">
+    <Form.Item label="keys" name="Keys" :rules="[{ required: true, validator: validatorKeys,message: 'key值不能为空!' }]">
       <Select v-model:value="formState.keys" mode="tags">
       </Select>
     </Form.Item>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
new file mode 100644
index 0000000..1087a0c
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
@@ -0,0 +1,64 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item label="jsonPath表达式" name="jsonPath" :rules="[{ required: true,validator: validatorJsonPath, message: 'jsonPaht值不能为空!' }]">
+            <Input v-model:value="formState.jsonPath" style="width: 100%;">
+            </Input>
+        </Form.Item>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: 'json-path',
+});
+</script>
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
+import { isEmpty } from 'lodash';
+import { filter } from '/@/utils/helper/treeHelper';
+
+interface Configuration {
+  jsonPath: string;
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  jsonPath: '$'
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    formState.jsonPath = props.configuration.jsonPath;
+  },
+  { immediate: true },
+);
+
+async function getConfiguration() {
+  try {
+    return await formRef.value?.validate();
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+function validatorJsonPath() {
+  if (!isEmpty(formState.jsonPath)) {
+    return Promise.resolve();
+  } else {
+    return Promise.reject('jsonPaht必须填写！');
+  }
+}
+
+defineExpose({ getConfiguration });
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index ad46fad..d9bfe34 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -22,5 +22,6 @@
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-    "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs"
+    "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
+    "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path"
 }
-- 
Gitee


From 0938bfcf4caa4ca42049653650f18aa112cf6636 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Mon, 8 Apr 2024 23:10:10 +0800
Subject: [PATCH 14/38] =?UTF-8?q?script=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/TRANSFORMATION/script.vue    | 105 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   3 +-
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
new file mode 100644
index 0000000..46d3535
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
@@ -0,0 +1,105 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item name="scriptLang">
+      <div class="flex justify-center mb-2">
+        <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+          <Radio.Button value="JS">JavaScript</Radio.Button>
+          <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+        </Radio.Group>
+      </div>
+    </Form.Item>
+    <Form.Item :name="formState.scriptLang == 'TBEL' ? 'tbelScript' : 'jsScript'">
+      <div>
+        <div class="flex justify-between">
+          <p class="text-gray-500">function Filter(msg, metadata, msgType) {</p>
+          <Space>
+            <Tooltip title="格式化">
+              <Icon class="cursor-pointer" @click="handleFormatScript" :icon="'ant-design:format-painter-filled'" />
+            </Tooltip>
+            <Tooltip title="测试脚本功能">
+              <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+            </Tooltip>
+            <Tooltip title="全屏">
+              <Icon class="cursor-pointer" @click="handleFullScreen" :icon="'ant-design:fullscreen-outlined'" />
+            </Tooltip>
+          </Space>
+        </div>
+        <div class="py-2">
+          <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.tbelScript" :mode="'tbelScript'"
+            class="border border-gray-400" />
+          <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.jsScript" :mode="'jsScript'"
+            class="border border-gray-400" />
+        </div>
+        <div class="text-gray-500">}</div>
+      </div>
+      <Button class="mt-2" type="primary" @click="handleTestScript">测试脚本功能</Button>
+    </Form.Item>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: "script",
+});
+</script>
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Radio, Button, Tooltip, Space } from 'ant-design-vue';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+  jsScript: string,
+  scriptLang: 'TBEL' | 'JS',
+  tbelScript: string,
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  scriptLang: 'TBEL',
+  jsScript: 'return {msg: msg, metadata: metadata, msgType: msgType};',
+  tbelScript: 'return {msg: msg, metadata: metadata, msgType: msgType};',
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    formState.scriptLang = props.configuration.scriptLang;
+    formState.jsScript = props.configuration.jsScript;
+    formState.tbelScript = props.configuration.tbelScript;
+  },
+  { immediate: true }
+)
+
+async function getConfiguration() {
+  try {
+    return await formRef.value?.validate();
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index d9bfe34..6fac49f 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -23,5 +23,6 @@
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
     "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
-    "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path"
+    "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path",
+    "org.thingsboard.rule.engine.transform.TbTransformMsgNode":"script"
 }
-- 
Gitee


From af33f33ac19d39372fed6cc6ee6eecdf5bb0124b Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 9 Apr 2024 14:49:50 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20relateDevic?=
 =?UTF-8?q?eAttributes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ENRICHMENT/originatorTelemetry.vue        |   4 +-
 .../ENRICHMENT/relatedDeviceAttributes.vue    | 228 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   1 +
 3 files changed, 231 insertions(+), 2 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
index 0142b94..f0a106f 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
@@ -94,8 +94,8 @@
                         </Select>
                     </Form.Item>
                     <Form.Item label="Limit" name="limit" :rules="[{ required: true, message: 'Limit必填!' }]"
-                        help="最小限值为2，最大值为-1000。如果要提取单个条目，请选择提提取策略'First'或 'Last'。">
-                        <InputNumber v-model:value="formState.limit" :min="2" :style="{ width: '100%' }" />
+                        help="最小限值为2，最大值为1000。如果要提取单个条目，请选择提提取策略'First'或 'Last'。">
+                        <InputNumber v-model:value="formState.limit" :min="2" :max="1000" :style="{ width: '100%' }" />
                     </Form.Item>
                 </template>
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
new file mode 100644
index 0000000..6a06a66
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
@@ -0,0 +1,228 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">设备关系查询</p>
+            <div class="p-2">
+                <Row :gutter="20">
+                    <Col :span="12">
+                    <Form.Item label="方向" :name="['deviceRelationsQuery', 'direction']"
+                        :rules="[{ required: true, message: '请选择查询方向!' }]">
+                        <Select v-model:value="formState.deviceRelationsQuery.direction">
+                            <Select.Option value="FROM">从 originator</Select.Option>
+                            <Select.Option value="TO">到 originator</Select.Option>
+                        </Select>
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="最大关联层级" :name="['deviceRelationsQuery', 'maxLevel']">
+                        <InputNumber v-model:value="formState.deviceRelationsQuery.maxLevel" :precision="0" :step="1"
+                            :min="1" :style="{ width: '100%' }" />
+                    </Form.Item>
+                    </Col>
+                </Row>
+                <Form.Item :name="['deviceRelationsQuery', 'fetchLastLevelOnly']"
+                    v-show="formState.deviceRelationsQuery.maxLevel && formState.deviceRelationsQuery.maxLevel > 1">
+                    <Checkbox v-model:value="formState.deviceRelationsQuery.fetchLastLevelOnly">
+                        仅获取最后一级关联
+                    </Checkbox>
+                </Form.Item>
+                <Form.Item label="关联类型" :name="['deviceRelationsQuery', 'relationType']">
+                    <Select v-model:value="formState.deviceRelationsQuery.relationType"
+                        :options="relationTypeOptions.map(item => ({ value: item }))">
+                        <template #dropdownRender="{ menuNode: menu }">
+                            <v-nodes :vnodes="menu" />
+                            <Divider style="margin: 4px 0" />
+                            <Space style="padding: 4px 8px">
+                                <Input ref="inputRef" v-model:value="addName" placeholder="请输入关联关系" />
+                                <Button type="text" @click="addRelationType">
+                                    <template #icon>
+                                        <plus-outlined />
+                                    </template>
+                                    添加关联关系
+                                </Button>
+                            </Space>
+                        </template>
+                    </Select>
+                </Form.Item>
+                <Form.Item label="设备配置" :name="['deviceRelationsQuery', 'deviceTypes']"
+                    :rules="[{ required: true, message: '设备配置必选!' }]">
+                    <Select v-model:value="formState.deviceRelationsQuery.deviceTypes" mode="multiple">
+                        <Select.Option v-for="(type, index) in deviceTypesOptions" :key="index" :value="type.type">
+                            {{ type.type }}
+                        </Select.Option>
+                    </Select>
+                </Form.Item>
+
+            </div>
+
+        </div>
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">相关设备属性</p>
+            <div class="p-2">
+                <Form.Item label="客户端属性" name="clientAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.clientAttributeNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="共享属性" name="sharedAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.sharedAttributeNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="服务端属性" name="serverAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.serverAttributeNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="遥测数据" name="latestTsKeyNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.latestTsKeyNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item name="getLatestValueWithTs" v-show="formState.latestTsKeyNames.length > 0">
+                    <Checkbox v-model:checked="formState.getLatestValueWithTs">
+                        获取带有时间戳的最后一条数据
+                    </Checkbox>
+                </Form.Item>
+            </div>
+        </div>
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>将原始属性添加到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
+        <Form.Item name="tellFailureIfAbsent" help="如果至少有一个选定的密钥不存在，则出消息将报告“Failure”">
+            <div class="border border-neutral-300 rounded-md  px-4 py-2">
+                <Checkbox v-model:checked="formState.tellFailureIfAbsent">
+                    如果缺少任何属性，则告知失败
+                </Checkbox>
+            </div>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "related-device-attributes",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive, onMounted } from 'vue';
+import { PlusOutlined } from '@ant-design/icons-vue';
+import { Form, Select, Radio, Checkbox, Row, Col, Divider, Space, Input, Button, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+import { getDeviceTypes } from '/@/api/things/device';
+
+interface Configuration {
+    clientAttributeNames: [],
+    latestTsKeyNames: [],
+    serverAttributeNames: [],
+    sharedAttributeNames: [],
+    getLatestValueWithTs: boolean,
+    tellFailureIfAbsent: boolean,
+    fetchTo: 'METADATA' | 'DATA',
+    deviceRelationsQuery: {
+        deviceTypes: [],
+        direction: 'FROM' | 'TO',
+        maxLevel: 1,
+        fetchLastLevelOnly: false,
+        relationType: "Contains",
+    }
+}
+
+const VNodes = defineComponent({
+    props: {
+        vnodes: {
+            type: Object,
+            required: true,
+        },
+    },
+    render() {
+        return this.vnodes;
+    },
+});
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+});
+
+
+
+const deviceTypesOptions = ref<Array<any>>([{ type: 'default' }]);
+const relationTypeOptions = ref(['Contains', 'Manages']);
+
+const addName = ref();
+const inputRef = ref();
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    clientAttributeNames: [],
+    latestTsKeyNames: [],
+    serverAttributeNames: [],
+    sharedAttributeNames: [],
+    getLatestValueWithTs: false,
+    tellFailureIfAbsent: true,
+    fetchTo: 'DATA',
+    deviceRelationsQuery: {
+        deviceTypes: [],
+        direction: 'FROM',
+        maxLevel: 1,
+        fetchLastLevelOnly: false,
+        relationType: "Contains",
+    }
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.clientAttributeNames = props.configuration.clientAttributeNames;
+        formState.latestTsKeyNames = props.configuration.latestTsKeyNames;
+        formState.serverAttributeNames = props.configuration.serverAttributeNames;
+        formState.sharedAttributeNames = props.configuration.sharedAttributeNames;
+        formState.getLatestValueWithTs = props.configuration.getLatestValueWithTs;
+        formState.tellFailureIfAbsent = props.configuration.tellFailureIfAbsent;
+        formState.fetchTo = props.configuration.fetchTo;
+        formState.deviceRelationsQuery = props.configuration.deviceRelationsQuery;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorAttributeNames() {
+    if (!isEmpty(formState.clientAttributeNames) || !isEmpty(formState.serverAttributeNames) || !isEmpty(formState.sharedAttributeNames) || !isEmpty(formState.latestTsKeyNames)) {
+        return Promise.resolve();
+    } else {
+        return Promise.reject('原始属性必须填写一项！');
+    }
+}
+
+function addRelationType(e) {
+    e.preventDefault();
+    relationTypeOptions.value.push(addName.value);
+    addName.value = '';
+    setTimeout(() => {
+        inputRef.value?.focus();
+    }, 0);
+}
+
+onMounted(async () => {
+    deviceTypesOptions.value = await getDeviceTypes();
+})
+
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 6fac49f..887612a 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -19,6 +19,7 @@
     "org.thingsboard.rule.engine.metadata.TbGetAttributesNode":"originator-attributes",
     "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode":"originator-fields",
     "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry",
+    "org.thingsboard.rule.engine.metadata.TbGetDeviceAttrNode":"related-device-attributes",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From 4bdf3feb59d3945a654cd79b9701212fcdd13836 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 9 Apr 2024 16:30:35 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE-ENRICHMENT=20?=
 =?UTF-8?q?rekated-entity-data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ENRICHMENT/relatedDeviceAttributes.vue    |   6 +-
 .../nodeTpl/ENRICHMENT/relatedEntityData.vue  | 340 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   1 +
 3 files changed, 344 insertions(+), 3 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
index 6a06a66..b222fa3 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
@@ -22,7 +22,7 @@
                 </Row>
                 <Form.Item :name="['deviceRelationsQuery', 'fetchLastLevelOnly']"
                     v-show="formState.deviceRelationsQuery.maxLevel && formState.deviceRelationsQuery.maxLevel > 1">
-                    <Checkbox v-model:value="formState.deviceRelationsQuery.fetchLastLevelOnly">
+                    <Checkbox v-model:checked="formState.deviceRelationsQuery.fetchLastLevelOnly">
                         仅获取最后一级关联
                     </Checkbox>
                 </Form.Item>
@@ -126,8 +126,8 @@ interface Configuration {
     deviceRelationsQuery: {
         deviceTypes: [],
         direction: 'FROM' | 'TO',
-        maxLevel: 1,
-        fetchLastLevelOnly: false,
+        maxLevel: number,
+        fetchLastLevelOnly: boolean,
         relationType: "Contains",
     }
 }
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
new file mode 100644
index 0000000..5df3533
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
@@ -0,0 +1,340 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">关系查询</p>
+            <div class="p-2">
+                <Row :gutter="20">
+                    <Col :span="12">
+                    <Form.Item label="方向" :name="['relationsQuery', 'direction']"
+                        :rules="[{ required: true, message: '请选择查询方向!' }]">
+                        <Select v-model:value="formState.relationsQuery.direction">
+                            <Select.Option value="FROM">从 originator</Select.Option>
+                            <Select.Option value="TO">到 originator</Select.Option>
+                        </Select>
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="最大关联层级" :name="['relationsQuery', 'maxLevel']">
+                        <InputNumber v-model:value="formState.relationsQuery.maxLevel" :precision="0" :step="1" :min="1"
+                            :style="{ width: '100%' }" />
+                    </Form.Item>
+                    </Col>
+                </Row>
+                <Form.Item :name="['relationsQuery', 'fetchLastLevelOnly']"
+                    v-show="formState.relationsQuery.maxLevel && formState.relationsQuery.maxLevel > 1">
+                    <Checkbox v-model:checked="formState.relationsQuery.fetchLastLevelOnly">
+                        仅获取最后一级关联
+                    </Checkbox>
+                </Form.Item>
+                <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+                    <Form.Item label="关联筛选器" :name="['relationsQuery', 'filters']"
+                        :rules="[{ validator: validatorRelationsQueryFilters }]">
+                        <div class="p-2">
+                            <Table class="mapping-table">
+                                <tr class="header">
+                                    <th>关联类型</th>
+                                    <th>实体类型</th>
+                                </tr>
+                                <tr class="content" v-for="(filter, index) in formState.relationsQuery.filters"
+                                    :key="index">
+                                    <td class="py-2 px-4">
+                                        <Select v-model:value="filter.relationType" :style="{ width: '100%' }"
+                                            :options="relationTypeOptions.map(item => ({ value: item }))">
+                                            <template #dropdownRender="{ menuNode: menu }">
+                                                <v-nodes :vnodes="menu" />
+                                                <Divider style="margin: 4px 0" />
+                                                <Space style="padding: 4px 8px">
+                                                    <Input ref="inputRef" v-model:value="addName" placeholder="请输入关联关系" />
+                                                    <Button type="text" @click="addRelationType">
+                                                        <template #icon>
+                                                            <plus-outlined />
+                                                        </template>
+                                                        添加关联关系
+                                                    </Button>
+                                                </Space>
+                                            </template>
+                                        </Select>
+                                    </td>
+                                    <td>
+                                        <Select v-model:value="filter.entityTypes" mode="multiple"
+                                            :style="{ width: '100%' }" :options="entityTypeOptions">
+                                        </Select>
+                                    </td>
+                                    <td>
+                                        <Tooltip title="删除" class="pl-4">
+                                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red"
+                                                class="cursor-pointer" @click="handleDeleteFilter(index)" />
+                                        </Tooltip>
+                                    </td>
+                                </tr>
+                            </Table>
+                            <Button class="my-4" type="primary" @click="handleAddFilter">添加筛选器</Button>
+                        </div>
+                    </Form.Item>
+                </div>
+
+            </div>
+
+        </div>
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">要获取的数据</p>
+            <div class="p-2">
+                <Form.Item name="dataToFetch">
+                    <Radio.Group v-model:value="formState.dataToFetch" button-style="solid" :style="{ display: 'flex' }"
+                        class="w-full">
+                        <Radio.Button class="flex-1" value="ATTRIBUTES">Attributes</Radio.Button>
+                        <Radio.Button class="flex-1" value="LATEST_TELEMETRY">Last telemetry</Radio.Button>
+                        <Radio.Button class="flex-1" value="FIELDS">Fields</Radio.Button>
+                    </Radio.Group>
+                </Form.Item>
+                <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+                    <Form.Item name="dataMapping" :rules="[{ validator: validatorDataMapping }]">
+                        <template #label>
+                            <span v-if="formState.dataToFetch == 'ATTRIBUTES'">属性映射</span>
+                            <span v-else-if="formState.dataToFetch == 'LATEST_TELEMETRY'">遥测数据映射</span>
+                            <span v-else>属性映射</span>
+                        </template>
+                        <Table class="mapping-table">
+                            <tr class="header">
+                                <th>原属性</th>
+                                <th>目标属性</th>
+                            </tr>
+                            <tr class="content" v-for="(mapping, index) in mappingList" :key="index">
+                                <td class="py-2 px-4">
+                                    <Input v-model:value="mapping.key" placeholder="输入原属性" />
+                                </td>
+                                <td> <Input v-model:value="mapping.value" placeholder="输入目标属性" />
+                                </td>
+                                <td>
+                                    <Tooltip title="删除" class="pl-4">
+                                        <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red"
+                                            class="cursor-pointer" @click="handleDeleteMapping(index)" />
+                                    </Tooltip>
+                                </td>
+                            </tr>
+                        </Table>
+                        <Button class="my-4" type="primary" @click="handleAddMapping">添加映射</Button>
+                        <Alert type="success" message="只有目标键字段支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
+                    </Form.Item>
+                </div>
+                <Form.Item name="fetchTo">
+                    <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                        <span>添加映射属性到</span>
+                        <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                            <Radio.Button value="DATA">Message</Radio.Button>
+                            <Radio.Button value="METADATA">Metadata</Radio.Button>
+                        </Radio.Group>
+                    </div>
+                </Form.Item>
+
+            </div>
+        </div>
+
+
+
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "related-entity-data",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { PlusOutlined } from '@ant-design/icons-vue';
+import { Form, Input, Radio, Button, Tooltip, Divider, Space, Row, Col, Checkbox, InputNumber, Select, Alert } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+
+interface Configuration {
+    dataMapping: Recordable,
+    dataToFetch: 'ATTRIBUTES' | 'LATEST_TELEMETRY' | 'FIELDS',
+    fetchTo: 'METADATA' | 'DATA',
+    relationsQuery: {
+        direction: 'FROM' | 'TO',
+        maxLevel: number,
+        fetchLastLevelOnly: boolean,
+        filters: Array<any>
+    }
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const VNodes = defineComponent({
+    props: {
+        vnodes: {
+            type: Object,
+            required: true,
+        },
+    },
+    render() {
+        return this.vnodes;
+    },
+});
+
+const mappingList = ref<Array<any>>([]);
+
+const formRef = ref<FormInstance>();
+
+const relationTypeOptions = ref(['Contains', 'Manages']);
+
+const addName = ref();
+const inputRef = ref();
+const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
+    return item.value == EntityType.DEVICE
+        || item.value == EntityType.ASSET
+        || item.value == EntityType.ENTITY_VIEW
+        || item.value == EntityType.TENANT
+        || item.value == EntityType.CUSTOMER
+        || item.value == EntityType.USER
+        || item.value == EntityType.DASHBOARD
+        || item.value == EntityType.EDGE
+})
+
+const formState = reactive<any>({
+    dataMapping: { serialNumber: 'sn' },
+    dataToFetch: 'ATTRIBUTES',
+    fetchTo: 'METADATA',
+    relationsQuery: {
+        direction: 'FROM',
+        maxLevel: 1,
+        fetchLastLevelOnly: false,
+        filters: [{ relationType: 'Contains', entityTypes: [] }],
+    }
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        mappingList.value = [];
+        formState.dataMapping = props.configuration.dataMapping;
+        formState.dataToFetch = props.configuration.dataToFetch;
+        formState.fetchTo = props.configuration.fetchTo;
+        formState.relationsQuery = props.configuration.relationsQuery;
+        Object.keys(formState.dataMapping).forEach(key => {
+            mappingList.value.push({ key: key, value: formState.dataMapping[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            mappingList.value.forEach(mapping => {
+                data.dataMapping[mapping.key] = mapping.value;
+            })
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorDataMapping() {
+    if (mappingList.value.length < 1) {
+        return Promise.reject('属性映射必填！');
+    } else {
+        let validateTag = true;
+        mappingList.value.forEach(mapping => {
+            if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+                validateTag = false;
+            }
+        })
+        if (!validateTag) {
+            return Promise.reject('属性映射不能存在空值！');
+        } else {
+            return Promise.resolve();
+        }
+
+    }
+}
+
+function validatorRelationsQueryFilters() {
+    let validateTag = true;
+
+    formState.relationsQuery.filters.forEach(filter => {
+        if (isEmpty(filter.relationType) || isEmpty(filter.entityTypes)) {
+            validateTag = false;
+        }
+    })
+    if (!validateTag) {
+        return Promise.reject('关联筛选器不能存在空值！');
+    } else {
+        return Promise.resolve();
+    }
+}
+
+function handleDeleteMapping(index: number) {
+    mappingList.value.splice(index, 1)
+}
+
+function handleAddMapping() {
+    mappingList.value.push({ key: '', value: '' })
+}
+
+function handleAddFilter() {
+    if (isEmpty(formState.relationsQuery.filters)) {
+        formState.relationsQuery.filters = []
+    }
+    formState.relationsQuery.filters.push({ relationType: 'Contains', entityTypes: [] })
+}
+
+function handleDeleteFilter(index: number) {
+    formState.relationsQuery.filters.splice(index, 1)
+}
+
+function addRelationType(e) {
+    e.preventDefault();
+    relationTypeOptions.value.push(addName.value);
+    addName.value = '';
+    setTimeout(() => {
+        inputRef.value?.focus();
+    }, 0);
+}
+
+defineExpose({ getConfiguration })
+
+</script>
+
+<style lang="less">
+.ant-form-item-has-error {
+    .mapping-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.mapping-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 887612a..2f4f07e 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -20,6 +20,7 @@
     "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode":"originator-fields",
     "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry",
     "org.thingsboard.rule.engine.metadata.TbGetDeviceAttrNode":"related-device-attributes",
+    "org.thingsboard.rule.engine.metadata.TbGetRelatedAttributeNode":"related-entity-data",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From 1fd72d33885eef591b800f4b90d500104e1ced21 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 9 Apr 2024 16:52:19 +0800
Subject: [PATCH 17/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20tenant-deta?=
 =?UTF-8?q?ils=20tenant-attribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/ENRICHMENT/tenantAttributes.vue   | 177 ++++++++++++++++++
 .../flow/nodeTpl/ENRICHMENT/tenantDetails.vue |  85 +++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   2 +
 3 files changed, 264 insertions(+)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue
new file mode 100644
index 0000000..5b10b8d
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue
@@ -0,0 +1,177 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="dataToFetch">
+            <div class="flex justify-center mb-2">
+                <Radio.Group v-model:value="formState.dataToFetch" button-style="solid">
+                    <Radio.Button value="ATTRIBUTES">Attributes</Radio.Button>
+                    <Radio.Button value="LATEST_TELEMETRY">Last telemetry</Radio.Button>
+                </Radio.Group>
+            </div>
+        </Form.Item>
+
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <Form.Item :label="formState.dataToFetch == 'ATTRIBUTES' ? '属性映射' : '遥测数据映射'" name="dataMapping"
+                :rules="[{ validator: validatorDataMapping }]">
+                <Table class="mapping-table">
+                    <tr class="header">
+                        <th>原属性</th>
+                        <th>目标属性</th>
+                    </tr>
+                    <tr class="content" v-for="(mapping, index) in mappingList" :key="index">
+                        <td class="py-2 px-4">
+                            <Input v-model:value="mapping.key" placeholder="输入原属性" />
+                        </td>
+                        <td> <Input v-model:value="mapping.value" placeholder="输入目标属性" />
+                        </td>
+                        <td>
+                            <Tooltip title="删除" class="pl-4">
+                                <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                    @click="handleDeleteMapping(index)" />
+                            </Tooltip>
+                        </td>
+                    </tr>
+                </Table>
+                <Button class="my-4" type="primary" @click="handleAddMapping">添加映射</Button>
+                <Alert type="success" message="所有输入字段都支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
+            </Form.Item>
+        </div>
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>添加映射属性到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "tenant-attributes",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Radio, Button, Tooltip, Alert } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    dataMapping: Recordable,
+    dataToFetch: 'ATTRIBUTES' | 'LATEST_TELEMETRY',
+    fetchTo: 'METADATA' | 'DATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const mappingList = ref<Array<any>>([]);
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    dataMapping: { alarmThreshold: 'threshold' },
+    dataToFetch: 'ATTRIBUTES',
+    fetchTo: 'METADATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        mappingList.value = [];
+        formState.dataMapping = props.configuration.dataMapping;
+        formState.dataToFetch = props.configuration.dataToFetch;
+        formState.fetchTo = props.configuration.fetchTo;
+        Object.keys(formState.dataMapping).forEach(key => {
+            mappingList.value.push({ key: key, value: formState.dataMapping[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            mappingList.value.forEach(mapping => {
+                data.dataMapping[mapping.key] = mapping.value;
+            })
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorDataMapping() {
+    if (mappingList.value.length < 1) {
+        return Promise.reject('属性映射必填！');
+    } else {
+        let validateTag = true;
+        mappingList.value.forEach(mapping => {
+            if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+                validateTag = false;
+            }
+        })
+        if (!validateTag) {
+            return Promise.reject('属性映射不能存在空值！');
+        } else {
+            return Promise.resolve();
+        }
+
+    }
+}
+
+function handleDeleteMapping(index: number) {
+    mappingList.value.splice(index, 1)
+}
+
+function handleAddMapping() {
+    mappingList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
+
+<style lang="less">
+.ant-form-item-has-error {
+    .mapping-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.mapping-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
new file mode 100644
index 0000000..c53e5ff
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
@@ -0,0 +1,85 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="detailsList">
+            <Select v-model:value="formState.detailsList" :options="detailsOptions" mode="multiple">
+            </Select>
+        </Form.Item>
+
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>添加选中的详情到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "tenant-details",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Radio, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    detailsList: [];
+    fetchTo: 'DATA' | 'METADATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const detailsOptions = [
+    { value: 'ID', label: 'Id' },
+    { value: 'TITLE', label: 'Title' },
+    { value: 'COUNTRY', label: 'Country' },
+    { value: 'STATE', label: 'State' },
+    { value: 'CITY', label: 'City' },
+    { value: 'ZIP', label: 'Zip' },
+    { value: 'ADDRESS', label: 'Address' },
+    { value: 'ADDRESS2', label: 'Address2' },
+    { value: 'PHONE', label: 'Phone' },
+    { value: 'EMAIL', label: 'Email' },
+    { value: 'ADDITIONAL_INFO', label: 'Additional Info' },
+
+];
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    detailsList: [],
+    fetchTo: 'DATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.detailsList = props.configuration.detailsList;
+        formState.fetchTo = props.configuration.fetchTo;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 2f4f07e..8b766bf 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -21,6 +21,8 @@
     "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry",
     "org.thingsboard.rule.engine.metadata.TbGetDeviceAttrNode":"related-device-attributes",
     "org.thingsboard.rule.engine.metadata.TbGetRelatedAttributeNode":"related-entity-data",
+    "org.thingsboard.rule.engine.metadata.TbGetTenantAttributeNode":"tenant-attributes",
+    "org.thingsboard.rule.engine.metadata.TbGetTenantDetailsNode":"tenant-details",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From d304bb83863fdd55c126cf41fda4ccbe03ac09d3 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 9 Apr 2024 16:54:47 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20tenant-deta?=
 =?UTF-8?q?ils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
index c53e5ff..27c578d 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
 
-        <Form.Item name="detailsList">
+        <Form.Item label="选择详情" name="detailsList" :rules="[{ required: true, message: '请选择设备详情!' }]">
             <Select v-model:value="formState.detailsList" :options="detailsOptions" mode="multiple">
             </Select>
         </Form.Item>
-- 
Gitee


From a4c347e7f14614882dd3a0fd18761fdaddd4fc97 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 9 Apr 2024 17:32:50 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE-flow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/FLOW/acknowledge.vue         | 56 +++++++++++
 .../flow/nodeTpl/FLOW/checkpoint.vue          | 93 +++++++++++++++++++
 .../ruleChain/flow/nodeTpl/FLOW/output.vue    | 60 ++++++++++++
 .../ruleChain/flow/nodeTpl/FLOW/ruleChain.vue | 79 ++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  5 +
 5 files changed, 293 insertions(+)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue
new file mode 100644
index 0000000..96ad9da
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "acknowledge",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue
new file mode 100644
index 0000000..f1a9143
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue
@@ -0,0 +1,93 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="队列" name="queueName" :rules="[{ required: true, message: '请选择队列!' }]">
+            <Select v-model:value="formState.queueName" placeholder="请选择队列">
+                <Select.Option v-for="(option, index) in queueOptions" :key="index" :value="option.value">
+                    {{ option.label }}
+                    <p>
+                        <Tag>
+                            <small>提交策略:</small>
+                            {{ SUBMIT_STRATEGY_OPTIONS.find((item) => item.value === option.submitStrategy)?.label ||
+                                option.submitStrategy }}
+                        </Tag>
+                        <Tag>
+                            <small>处理策略:</small>
+                            {{ PROCESSING_STRATEGY_OPTIONS.find((item) => item.value === option.processingStrategy)?.label
+                                ||
+                                option.processingStrategy }}
+                        </Tag>
+                    </p>
+                </Select.Option>
+            </Select>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "checkpoint",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive, onMounted } from 'vue';
+import { Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { PROCESSING_STRATEGY_OPTIONS, SUBMIT_STRATEGY_OPTIONS } from '/@/enums/queueEnum';
+import { queueList } from '/@/api/things/queue';
+
+interface Configuration {
+    queueName: string
+}
+
+const queueOptions = ref<any[]>([]);
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    queueName: undefined,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.queueName = props.configuration.queueName },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+onMounted(async () => {
+    await fetchQueueList();
+})
+
+async function fetchQueueList() {
+    const queueListResult = await queueList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, 'TB_RULE_ENGINE');
+    queueOptions.value = queueListResult.data.map(item => {
+        return {
+            value: item.name,
+            label: item.name,
+            submitStrategy: item.submitStrategy?.type,
+            processingStrategy: item.processingStrategy?.type
+        }
+    })
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue
new file mode 100644
index 0000000..5ac82c7
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue
@@ -0,0 +1,60 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+        <Alert>
+            <template #message>
+                规则节点名称对应于输出消息的关系类型，用于转发消息发送到调用方规则链中的其他规则节点。
+            </template>
+        </Alert>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "output",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Alert } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue
new file mode 100644
index 0000000..ad75eb8
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue
@@ -0,0 +1,79 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="规则链" name="ruleChainId" :rules="[{ required: true, message: '请选择规则链!' }]">
+            <Select v-model:value="formState.ruleChainId" placeholder="请选择规则链">
+                <Select.Option v-for="(option, index) in ruleChainOptions" :key="index" :value="option.value">
+                    {{ option.label }}
+                </Select.Option>
+            </Select>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "rule-chain",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive, onMounted } from 'vue';
+import { Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { ruleChainList } from '/@/api/things/ruleChain';
+
+interface Configuration {
+    ruleChainId: string
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const ruleChainOptions = ref<any[]>([]);
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    ruleChainId: undefined,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.ruleChainId = props.configuration.ruleChainId },
+    { immediate: true }
+)
+
+onMounted(async () => {
+    await fetchRuleChainList();
+})
+
+async function fetchRuleChainList() {
+    const ruleChainListResult = await ruleChainList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, 'CORE');
+    ruleChainOptions.value = ruleChainListResult.data.map(item => {
+        return {
+            value: item.id.id,
+            label: item.name,
+        }
+    })
+    //TODO : 过滤规则本规则链的 id   使用Inject
+
+}
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 8b766bf..2dcd6a2 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -24,6 +24,11 @@
     "org.thingsboard.rule.engine.metadata.TbGetTenantAttributeNode":"tenant-attributes",
     "org.thingsboard.rule.engine.metadata.TbGetTenantDetailsNode":"tenant-details",
 
+    "org.thingsboard.rule.engine.flow.TbAckNode":"acknowledge",
+    "org.thingsboard.rule.engine.flow.TbCheckpointNode":"checkpoint",
+    "org.thingsboard.rule.engine.flow.TbRuleChainOutputNod":"output",
+    "org.thingsboard.rule.engine.flow.TbRuleChainInputNode":"rule-chain",
+
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
     "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
-- 
Gitee


From 1d451593edcd2b835e5f10c827a6908f23a9b19a Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Thu, 11 Apr 2024 14:23:33 +0800
Subject: [PATCH 20/38] output bug

---
 src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 2dcd6a2..f0bd850 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -26,7 +26,7 @@
 
     "org.thingsboard.rule.engine.flow.TbAckNode":"acknowledge",
     "org.thingsboard.rule.engine.flow.TbCheckpointNode":"checkpoint",
-    "org.thingsboard.rule.engine.flow.TbRuleChainOutputNod":"output",
+    "org.thingsboard.rule.engine.flow.TbRuleChainOutputNode":"output",
     "org.thingsboard.rule.engine.flow.TbRuleChainInputNode":"rule-chain",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
-- 
Gitee


From 99fd3af9ddf715f99d55137f168723b491caad0d Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Thu, 11 Apr 2024 14:35:57 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0ruleChainId=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/things/ruleChain/flow/nodeForm.vue                   | 3 ++-
 .../ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue       | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue   | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue      | 1 +
 .../flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue         | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue     | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue  | 1 +
 .../flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue        | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue    | 1 +
 .../ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue     | 1 +
 .../things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue | 1 +
 .../ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue       | 1 +
 .../things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue  | 1 +
 .../ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue      | 1 +
 .../ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue    | 1 +
 .../ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue      | 1 +
 .../things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue   | 1 +
 .../things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue  | 1 +
 .../ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue      | 1 +
 .../things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue | 1 +
 .../things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue | 1 +
 src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue      | 1 +
 src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue      | 1 +
 src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue   | 1 +
 src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue    | 1 +
 src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue        | 1 +
 src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue     | 3 ++-
 .../ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue | 2 ++
 .../ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue     | 2 ++
 .../ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue   | 2 ++
 .../things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue  | 2 ++
 .../things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue    | 1 +
 33 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/views/things/ruleChain/flow/nodeForm.vue b/src/views/things/ruleChain/flow/nodeForm.vue
index d2f28de..6cef648 100644
--- a/src/views/things/ruleChain/flow/nodeForm.vue
+++ b/src/views/things/ruleChain/flow/nodeForm.vue
@@ -19,7 +19,8 @@
         </Form.Item>
         </Col>
       </Row>
-      <component ref="compRef" :is="ruleChainTypes[formState.type]" :configuration="formState.configuration">
+      <component ref="compRef" :is="ruleChainTypes[formState.type]" :configuration="formState.configuration"
+        :ruleChainId="formState.ruleChainId?.id">
 
       </component>
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue
index c0ad78e..64c5630 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue
@@ -72,6 +72,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
index 7723d14..3615bbd 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
@@ -75,6 +75,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue
index f42ff69..7db14d3 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue
@@ -44,6 +44,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue
index f00fd45..5b419ba 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue
@@ -34,6 +34,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
index 09693d9..62147fb 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
@@ -73,6 +73,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue
index 472a782..21a730e 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue
@@ -72,6 +72,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
index f0a106f..c6db479 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
@@ -138,6 +138,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 });
 
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
index b222fa3..9d8f893 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
@@ -150,6 +150,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 });
 
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
index 5df3533..392c4fc 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
@@ -169,6 +169,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue
index 5b10b8d..857d88d 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantAttributes.vue
@@ -75,6 +75,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
index 27c578d..7c1c25b 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/tenantDetails.vue
@@ -38,6 +38,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue
index a0241f9..bf59f49 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue
@@ -28,6 +28,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue
index 58fc4d2..14a3b17 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue
@@ -29,6 +29,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
index b92b439..8053f15 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
@@ -47,6 +47,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 });
 
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
index 7a175db..2a7d40d 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
@@ -97,6 +97,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 });
 
 const userStore = useUserStore();
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue
index 0003fb1..e6e22f7 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue
@@ -28,6 +28,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue
index 88dfb82..62c4882 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue
@@ -29,6 +29,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue
index 3ed65bd..a10bf04 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue
@@ -28,6 +28,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
index fb6386d..9f7b745 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
@@ -101,6 +101,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue
index 65db0aa..ca78ea6 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue
@@ -28,6 +28,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue
index c0d2f67..ab8ce5f 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue
@@ -28,6 +28,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
index f6d860b..5cc232b 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
@@ -67,6 +67,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
index 07df3b9..d607da6 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
@@ -67,6 +67,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue
index 96ad9da..a4504ce 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/acknowledge.vue
@@ -28,6 +28,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue
index f1a9143..1ff52a1 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/checkpoint.vue
@@ -48,6 +48,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue
index 5ac82c7..6d97fcc 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/output.vue
@@ -32,6 +32,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue b/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue
index ad75eb8..49f9283 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FLOW/ruleChain.vue
@@ -32,6 +32,7 @@ const props = defineProps({
         type: Object as PropType<Configuration>,
         required: true,
     },
+    ruleChainId: { type: String, default: '' }
 
 });
 
@@ -56,7 +57,7 @@ onMounted(async () => {
 
 async function fetchRuleChainList() {
     const ruleChainListResult = await ruleChainList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, 'CORE');
-    ruleChainOptions.value = ruleChainListResult.data.map(item => {
+    ruleChainOptions.value = ruleChainListResult.data.filter(item => item.id.id != props.ruleChainId).map(item => {
         return {
             value: item.id.id,
             label: item.name,
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
index c515c6f..290f2f8 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
@@ -119,6 +119,8 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
+
 });
 
 const allowedEntityTypes = ENTITY_TYPE_OPTIONS.filter(item => {
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
index 14d906c..14fcb12 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
@@ -38,6 +38,8 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
+
 });
 
 const formRef = ref<FormInstance>();
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
index 454c613..106d5aa 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
@@ -38,6 +38,8 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
+
 });
 
 const formRef = ref<FormInstance>();
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
index 1087a0c..e4d48fe 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
@@ -28,6 +28,8 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
+
 });
 
 const formRef = ref<FormInstance>();
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
index 46d3535..1ae3def 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
@@ -59,6 +59,7 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
 
 });
 
-- 
Gitee


From 9495e3f20d916093f35087582a5f19ff0cfe44a0 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Thu, 11 Apr 2024 14:50:59 +0800
Subject: [PATCH 22/38] =?UTF-8?q?rename-keys=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/TRANSFORMATION/renameKeys.vue     | 126 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   3 +-
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue
new file mode 100644
index 0000000..4bfa6c8
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue
@@ -0,0 +1,126 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item name="dataToFetch">
+      <div class="flex justify-center mb-2">
+        <Radio.Group v-model:value="formState.renameIn" button-style="solid">
+          <Radio.Button value="DATA">消息</Radio.Button>
+          <Radio.Button value="METADATA">元数据</Radio.Button>
+        </Radio.Group>
+      </div>
+    </Form.Item>
+    <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+      <Form.Item :label="formState.dataToFetch == 'DATA' ? '消息' : '元数据'" name="renameKeysMapping"
+        :rules="[{ validator: validatorDataMapping }]">
+        <Table class="mapping-table">
+          <tr class="header">
+            <th>当前key</th>
+            <th>名命key</th>
+          </tr>
+          <tr class="content" v-for="(mapping, index) in mappingList" :key="index">
+            <td class="py-2 px-4">
+              <Input v-model:value="mapping.key" placeholder="当前key" />
+            </td>
+            <td> <Input v-model:value="mapping.value" placeholder="名命key" />
+            </td>
+            <td>
+              <Tooltip title="删除" class="pl-4">
+                <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                  @click="handleDeleteMapping(index)" />
+              </Tooltip>
+            </td>
+          </tr>
+        </Table>
+        <Button class="my-4" type="primary" @click="handleAddMapping">添加映射</Button>
+      </Form.Item>
+    </div>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: 'rename-keys',
+});
+</script>
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Radio, Button, Tooltip, Alert } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+  renameIn: 'METADATA' | 'DATA',
+  renameKeysMapping: Recordable
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+});
+
+const mappingList = ref<Array<any>>([]);
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  renameIn: "DATA",
+  renameKeysMapping: { temperatureCelsius: "temperature" },
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    mappingList.value = [];
+    formState.renameKeysMapping = props.configuration.renameKeysMapping;
+    formState.dataToFetch = props.configuration.renameIn;
+    Object.keys(formState.renameKeysMapping).forEach(key => {
+      mappingList.value.push({ key: key, value: formState.renameKeysMapping[key] })
+    })
+  },
+  { immediate: true },
+);
+
+async function getConfiguration() {
+  try {
+    const data = await formRef.value?.validate();
+    if (data) {
+      mappingList.value.forEach(mapping => {
+        data.renameKeysMapping[mapping.key] = mapping.value;
+      })
+    }
+    return data;
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+function validatorDataMapping() {
+  if (mappingList.value.length < 1) {
+    return Promise.reject('key映射必填！');
+  } else {
+    let validateTag = true;
+    mappingList.value.forEach(mapping => {
+      if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+        validateTag = false;
+      }
+    })
+    if (!validateTag) {
+      return Promise.reject('key映射不能存在空值！');
+    } else {
+      return Promise.resolve();
+    }
+
+  }
+}
+
+function handleDeleteMapping(index: number) {
+  mappingList.value.splice(index, 1)
+}
+
+function handleAddMapping() {
+  mappingList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index f0bd850..1c3f216 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -33,5 +33,6 @@
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
     "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
     "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path",
-    "org.thingsboard.rule.engine.transform.TbTransformMsgNode":"script"
+    "org.thingsboard.rule.engine.transform.TbTransformMsgNode":"script",
+    "org.thingsboard.rule.engine.transform.TbRenameKeysNode":"rename-keys"
 }
-- 
Gitee


From 14fc5beb6d194542fe13db825712a899d1e2a5a7 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Thu, 11 Apr 2024 17:26:39 +0800
Subject: [PATCH 23/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20restAPi=20s?=
 =?UTF-8?q?endEmail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/EXTERNAL/restApiCall.vue     | 117 +++++++++++
 .../flow/nodeTpl/EXTERNAL/sendEmail.vue       | 183 ++++++++++++++++++
 .../nodeTpl/EXTERNAL/sendNotification.vue     |  99 ++++++++++
 .../flow/nodeTpl/EXTERNAL/sendSms.vue         |  78 ++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   5 +
 src/views/things/setting/mailSetting.vue      |   1 +
 6 files changed, 483 insertions(+)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendEmail.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendNotification.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendSms.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
new file mode 100644
index 0000000..e020b3c
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
@@ -0,0 +1,117 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="Endpoint URL pattern" name="restEndpointUrlPattern"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。"
+            :rules="[{ required: true, message: 'Endpoint URL 必填!' }]">
+            <Input v-model:value="formState.restEndpointUrlPattern">
+            </Input>
+        </Form.Item>
+        <Form.Item label="Request method" name="requestMethod" :rules="[{ required: true, message: 'Request method 必选!' }]">
+            <Select v-model:value="formState.requestMethod">
+                <Select.Option value="POST">POST</Select.Option>
+                <Select.Option value="GET">GET</Select.Option>
+                <Select.Option value="PUT">PUT</Select.Option>
+                <Select.Option value="DELETE">DELETE</Select.Option>
+            </Select>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "rest-api-call",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    credentials: { type: string },
+    enableProxy: boolean,
+    headers: Recordable,
+    ignoreRequestBody: boolean,
+    maxParallelRequestsCount: number,
+    parseToPlainText: boolean,
+    proxyHost: string,
+    proxyPassword: string,
+    proxyPort: number,
+    proxyScheme: string,
+    proxyUser: string,
+    readTimeoutMs: number,
+    requestMethod: string,
+    restEndpointUrlPattern: string,
+    useRedisQueueForMsgPersistence: boolean,
+    useSimpleClientHttpFactory: boolean,
+    useSystemProxyProperties: boolean,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    credentials: { type: 'anonymous' },
+    enableProxy: false,
+    headers: { 'Content-Type': 'application/json' },
+    ignoreRequestBody: false,
+    maxParallelRequestsCount: 0,
+    parseToPlainText: false,
+    proxyHost: null,
+    proxyPassword: null,
+    proxyPort: 0,
+    proxyScheme: null,
+    proxyUser: null,
+    readTimeoutMs: 0,
+    requestMethod: 'POST',
+    restEndpointUrlPattern: 'http://localhost/api',
+    useRedisQueueForMsgPersistence: false,
+    useSimpleClientHttpFactory: false,
+    useSystemProxyProperties: false,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.credentials = props.configuration.credentials;
+        formState.enableProxy = props.configuration.enableProxy;
+        formState.headers = props.configuration.headers;
+        formState.ignoreRequestBody = props.configuration.ignoreRequestBody;
+        formState.maxParallelRequestsCount = props.configuration.maxParallelRequestsCount;
+        formState.parseToPlainText = props.configuration.parseToPlainText;
+        formState.proxyHost = props.configuration.proxyHost;
+        formState.proxyPassword = props.configuration.proxyPassword;
+        formState.proxyPort = props.configuration.proxyPort;
+        formState.proxyScheme = props.configuration.proxyScheme;
+        formState.proxyUser = props.configuration.proxyUser;
+        formState.readTimeoutMs = props.configuration.readTimeoutMs;
+        formState.requestMethod = props.configuration.requestMethod;
+        formState.restEndpointUrlPattern = props.configuration.restEndpointUrlPattern;
+        formState.useRedisQueueForMsgPersistence = props.configuration.useRedisQueueForMsgPersistence;
+        formState.useSimpleClientHttpFactory = props.configuration.useSimpleClientHttpFactory;
+        formState.useSystemProxyProperties = props.configuration.useSystemProxyProperties;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendEmail.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendEmail.vue
new file mode 100644
index 0000000..a5783a7
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendEmail.vue
@@ -0,0 +1,183 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="useSystemSmtpSettings">
+            <Checkbox v-model:checked="formState.useSystemSmtpSettings">
+                使用系统SMTP设置
+            </Checkbox>
+        </Form.Item>
+        <template v-if="formState.useSystemSmtpSettings == false">
+            <Row :gutter="20">
+                <Col :span="24">
+                <Form.Item label="协议" name="smtpProtocol">
+                    <Select v-model:value="formState.smtpProtocol">
+                        <Select.Option value="smtp">SMTP</Select.Option>
+                        <Select.Option value="smtps">SMTPS</Select.Option>
+                    </Select>
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item label="SMTP 主机" name="smtpHost" :rules="[{ required: true, message: 'SMTP 主机必填!' }]">
+                    <Input v-model:value="formState.smtpHost" />
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item label="SMTP 端口" name="smtpPort" :rules="[{ required: true, message: 'SMTP 端口必填!' }]">
+                    <InputNumber v-model:value="formState.smtpPort" :min="1" :max=65535 :style="{ width: '100%' }" />
+                </Form.Item>
+                </Col>
+                <Col :span="24">
+                <Form.Item label="超时时间" name="timeout" :rules="[{ required: true, message: '超时时间必填!' }]">
+                    <InputNumber v-model:value="formState.timeout" :min="0" :style="{ width: '100%' }" />
+                </Form.Item>
+                </Col>
+                <Col :span="24">
+                <Form.Item name="enableTls">
+                    <Checkbox v-model:checked="formState.enableTls">
+                        启用TLS
+                    </Checkbox>
+                </Form.Item>
+                </Col>
+                <Col :span="24" v-if="formState.enableTls == true">
+                <Form.Item label="TLS版本" name="tlsVersion">
+                    <Select v-model:value="formState.tlsVersion">
+                        <Select.Option value="TLSv1">TLSv1</Select.Option>
+                        <Select.Option value="TLSv1.1">TLSv1.1</Select.Option>
+                        <Select.Option value="TLSv1.2">TLSv1.2</Select.Option>
+                        <Select.Option value="TLSv1.3">TLSv1.3</Select.Option>
+                    </Select>
+                </Form.Item>
+                </Col>
+                <Col :span="24">
+                <Form.Item name="enableProxy">
+                    <Checkbox v-model:checked="formState.enableProxy">
+                        启用代理
+                    </Checkbox>
+                </Form.Item>
+                </Col>
+                <template v-if="formState.enableProxy == true">
+                    <Col :span="12">
+                    <Form.Item label="代理主机" name="proxyHost" :rules="[{ required: true, message: '代理主机必填!' }]">
+                        <Input v-model:value="formState.proxyHost" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="代理端口" name="proxyPort" :rules="[{ required: true, message: '代理端口必填!' }]">
+                        <InputNumber v-model:value="formState.proxyPort" :min="1" :max=65535 :style="{ width: '100%' }" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="24">
+                    <Form.Item label="代理用户" name="proxyUser">
+                        <Input v-model:value="formState.proxyUser" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="24">
+                    <Form.Item label="代理密码" name="proxyPassword">
+                        <InputPassword v-model:value="formState.proxyPassword" />
+                    </Form.Item>
+                    </Col>
+                </template>
+                <Col :span="24">
+                <Form.Item label="用户名" name="username">
+                    <Input v-model:value="formState.username" />
+                </Form.Item>
+                </Col>
+                <Col :span="24">
+                <Form.Item label="密码" name="password">
+                    <InputPassword v-model:value="formState.password" />
+                </Form.Item>
+                </Col>
+            </Row>
+        </template>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "send-email",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Checkbox, Select, Input, Row, Col, InputNumber, InputPassword } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    enableProxy: boolean;
+    enableTls: boolean;
+    proxyHost: string;
+    proxyPassword: string;
+    proxyPort: string;
+    proxyUser: string;
+    smtpHost: string;
+    smtpPort: number;
+    smtpProtocol: string;
+    timeout: number;
+    tlsVersion: string;
+    useSystemSmtpSettings: boolean;
+    username: string;
+    password: string;
+
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    enableProxy: false,
+    enableTls: false,
+    proxyHost: null,
+    proxyPassword: null,
+    proxyPort: null,
+    proxyUser: null,
+    smtpHost: "localhost",
+    smtpPort: 25,
+    smtpProtocol: "smtp",
+    timeout: 10000,
+    tlsVersion: "TLSv1.2",
+    useSystemSmtpSettings: true,
+    username: null,
+    password: null,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.enableProxy = props.configuration.enableProxy;
+        formState.enableTls = props.configuration.enableTls;
+        formState.proxyHost = props.configuration.proxyHost;
+        formState.proxyPassword = props.configuration.proxyPassword;
+        formState.proxyPort = props.configuration.proxyPort;
+        formState.proxyUser = props.configuration.proxyUser;
+        formState.smtpHost = props.configuration.smtpHost;
+        formState.smtpPort = props.configuration.smtpPort;
+        formState.smtpProtocol = props.configuration.smtpProtocol;
+        formState.timeout = props.configuration.timeout;
+        formState.tlsVersion = props.configuration.tlsVersion;
+        formState.useSystemSmtpSettings = props.configuration.useSystemSmtpSettings;
+        formState.username = props.configuration.username;
+        formState.password = props.configuration.password;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendNotification.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendNotification.vue
new file mode 100644
index 0000000..4252a12
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendNotification.vue
@@ -0,0 +1,99 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Form.Item :name="['templateId', 'entityType']" v-show="false">
+            <Input v-model:value="formState.templateId.entityType" />
+        </Form.Item>
+        <Form.Item label="模版" :name="['templateId', 'id']" :rules="[{ required: true, message: '请选择模板!' }]">
+            <Select v-model:value="formState.templateId.id" placeholder="请选择通知模版">
+                <Select.Option v-for="(option, index) in templateOptions" :key="index" :value="option.value">
+                    {{ option.label }}
+                    <Tag v-for="(method, index) in option.deliveryMethods" :key="index">
+                        {{ method }}
+                    </Tag>
+                </Select.Option>
+            </Select>
+        </Form.Item>
+        <Form.Item label="收件人" name="targets" :rules="[{ required: true, message: '请选择收件人!' }]">
+            <Select v-model:value="formState.targets" mode="multiple" placeholder="请选择收件人">
+                <Select.Option v-for="(option, index) in targetOptions" :key="index" :value="option.value">
+                    {{ option.label }}
+                </Select.Option>
+            </Select>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "send-notification",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Select, Tag } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { EntityId } from '/#/store';
+import { EntityType } from '/@/enums/entityTypeEnum';
+import { notificationTemplateList } from '/@/api/things/notificationTemplate';
+import { NotificationType } from '/@/enums/notificationEnum';
+import { notificationTargetList } from '/@/api/things/notificationTarget';
+
+interface Configuration {
+    templateId: EntityId<EntityType.NOTIFICATION_TEMPLATE>;
+    targets: [string];
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const templateOptions = ref<Array<any>>([]);
+const targetOptions = ref<Array<any>>([]);
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    templateId: { entityType: EntityType.NOTIFICATION_TEMPLATE, id: '' },
+    targets: [],
+});
+
+watch(
+    () => props.configuration,
+    async () => {
+        await fetchTemplateList();
+        await fetchTargetList();
+        formState.templateId = props.configuration.templateId || { entityType: EntityType.NOTIFICATION_TEMPLATE, id: '' };
+        formState.targets = props.configuration.targets;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+async function fetchTemplateList() {
+    const templateListResult = await notificationTemplateList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, NotificationType.RULE_NODE);
+    templateOptions.value = templateListResult.data.map(item => { return { value: item.id.id, label: item.name, deliveryMethods: Object.keys(item.configuration.deliveryMethodsTemplates as any) } })
+
+}
+
+async function fetchTargetList() {
+    const targetListResult = await notificationTargetList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, NotificationType.RULE_NODE);
+    targetOptions.value = targetListResult.data.map(item => ({ value: item.id.id, label: item.name }))
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendSms.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendSms.vue
new file mode 100644
index 0000000..9d29c89
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/sendSms.vue
@@ -0,0 +1,78 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="手机号码模板" name="numbersToTemplate" :rules="[{ required: true, message: '请输入手机号码模板!' }]"
+            help="逗号分隔的电话号码，使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值">
+            <Input v-model:value="formState.numbersToTemplate" />
+        </Form.Item>
+        <Form.Item label="短信消息模板" name="smsMessageTemplate" :rules="[{ required: true, message: '请输入短信消息模板!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Textarea v-model:value="formState.smsMessageTemplate" :rows="5" />
+        </Form.Item>
+        <Form.Item name="useSystemSmsSettings">
+            <Checkbox v-model:checked="formState.useSystemSmsSettings">
+                使用系统短信提供商设置
+            </Checkbox>
+        </Form.Item>
+        <!--TODO: 使用其他的供应商配置-->
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "send-sms",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Textarea, Checkbox } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    numbersToTemplate: string,
+    smsMessageTemplate: string,
+    useSystemSmsSettings: boolean,
+    smsProviderConfiguration: Recordable,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    numbersToTemplate: "${userPhone}",
+    smsMessageTemplate: "Device ${deviceName} has high temperature ${temp}",
+    smsProviderConfiguration: null,
+    useSystemSmsSettings: true,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.numbersToTemplate = props.configuration.numbersToTemplate;
+        formState.smsMessageTemplate = props.configuration.smsMessageTemplate;
+        formState.smsProviderConfiguration = props.configuration.smsProviderConfiguration;
+        formState.useSystemSmsSettings = props.configuration.useSystemSmsSettings;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 1c3f216..1c3ea5d 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -29,6 +29,11 @@
     "org.thingsboard.rule.engine.flow.TbRuleChainOutputNode":"output",
     "org.thingsboard.rule.engine.flow.TbRuleChainInputNode":"rule-chain",
 
+    "org.thingsboard.rule.engine.sms.TbSendSmsNode":"send-sms",
+    "org.thingsboard.rule.engine.notification.TbNotificationNode":"send-notification",
+    "org.thingsboard.rule.engine.mail.TbSendEmailNode":"send-email",
+    "org.thingsboard.rule.engine.rest.TbRestApiCallNode":"rest-api-call",
+
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
     "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
diff --git a/src/views/things/setting/mailSetting.vue b/src/views/things/setting/mailSetting.vue
index 3aadddb..7133e4f 100644
--- a/src/views/things/setting/mailSetting.vue
+++ b/src/views/things/setting/mailSetting.vue
@@ -90,6 +90,7 @@ const inputFormSchemas: FormSchema[] = [
     defaultValue: 25,
     componentProps: {
       min: 1,
+      max: 65535,
       placeholder: t('SMTP端口号码'),
     },
     required: true,
-- 
Gitee


From 08faf6b9ae741a0a315914b568f1be51519908a6 Mon Sep 17 00:00:00 2001
From: struggle3 <1037418341@qq.com>
Date: Sat, 13 Apr 2024 23:07:59 +0800
Subject: [PATCH 24/38] =?UTF-8?q?deduplication=E5=BC=80=E5=8F=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/TRANSFORMATION/deduplication.vue  | 150 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   3 +-
 2 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
new file mode 100644
index 0000000..f966cd8
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
@@ -0,0 +1,150 @@
+<template>
+  <Form ref="formRef" :model="formState" layout="vertical">
+    <Form.Item label="时间间隔" name="interval" :rules="[{ required: true, message: '时间间隔不能为空!' }]">
+      <Input v-model:value="formState.interval" />
+    </Form.Item>
+    <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+      <p class="text-base font-medium">存储</p>
+      <div class="p-2">
+        <Form.Item name="strategy">
+          <Radio.Group v-model:value="formState.strategy" button-style="solid" :style="{ display: 'flex' }"
+            class="w-full">
+            <Radio.Button class="flex-1" value="FIRST">First</Radio.Button>
+            <Radio.Button class="flex-1" value="LAST">Last</Radio.Button>
+            <Radio.Button class="flex-1" value="ALL">All</Radio.Button>
+          </Radio.Group>
+        </Form.Item>
+        <Alert type="success">
+            <template #message>
+              <span v-if="formState.strategy == 'FIRST'">返回在重复数据删除期间到达的第一条消息。</span>
+              <span v-else-if="formState.strategy == 'LAST'">返回重复数据删除期间到达的最后一条消息。</span>
+              <span v-else="formState.strategy == 'ALL'">将重复数据删除期间到达的所有消息作为单个JSON数组消息返回；其中每个元素代表具有msg和元数据内部属性的对象。</span>
+            </template>
+          </Alert>
+      </div>
+    </div>
+    <Form.Item label="队列" name="queueName" :rules="[{ required: true, message: '请选择队列!' }]">
+      <Select v-model:value="formState.queueName" placeholder="请选择队列">
+        <Select.Option v-for="(option, index) in queueOptions" :key="index" :value="option.value">
+          {{ option.label }}
+          <p>
+            <Tag>
+              <small>提交策略:</small>
+              {{ SUBMIT_STRATEGY_OPTIONS.find((item) => item.value === option.submitStrategy)?.label ||
+                option.submitStrategy }}
+            </Tag>
+            <Tag>
+              <small>处理策略:</small>
+              {{ PROCESSING_STRATEGY_OPTIONS.find((item) => item.value === option.processingStrategy)?.label
+                ||
+                option.processingStrategy }}
+            </Tag>
+          </p>
+        </Select.Option>
+      </Select>
+    </Form.Item>
+    <Collapse expand-icon-position="end">
+      <Collapse.Panel header="高级设置">
+        <Row :gutter="20">
+          <Col :span="12">
+          <Form.Item label="消息最大待处理数量" name="maxPendingMsgs" :rules="[{ required: true, message: '数值不能为空!' }]">
+            <Input v-model:value="formState.maxPendingMsgs">
+            </Input>
+          </Form.Item>
+          </Col>
+          <Col :span="12">
+          <Form.Item label="消息最大重试数量" name="maxRetries" :rules="[{ required: true, message: '数值不能为空!' }]">
+            <Input v-model:value="formState.maxRetries">
+            </Input>
+          </Form.Item>
+          </Col>
+        </Row>
+      </Collapse.Panel>
+    </Collapse>
+  </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+  name: 'deduplication',
+});
+</script>
+<script lang="ts" setup>
+import { ref, watch, defineComponent, reactive, onMounted } from 'vue';
+import { Form, Select, Row, Col, Radio, Input, Alert,Collapse } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { PROCESSING_STRATEGY_OPTIONS, SUBMIT_STRATEGY_OPTIONS } from '/@/enums/queueEnum';
+import { queueList } from '/@/api/things/queue';
+
+interface Configuration {
+  interval: number,
+  maxPendingMsgs: number,
+  maxRetries: number,
+  outMsgType: any,
+  strategy: 'FIRST' | 'LAST' | 'ALL',
+  queueName: string,
+}
+
+const props = defineProps({
+  configuration: {
+    type: Object as PropType<Configuration>,
+    required: true,
+  },
+});
+
+const queueOptions = ref<any[]>([]);
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+  interval: 60,
+  maxPendingMsgs: 100,
+  maxRetries: 3,
+  outMsgType: null,
+  strategy: "FIRST",
+  queueName: undefined,
+});
+
+watch(
+  () => props.configuration,
+  () => {
+    formState.interval = props.configuration.interval;
+    formState.maxPendingMsgs = props.configuration.maxPendingMsgs;
+    formState.maxRetries = props.configuration.maxRetries;
+    formState.outMsgType = props.configuration.outMsgType;
+    formState.strategy = props.configuration.strategy;
+    formState.queueName = props.configuration.queueName;
+  },
+  { immediate: true }
+);
+
+async function getConfiguration() {
+  try {
+    const data = await formRef.value?.validate();
+    if (data) {
+
+    }
+    return data;
+  } catch (error: any) {
+    throw error;
+  }
+}
+
+onMounted(async () => {
+  await fetchQueueList();
+})
+
+async function fetchQueueList() {
+  const queueListResult = await queueList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, 'TB_RULE_ENGINE');
+  queueOptions.value = queueListResult.data.map(item => {
+    return {
+      value: item.name,
+      label: item.name,
+      submitStrategy: item.submitStrategy?.type,
+      processingStrategy: item.processingStrategy?.type
+    }
+  })
+
+}
+
+defineExpose({ getConfiguration })
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 1c3ea5d..7c5ad4d 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -39,5 +39,6 @@
     "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
     "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path",
     "org.thingsboard.rule.engine.transform.TbTransformMsgNode":"script",
-    "org.thingsboard.rule.engine.transform.TbRenameKeysNode":"rename-keys"
+    "org.thingsboard.rule.engine.transform.TbRenameKeysNode":"rename-keys",
+    "org.thingsboard.rule.engine.deduplication.TbMsgDeduplicationNode":"deduplication"
 }
-- 
Gitee


From b5303386993d9b89a94633a0f9649f5e6f1f9231 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sun, 14 Apr 2024 14:54:03 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=20deduplication?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TRANSFORMATION/changeOriginator.vue       |   4 +-
 .../nodeTpl/TRANSFORMATION/copykeyValue.vue   |   4 +-
 .../nodeTpl/TRANSFORMATION/deduplication.vue  | 109 ++++++++++++------
 .../nodeTpl/TRANSFORMATION/deleteKeyValue.vue |   6 +-
 .../flow/nodeTpl/TRANSFORMATION/jsonPath.vue  |  13 +--
 .../nodeTpl/TRANSFORMATION/renameKeys.vue     |   1 +
 6 files changed, 86 insertions(+), 51 deletions(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
index 290f2f8..8f26023 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
@@ -95,11 +95,9 @@ export default defineComponent({
 
 <script lang="ts" setup>
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, Button, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { Form, Button, Select, Row, Col, Input, Alert } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
-import { isEmpty } from 'lodash';
-import { filter } from '/@/utils/helper/treeHelper';
 import { Icon } from '/@/components/Icon';
 
 interface Configuration {
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
index 14fcb12..6ec75ec 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/copykeyValue.vue
@@ -22,11 +22,9 @@ export default defineComponent({
 </script>
 <script lang="ts" setup>
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { Form, Select, Radio } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
-import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
 import { isEmpty } from 'lodash';
-import { filter } from '/@/utils/helper/treeHelper';
 
 interface Configuration {
   copyFrom: string;
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
index f966cd8..0a9d656 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
@@ -1,61 +1,82 @@
 <template>
   <Form ref="formRef" :model="formState" layout="vertical">
     <Form.Item label="时间间隔" name="interval" :rules="[{ required: true, message: '时间间隔不能为空!' }]">
-      <Input v-model:value="formState.interval" />
+      <InputNumber v-model:value="formState.interval" :min="1" :step="1" :precision="0" :style="{ width: '100%' }" />
     </Form.Item>
     <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
       <p class="text-base font-medium">存储</p>
       <div class="p-2">
         <Form.Item name="strategy">
-          <Radio.Group v-model:value="formState.strategy" button-style="solid" :style="{ display: 'flex' }"
-            class="w-full">
+          <Radio.Group v-model:value="formState.strategy" button-style="solid" :style="{ display: 'flex' }" class="w-full"
+            @change="handleStrategyChange">
             <Radio.Button class="flex-1" value="FIRST">First</Radio.Button>
             <Radio.Button class="flex-1" value="LAST">Last</Radio.Button>
             <Radio.Button class="flex-1" value="ALL">All</Radio.Button>
           </Radio.Group>
         </Form.Item>
         <Alert type="success">
-            <template #message>
-              <span v-if="formState.strategy == 'FIRST'">返回在重复数据删除期间到达的第一条消息。</span>
-              <span v-else-if="formState.strategy == 'LAST'">返回重复数据删除期间到达的最后一条消息。</span>
-              <span v-else="formState.strategy == 'ALL'">将重复数据删除期间到达的所有消息作为单个JSON数组消息返回；其中每个元素代表具有msg和元数据内部属性的对象。</span>
-            </template>
-          </Alert>
+          <template #message>
+            <span v-if="formState.strategy == 'FIRST'">返回在重复数据删除期间到达的第一条消息。</span>
+            <span v-else-if="formState.strategy == 'LAST'">返回重复数据删除期间到达的最后一条消息。</span>
+            <span v-else="formState.strategy == 'ALL'">将重复数据删除期间到达的所有消息作为单个JSON数组消息返回；其中每个元素代表具有msg和元数据内部属性的对象。</span>
+          </template>
+        </Alert>
+        <template v-if="formState.strategy == 'ALL'">
+          <Row :gutter="20">
+            <Col :span="12">
+            <Form.Item label="输出消息类型">
+              <Select v-model:value="outputMessageTypeRef">
+                <Select.Option value="POST_ATTRIBUTES_REQUEST">Post attributes</Select.Option>
+                <Select.Option value="POST_TELEMETRY_REQUEST">Post telemetry</Select.Option>
+                <Select.Option value="CUSTOMER">Custom</Select.Option>
+              </Select>
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="输出消息类型值" name="outMsgType" :rules="[{ required: true, message: '请选择输出消息类型!' }]">
+              <Input v-model:value="formState.outMsgType" :disabled="outputMessageTypeRef !== 'CUSTOMER'" />
+            </Form.Item>
+            </Col>
+            <Col :span="24">
+            <Form.Item label="队列" name="queueName" :rules="[{ required: true, message: '请选择队列!' }]">
+              <Select v-model:value="formState.queueName" placeholder="请选择队列">
+                <Select.Option v-for="(option, index) in queueOptions" :key="index" :value="option.value">
+                  {{ option.label }}
+                  <p>
+                    <Tag>
+                      <small>提交策略:</small>
+                      {{ SUBMIT_STRATEGY_OPTIONS.find((item) => item.value === option.submitStrategy)?.label ||
+                        option.submitStrategy }}
+                    </Tag>
+                    <Tag>
+                      <small>处理策略:</small>
+                      {{ PROCESSING_STRATEGY_OPTIONS.find((item) => item.value === option.processingStrategy)?.label
+                        ||
+                        option.processingStrategy }}
+                    </Tag>
+                  </p>
+                </Select.Option>
+              </Select>
+            </Form.Item>
+            </Col>
+          </Row>
+
+        </template>
       </div>
     </div>
-    <Form.Item label="队列" name="queueName" :rules="[{ required: true, message: '请选择队列!' }]">
-      <Select v-model:value="formState.queueName" placeholder="请选择队列">
-        <Select.Option v-for="(option, index) in queueOptions" :key="index" :value="option.value">
-          {{ option.label }}
-          <p>
-            <Tag>
-              <small>提交策略:</small>
-              {{ SUBMIT_STRATEGY_OPTIONS.find((item) => item.value === option.submitStrategy)?.label ||
-                option.submitStrategy }}
-            </Tag>
-            <Tag>
-              <small>处理策略:</small>
-              {{ PROCESSING_STRATEGY_OPTIONS.find((item) => item.value === option.processingStrategy)?.label
-                ||
-                option.processingStrategy }}
-            </Tag>
-          </p>
-        </Select.Option>
-      </Select>
-    </Form.Item>
     <Collapse expand-icon-position="end">
       <Collapse.Panel header="高级设置">
         <Row :gutter="20">
           <Col :span="12">
           <Form.Item label="消息最大待处理数量" name="maxPendingMsgs" :rules="[{ required: true, message: '数值不能为空!' }]">
-            <Input v-model:value="formState.maxPendingMsgs">
-            </Input>
+            <InputNumber v-model:value="formState.maxPendingMsgs" :min="1" :step="1" :precision="0"
+              :style="{ width: '100%' }" />
           </Form.Item>
           </Col>
           <Col :span="12">
           <Form.Item label="消息最大重试数量" name="maxRetries" :rules="[{ required: true, message: '数值不能为空!' }]">
-            <Input v-model:value="formState.maxRetries">
-            </Input>
+            <InputNumber v-model:value="formState.maxRetries" :min="0" :step="1" :precision="0"
+              :style="{ width: '100%' }" />
           </Form.Item>
           </Col>
         </Row>
@@ -70,7 +91,7 @@ export default defineComponent({
 </script>
 <script lang="ts" setup>
 import { ref, watch, defineComponent, reactive, onMounted } from 'vue';
-import { Form, Select, Row, Col, Radio, Input, Alert,Collapse } from 'ant-design-vue';
+import { Form, Select, Row, Col, Radio, InputNumber, Input, Alert, Collapse } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 import { PROCESSING_STRATEGY_OPTIONS, SUBMIT_STRATEGY_OPTIONS } from '/@/enums/queueEnum';
 import { queueList } from '/@/api/things/queue';
@@ -89,12 +110,14 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
 });
 
 const queueOptions = ref<any[]>([]);
 
 const formRef = ref<FormInstance>();
 
+const outputMessageTypeRef = ref<string>();
 const formState = reactive<any>({
   interval: 60,
   maxPendingMsgs: 100,
@@ -146,5 +169,23 @@ async function fetchQueueList() {
 
 }
 
+function handleStrategyChange({ target: { value } }) {
+  if (value == 'ALL') {
+    outputMessageTypeRef.value = 'POST_ATTRIBUTES_REQUEST';
+  } else {
+    outputMessageTypeRef.value = undefined;
+    formState.queueName = undefined;
+  }
+}
+watch(
+  () => outputMessageTypeRef.value,
+  () => {
+    if (outputMessageTypeRef.value == 'CUSTOMER') {
+      formState.outMsgType = undefined;
+    } else {
+      formState.outMsgType = outputMessageTypeRef.value;
+    }
+  })
+
 defineExpose({ getConfiguration })
 </script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
index 106d5aa..04b6929 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deleteKeyValue.vue
@@ -9,7 +9,7 @@
         </Radio.Group>
       </div>
     </Form.Item>
-    <Form.Item label="keys" name="Keys" :rules="[{ required: true, validator: validatorKeys,message: 'key值不能为空!' }]">
+    <Form.Item label="keys" name="Keys" :rules="[{ required: true, validator: validatorKeys, message: 'key值不能为空!' }]">
       <Select v-model:value="formState.keys" mode="tags">
       </Select>
     </Form.Item>
@@ -22,11 +22,9 @@ export default defineComponent({
 </script>
 <script lang="ts" setup>
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { Form, Select, Radio } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
-import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
 import { isEmpty } from 'lodash';
-import { filter } from '/@/utils/helper/treeHelper';
 
 interface Configuration {
   deleteFrom: string;
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
index e4d48fe..cde1392 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/jsonPath.vue
@@ -1,9 +1,10 @@
 <template>
   <Form ref="formRef" :model="formState" layout="vertical">
-    <Form.Item label="jsonPath表达式" name="jsonPath" :rules="[{ required: true,validator: validatorJsonPath, message: 'jsonPaht值不能为空!' }]">
-            <Input v-model:value="formState.jsonPath" style="width: 100%;">
-            </Input>
-        </Form.Item>
+    <Form.Item label="jsonPath表达式" name="jsonPath"
+      :rules="[{ required: true, validator: validatorJsonPath, message: 'jsonPaht值不能为空!' }]">
+      <Input v-model:value="formState.jsonPath" style="width: 100%;">
+      </Input>
+    </Form.Item>
   </Form>
 </template>
 <script lang="ts">
@@ -13,11 +14,9 @@ export default defineComponent({
 </script>
 <script lang="ts" setup>
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { Form, Input, } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
-import { OriginatorSource, EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
 import { isEmpty } from 'lodash';
-import { filter } from '/@/utils/helper/treeHelper';
 
 interface Configuration {
   jsonPath: string;
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue
index 4bfa6c8..8505f7e 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/renameKeys.vue
@@ -57,6 +57,7 @@ const props = defineProps({
     type: Object as PropType<Configuration>,
     required: true,
   },
+  ruleChainId: { type: String, default: '' }
 });
 
 const mappingList = ref<Array<any>>([]);
-- 
Gitee


From f25489b19192671a25f4007e43a787362e8521f8 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 16 Apr 2024 15:50:26 +0800
Subject: [PATCH 26/38] =?UTF-8?q?rest=20api=20call=20=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/EXTERNAL/restApiCall.vue     | 179 +++++++++++++++++-
 1 file changed, 178 insertions(+), 1 deletion(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
index e020b3c..c155b09 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
@@ -15,7 +15,107 @@
                 <Select.Option value="DELETE">DELETE</Select.Option>
             </Select>
         </Form.Item>
+        <Form.Item name="enableProxy">
+            <Checkbox v-model:checked="formState.enableProxy">允许代理</Checkbox>
+        </Form.Item>
+        <Form.Item name="useSimpleClientHttpFactory" v-if="formState.enableProxy == false">
+            <Checkbox v-model:checked="formState.useSimpleClientHttpFactory">使用SimpleClientHttpFactory</Checkbox>
+        </Form.Item>
+        <Form.Item name="parseToPlainText" help="如果选中，请求正文消息负载将从JSON字符串转换为纯文本，例如msg=“Hello，\t\t”world\“”将解析为Hello，”world“">
+            <Checkbox v-model:checked="formState.parseToPlainText">解析为纯文本</Checkbox>
+        </Form.Item>
+        <Form.Item name="ignoreRequestBody">
+            <Checkbox v-model:checked="formState.ignoreRequestBody">忽略 Request Body</Checkbox>
+        </Form.Item>
 
+        <Form.Item label="超时时间" name="readTimeoutMs" v-if="formState.useSimpleClientHttpFactory == false">
+            <InputNumber v-model:value="formState.readTimeoutMs" :min="0" :step="1" :precision="0"
+                :style="{ width: '100%' }" :addonAfter="'毫秒'" />
+        </Form.Item>
+        <Form.Item label="最大并行请求数量" name="maxParallelRequestsCount">
+            <InputNumber v-model:value="formState.maxParallelRequestsCount" :min="0" :step="1" :precision="0"
+                :style="{ width: '100%' }" />
+        </Form.Item>
+        <template v-if="formState.enableProxy == true">
+            <Form.Item name="useSystemProxyProperties">
+                <Checkbox v-model:checked="formState.useSystemProxyProperties">使用系统代理属性</Checkbox>
+            </Form.Item>
+            <Row :gutter="20" v-if="formState.useSystemProxyProperties == false">
+                <Col :span="6">
+                <Form.Item label="代理协议" name="proxyScheme">
+                    <Select v-model:value="formState.proxyScheme" :style="{ width: '100%' }">
+                        <Select.Option value="http">http</Select.Option>
+                        <Select.Option value="https">https</Select.Option>
+                    </Select>
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item label="代理地址" name="proxyHost">
+                    <Input v-model:value="formState.proxyHost" />
+                </Form.Item>
+                </Col>
+                <Col :span="6">
+                <Form.Item label="代理端口" name="proxyPort">
+                    <InputNumber v-model:value="formState.proxyPort" :min="1" :step="1" :precision="0"
+                        :style="{ width: '100%' }" />
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item label="代理用户" name="proxyUser">
+                    <Input v-model:value="formState.proxyUser" />
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item label="代理密码" name="proxyPassword">
+                    <Input v-model:value="formState.proxyPassword" />
+                </Form.Item>
+                </Col>
+            </Row>
+        </template>
+        <Form.Item label="Http请求头" name="headers" :rules="[{ validator: validatorHeader }]">
+            <Alert type="success" message="使用${metadataKey}表示元数据中的值，$[messageKey]表示头/值字段中消息正文中的值" />
+
+            <Table class="header-table">
+                <tr class="header">
+                    <th>Header</th>
+                    <th>Value</th>
+                </tr>
+                <tr class="content" v-for="(header, index) in headerList" :key="index">
+                    <td class="py-2 px-4"> <Input v-model:value="header.key" placeholder="输入Header" />
+                    </td>
+                    <td> <Input v-model:value="header.value" placeholder="输入Value" />
+                    </td>
+                    <td>
+                        <Tooltip title="删除" class="pl-4">
+                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                @click="handleDeleteHeader(index)" />
+                        </Tooltip>
+                    </td>
+                </tr>
+            </Table>
+            <Button class="my-4" type="primary" @click="handleAddHeader">添加</Button>
+        </Form.Item>
+        <Form.Item name="useRedisQueueForMsgPersistence">
+            <Checkbox v-model:checked="formState.useRedisQueueForMsgPersistence">使用redis队列进行消息持久化</Checkbox>
+        </Form.Item>
+        <Collapse expand-icon-position="end">
+            <Collapse.Panel :header="'Credentials：' + '              ' + formState.credentials.type">
+                <Form.Item label="Credentials类型" :name="['credentials', 'type']"
+                    :rules="[{ required: true, message: 'Credentials类型不能为空!' }]">
+                    <Select v-model:value="formState.credentials.type" :style="{ width: '100%' }"
+                        @change="handleCredentialsTypeChange">
+                        <Select.Option value="anonymous">Anonymous</Select.Option>
+                        <Select.Option value="basic">BASIC</Select.Option>
+                    </Select>
+                </Form.Item>
+                <Form.Item label="用户" :name="['credentials', 'username']" v-if="formState.credentials.type == 'basic'">
+                    <Input v-model:value="formState.credentials.username" />
+                </Form.Item>
+                <Form.Item label="密码" :name="['credentials', 'password']" v-if="formState.credentials.type == 'basic'">
+                    <InputPassword v-model:value="formState.credentials.password" />
+                </Form.Item>
+            </Collapse.Panel>
+        </Collapse>
     </Form>
 </template>
 <script lang="ts">
@@ -25,8 +125,10 @@ export default defineComponent({
 </script>
 <script lang="ts" setup >
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, Input, Select } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Alert, Tooltip, Button, Input, Select, Checkbox, Collapse, Row, Col, InputNumber, InputPassword } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
 
 interface Configuration {
     credentials: { type: string },
@@ -58,6 +160,8 @@ const props = defineProps({
 
 });
 
+const headerList = ref<Array<any>>([]);
+
 const formRef = ref<FormInstance>();
 
 const formState = reactive<any>({
@@ -83,6 +187,7 @@ const formState = reactive<any>({
 watch(
     () => props.configuration,
     () => {
+        headerList.value = [];
         formState.credentials = props.configuration.credentials;
         formState.enableProxy = props.configuration.enableProxy;
         formState.headers = props.configuration.headers;
@@ -100,6 +205,9 @@ watch(
         formState.useRedisQueueForMsgPersistence = props.configuration.useRedisQueueForMsgPersistence;
         formState.useSimpleClientHttpFactory = props.configuration.useSimpleClientHttpFactory;
         formState.useSystemProxyProperties = props.configuration.useSystemProxyProperties;
+        Object.keys(formState.headers).forEach(key => {
+            headerList.value.push({ key: key, value: formState.headers[key] })
+        })
     },
     { immediate: true }
 )
@@ -112,6 +220,75 @@ async function getConfiguration() {
     }
 }
 
+function validatorHeader() {
+    if (headerList.value.length < 1) {
+        return Promise.reject('Header不能为空！');
+    } else {
+        let validateTag = true;
+        headerList.value.forEach(mapping => {
+            if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+                validateTag = false;
+            }
+        })
+        if (!validateTag) {
+            return Promise.reject('Header不能存在空值！');
+        } else {
+            return Promise.resolve();
+        }
+
+    }
+}
+
+function handleDeleteHeader(index: number) {
+    headerList.value.splice(index, 1)
+}
+
+function handleAddHeader() {
+    headerList.value.push({ key: '', value: '' })
+}
+
+function handleCredentialsTypeChange(value) {
+    if (value == 'basic') {
+        formState.credentials = {
+            type: 'basic',
+            username: 'sysadmin@thingsboard.org',
+            password: 'sysadmin',
+        }
+    } else if (value == 'anonymous') {
+        formState.credentials = {
+            type: 'anonymous'
+        }
+    }
+}
+
 defineExpose({ getConfiguration })
 
 </script>
+<style lang="less">
+.ant-form-item-has-error {
+    .header-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.header-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
-- 
Gitee


From 678e02a8667db07281534a8cc60426d9d1835221 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 16 Apr 2024 16:35:27 +0800
Subject: [PATCH 27/38] rabbitmq

---
 .../flow/nodeTpl/EXTERNAL/rabbitmq.vue        | 214 ++++++++++++++++++
 .../flow/nodeTpl/EXTERNAL/restApiCall.vue     |   8 +-
 .../flow/nodeTpl/rule-chain-types.json        |   1 +
 3 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/rabbitmq.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/rabbitmq.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/rabbitmq.vue
new file mode 100644
index 0000000..48553a8
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/rabbitmq.vue
@@ -0,0 +1,214 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Row :gutter="20">
+            <Col :span="24">
+            <Form.Item label="Exchnage name pattern" name="exchangeNamePattern">
+                <Input v-model:value="formState.exchangeNamePattern" />
+            </Form.Item>
+            </Col>
+            <Col :span="24">
+            <Form.Item label="Routing key pattern" name="routingKeyPattern">
+                <Input v-model:value="formState.routingKeyPattern" />
+            </Form.Item>
+            </Col>
+            <Col :span="24">
+            <Form.Item label="Message properties" name="messageProperties">
+                <Select v-model:value="formState.messageProperties">
+                    <Select.Option :value=null> </Select.Option>
+                    <Select.Option value='BASIC'>BASIC</Select.Option>
+                    <Select.Option value='TEXT_PLAIN'>TEXT_PLAIN</Select.Option>
+                    <Select.Option value='MINIMAL_BASIC'>MINIMAL_BASIC</Select.Option>
+                    <Select.Option value='MINIMAL_PERSISTENT_BASIC'>MINIMAL_PERSISTENT_BASIC</Select.Option>
+                    <Select.Option value='PERSISTENT_BASIC'>PERSISTENT_BASIC</Select.Option>
+                    <Select.Option value='PERSISTENT_TEXT_PLAIN'>PERSISTENT_TEXT_PLAIN</Select.Option>
+                </Select>
+            </Form.Item>
+            </Col>
+            <Col :span="14">
+            <Form.Item label="地址" name="host">
+                <Input v-model:value="formState.host" />
+            </Form.Item>
+            </Col>
+            <Col :span="10">
+            <Form.Item label="端口" name="port">
+                <InputNumber v-model:value="formState.port" :min="1" :step="1" :precision="0" :style="{ width: '100%' }" />
+            </Form.Item>
+            </Col>
+            <Col :span="24">
+            <Form.Item label="Virtual host" name="virtualHost">
+                <Input v-model:value="formState.virtualHost" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="Username" name="username">
+                <Input v-model:value="formState.username" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="Password" name="password">
+                <InputPassword v-model:value="formState.password" />
+            </Form.Item>
+            </Col>
+            <Col :span="24">
+            <Form.Item name="automaticRecoveryEnabled">
+                <Checkbox v-model:checked="formState.automaticRecoveryEnabled">Automatic recovery</Checkbox>
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="连接超时" name="connectionTimeout">
+                <InputNumber v-model:value="formState.connectionTimeout" :min="0" :step="1" :precision="0"
+                    :style="{ width: '100%' }" :addonAfter="'毫秒'" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="握手超时" name="handshakeTimeout">
+                <InputNumber v-model:value="formState.handshakeTimeout" :min="0" :step="1" :precision="0"
+                    :style="{ width: '100%' }" :addonAfter="'毫秒'" />
+            </Form.Item>
+            </Col>
+        </Row>
+        <Form.Item label="Client Properties" name="clientProperties" :rules="[{ validator: validatorClientProperties }]">
+
+            <Table class="header-table">
+                <tr class="header">
+                    <th>Key</th>
+                    <th>Value</th>
+                </tr>
+                <tr class="content" v-for="(property, index) in clientPropertyList" :key="index">
+                    <td class="py-2 px-4"> <Input v-model:value="property.key" placeholder="输入Key" />
+                    </td>
+                    <td> <Input v-model:value="property.value" placeholder="输入Value" />
+                    </td>
+                    <td>
+                        <Tooltip title="删除" class="pl-4">
+                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                @click="handleDeleteProperty(index)" />
+                        </Tooltip>
+                    </td>
+                </tr>
+            </Table>
+            <Button class="my-4" type="primary" @click="handleAddProperty">添加</Button>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "rabbitmq",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Input, Button, Tooltip, InputNumber, Checkbox, Select, Row, Col, InputPassword } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    automaticRecoveryEnabled: boolean,
+    clientProperties: Recordable,
+    exchangeNamePattern: string,
+    routingKeyPattern: string,
+    messageProperties: string,
+    connectionTimeout: number,
+    handshakeTimeout: number,
+    virtualHost: string,
+    host: string,
+    username: string,
+    password: string,
+    port: number,
+}
+
+const clientPropertyList = ref<Array<any>>([]);
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    automaticRecoveryEnabled: false,
+    clientProperties: {},
+    connectionTimeout: 60000,
+    exchangeNamePattern: '',
+    handshakeTimeout: 10000,
+    host: 'localhost',
+    messageProperties: null,
+    password: 'guest',
+    port: 5672,
+    routingKeyPattern: '',
+    username: 'guest',
+    virtualHost: '/',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        clientPropertyList.value = [];
+        formState.automaticRecoveryEnabled = props.configuration.automaticRecoveryEnabled;
+        formState.clientProperties = props.configuration.clientProperties;
+        formState.connectionTimeout = props.configuration.connectionTimeout;
+        formState.exchangeNamePattern = props.configuration.exchangeNamePattern;
+        formState.handshakeTimeout = props.configuration.handshakeTimeout;
+        formState.host = props.configuration.host;
+        formState.messageProperties = props.configuration.messageProperties;
+        formState.password = props.configuration.password;
+        formState.port = props.configuration.port;
+        formState.routingKeyPattern = props.configuration.routingKeyPattern;
+        formState.username = props.configuration.username;
+        formState.virtualHost = props.configuration.virtualHost;
+        Object.keys(formState.clientProperties).forEach(key => {
+            clientPropertyList.value.push({ key: key, value: formState.clientProperties[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            clientPropertyList.value.forEach(property => {
+                data.clientProperties[property.key] = property.value;
+            })
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorClientProperties() {
+    let validateTag = true;
+    clientPropertyList.value.forEach(property => {
+        if (isEmpty(property.key) || isEmpty(property.value)) {
+            validateTag = false;
+        }
+    })
+    if (!validateTag) {
+        return Promise.reject('Client Property不能存在空值！');
+    } else {
+        return Promise.resolve();
+    }
+
+
+
+}
+
+function handleDeleteProperty(index: number) {
+    clientPropertyList.value.splice(index, 1)
+
+}
+
+function handleAddProperty() {
+    clientPropertyList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
index c155b09..05b97c5 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/restApiCall.vue
@@ -214,7 +214,13 @@ watch(
 
 async function getConfiguration() {
     try {
-        return await formRef.value?.validate();
+        const data = await formRef.value?.validate();
+        if (data) {
+            headerList.value.forEach(header => {
+                data.headers[header.key] = header.value;
+            })
+        }
+        return data;
     } catch (error: any) {
         throw error;
     }
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 7c5ad4d..8307f24 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -33,6 +33,7 @@
     "org.thingsboard.rule.engine.notification.TbNotificationNode":"send-notification",
     "org.thingsboard.rule.engine.mail.TbSendEmailNode":"send-email",
     "org.thingsboard.rule.engine.rest.TbRestApiCallNode":"rest-api-call",
+    "org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode":"rabbitmq",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From ccbeab9430f56cd9ba74229ae6c5e0413b666dd3 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 16 Apr 2024 17:36:50 +0800
Subject: [PATCH 28/38] mqtt

---
 src/views/things/ruleChain/flow/nodeForm.vue  |  13 +-
 .../ruleChain/flow/nodeTpl/EXTERNAL/mqtt.vue  | 163 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   1 +
 3 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/mqtt.vue

diff --git a/src/views/things/ruleChain/flow/nodeForm.vue b/src/views/things/ruleChain/flow/nodeForm.vue
index 6cef648..ae4aa76 100644
--- a/src/views/things/ruleChain/flow/nodeForm.vue
+++ b/src/views/things/ruleChain/flow/nodeForm.vue
@@ -19,6 +19,10 @@
         </Form.Item>
         </Col>
       </Row>
+      <Form.Item name="singletonMode" v-show="singletonModeShow">
+        <Switch v-model:checked="formState.singletonMode" size="small" /><span class="ml-2">单节点模式</span>
+      </Form.Item>
+
       <component ref="compRef" :is="ruleChainTypes[formState.type]" :configuration="formState.configuration"
         :ruleChainId="formState.ruleChainId?.id">
 
@@ -28,9 +32,7 @@
       <Form.Item label="描述信息" :name="['additionalInfo', 'description']">
         <Textarea v-model:value="formState.additionalInfo.description" placeholder="输入节点描述信息" :rows="3" />
       </Form.Item>
-      <Form.Item name="singletonMode" v-show="false">
-        <Switch v-model:checked="formState.singletonMode" />
-      </Form.Item>
+
       <Form.Item name="type" v-show="false">
         <Input v-model:value="formState.type" />
       </Form.Item>
@@ -96,7 +98,9 @@ const getTitle = computed(() => ({
   value: record.value?.id?.id ? t('编辑规则节点') : t('添加规则节点'),
 }));
 
-
+const singletonModeShow = computed(() => {
+  return descriptor.value?.name == 'mqtt';
+})
 
 const formState = reactive<RuleNode>({
   id: { entityType: EntityType.RULE_NODE, id: '' },
@@ -127,6 +131,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     formState.configuration = descriptor.value?.configurationDescriptor.nodeDefinition.defaultConfiguration || {};
     formState.configurationVersion = descriptor.value?.configurationVersion || 0;
   }
+  formState.singletonMode = descriptor.value?.name == 'mqtt'
   console.log(descriptor.value)
 
   setModalProps({ loading: false });
diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/mqtt.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/mqtt.vue
new file mode 100644
index 0000000..bc461a2
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/mqtt.vue
@@ -0,0 +1,163 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="Topic pattern" name="topicPattern" :rules="[{ required: true, message: '请输入Topic pattern!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.topicPattern" />
+        </Form.Item>
+        <Row :gutter="20">
+            <Col :span="8">
+            <Form.Item label="地址" name="host" :rules="[{ required: true, message: '请输入地址!' }]">
+                <Input v-model:value="formState.host" />
+            </Form.Item>
+            </Col>
+            <Col :span="8">
+            <Form.Item label="端口" name="port" :rules="[{ required: true, message: '请输入端口!' }]">
+                <InputNumber v-model:value="formState.port" :min="1" :step="65535" :precision="0"
+                    :style="{ width: '100%' }" />
+            </Form.Item>
+            </Col>
+            <Col :span="8">
+            <Form.Item label="连接超时" name="connectTimeoutSec" :rules="[{ required: true, message: '请输入超时时间!' }]">
+                <InputNumber v-model:value="formState.connectTimeoutSec" :min="0" :precision="0" :style="{ width: '100%' }"
+                    addonAfter="秒" />
+            </Form.Item>
+            </Col>
+        </Row>
+        <Form.Item label="Client ID" name="clientId" :rules="[{ required: true, message: '请输入Client Id!' }]"
+            help="可选择的为自动生成的客户端ID保留为空。指定客户端ID时要小心。大多数MQTT代理不允许使用相同客户端ID进行多个连接。要连接到此类代理，您的MQTT客户端ID必须是唯一的。当平台以微服务模式运行时，每个微服务中都会启动规则节点的副本。这将自动导致多个mqtt客户端具有相同的ID，并可能导致规则节点出现故障。为了避免此类故障，请启用下面的“将服务ID作为后缀添加到客户端ID”选项。">
+            <Input v-model:value="formState.clientId" />
+        </Form.Item>
+        <Form.Item name="appendClientIdSuffix" help="可选择的当明确指定“Client ID”时应用。如果选中，则Server ID将作为后缀添加到Client ID中。有助于避免平台在微服务模式下运行时出现故障。">
+            <Checkbox v-model:checked="formState.appendClientIdSuffix">
+                将Server ID 作为后缀添加到Client ID
+            </Checkbox>
+        </Form.Item>
+        <Form.Item name="cleanSession">
+            <Checkbox v-model:checked="formState.cleanSession">
+                Clean Session
+            </Checkbox>
+        </Form.Item>
+        <Form.Item name="retainedMessage">
+            <Checkbox v-model:checked="formState.retainedMessage">
+                Retained
+            </Checkbox>
+        </Form.Item>
+        <Form.Item name="ssl">
+            <Checkbox v-model:checked="formState.ssl">
+                Enable SSL
+            </Checkbox>
+        </Form.Item>
+        <Collapse expand-icon-position="end">
+            <Collapse.Panel :header="'Credentials：' + '              ' + formState.credentials.type">
+                <Form.Item label="Credentials类型" :name="['credentials', 'type']"
+                    :rules="[{ required: true, message: 'Credentials类型不能为空!' }]">
+                    <Select v-model:value="formState.credentials.type" :style="{ width: '100%' }"
+                        @change="handleCredentialsTypeChange">
+                        <Select.Option value="anonymous">Anonymous</Select.Option>
+                        <Select.Option value="basic">BASIC</Select.Option>
+                    </Select>
+                </Form.Item>
+                <Form.Item label="用户" :name="['credentials', 'username']" v-if="formState.credentials.type == 'basic'">
+                    <Input v-model:value="formState.credentials.username" />
+                </Form.Item>
+                <Form.Item label="密码" :name="['credentials', 'password']" v-if="formState.credentials.type == 'basic'">
+                    <InputPassword v-model:value="formState.credentials.password" />
+                </Form.Item>
+            </Collapse.Panel>
+        </Collapse>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "mqtt",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Row, Col, InputNumber, InputPassword, Collapse, Checkbox, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    appendClientIdSuffix: boolean,
+    cleanSession: boolean,
+    clientId: string,
+    connectTimeoutSec: number,
+    credentials: {
+        type: 'anonymous' | 'basic',
+    },
+    host: string,
+    port: number,
+    retainedMessage: boolean,
+    ssl: boolean,
+    topicPattern: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    appendClientIdSuffix: false,
+    cleanSession: true,
+    clientId: undefined,
+    connectTimeoutSec: 10,
+    credentials: { type: 'anonymous' },
+    host: undefined,
+    port: 1883,
+    retainedMessage: false,
+    ssl: false,
+    topicPattern: 'my-topic',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.appendClientIdSuffix = props.configuration.appendClientIdSuffix;
+        formState.cleanSession = props.configuration.cleanSession;
+        formState.clientId = props.configuration.clientId;
+        formState.connectTimeoutSec = props.configuration.connectTimeoutSec;
+        formState.credentials = props.configuration.credentials;
+        formState.host = props.configuration.host;
+        formState.port = props.configuration.port;
+        formState.retainedMessage = props.configuration.retainedMessage;
+        formState.ssl = props.configuration.ssl;
+        formState.topicPattern = props.configuration.topicPattern;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleCredentialsTypeChange(value) {
+    if (value == 'basic') {
+        formState.credentials = {
+            type: 'basic',
+            username: 'sysadmin@thingsboard.org',
+            password: 'sysadmin',
+        }
+    } else if (value == 'anonymous') {
+        formState.credentials = {
+            type: 'anonymous'
+        }
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 8307f24..bf5c7fd 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -34,6 +34,7 @@
     "org.thingsboard.rule.engine.mail.TbSendEmailNode":"send-email",
     "org.thingsboard.rule.engine.rest.TbRestApiCallNode":"rest-api-call",
     "org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode":"rabbitmq",
+    "org.thingsboard.rule.engine.mqtt.TbMqttNode":"mqtt",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From b204bec22dc8cfe9eed53cf1969ec1da9938ec6d Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 16 Apr 2024 17:58:22 +0800
Subject: [PATCH 29/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E8=8A=82=E7=82=B9=20ka?=
 =?UTF-8?q?fka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue | 163 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   1 +
 2 files changed, 164 insertions(+)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
new file mode 100644
index 0000000..dd1098d
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
@@ -0,0 +1,163 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Form.Item label="Topic Pattern" name="topicPattern" :rules="[{ required: true, message: '请输入Topic pattern!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.topicPattern" />
+        </Form.Item>
+        <Form.Item label="Key Pattern" name="keyPattern" help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。
+        可选择的如果指定了有效的分区号，则在发送记录时将使用该分区号。如果没有指定分区，则将使用密钥。如果两者都未指定，则将以循环方式分配分区。">
+            <Input v-model:value="formState.keyPattern" />
+        </Form.Item>
+        <Form.Item label="Bootstrap servers" name="bootstrapServers" :rules="[{ required: true, message: '请输入Bootstrap servers!' }]">
+            <Input v-model:value="formState.bootstrapServers" />
+        </Form.Item>
+        <Form.Item label="Automatically retry times if fails" name="retries">
+           <InputNumber v-model:value="formState.retries" :min="0"/>
+        </Form.Item>
+        <Form.Item label="Other Properties" name="otherProperties" :rules="[{ validator: validatorOtherProperties }]">
+
+            <Table class="header-table">
+                <tr class="header">
+                    <th>Key</th>
+                    <th>Value</th>
+                </tr>
+                <tr class="content" v-for="(property, index) in otherPropertyList" :key="index">
+                    <td class="py-2 px-4"> <Input v-model:value="property.key" placeholder="输入Key" />
+                    </td>
+                    <td> <Input v-model:value="property.value" placeholder="输入Value" />
+                    </td>
+                    <td>
+                        <Tooltip title="删除" class="pl-4">
+                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                @click="handleDeleteProperty(index)" />
+                        </Tooltip>
+                    </td>
+                </tr>
+            </Table>
+            <Button class="my-4" type="primary" @click="handleAddProperty">添加</Button>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "kafka",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Input, Button, Tooltip, InputNumber, Checkbox, Select, Row, Col, InputPassword } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    acks: string,
+    addMetadataKeyValuesAsKafkaHeaders: boolean,
+    batchSize: number,
+    bootstrapServers: string,
+    bufferMemory: number,
+    kafkaHeadersCharset: string,
+    keyPattern: string,
+    keySerializer: string,
+    linger: number,
+    otherProperties: Recordable,
+    retries: number,
+    topicPattern: string,
+    valueSerializer: string,
+}
+
+const otherPropertyList = ref<Array<any>>([]);
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    acks: "-1",
+    addMetadataKeyValuesAsKafkaHeaders: false,
+    batchSize: 16384,
+    bootstrapServers: "localhost:9092",
+    bufferMemory: 33554432,
+    kafkaHeadersCharset: "UTF-8",
+    keyPattern: undefined,
+    keySerializer: "org.apache.kafka.common.serialization.StringSerializer",
+    linger: 0,
+    otherProperties: {},
+    retries: 0,
+    topicPattern: "my-topic",
+    valueSerializer: "org.apache.kafka.common.serialization.StringSerializer",
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.acks = props.configuration.acks;
+        formState.addMetadataKeyValuesAsKafkaHeaders = props.configuration.addMetadataKeyValuesAsKafkaHeaders;
+        formState.batchSize = props.configuration.batchSize;
+        formState.bootstrapServers = props.configuration.bootstrapServers;
+        formState.bufferMemory = props.configuration.bufferMemory;
+        formState.kafkaHeadersCharset = props.configuration.kafkaHeadersCharset;
+        formState.keyPattern = props.configuration.keyPattern;
+        formState.keySerializer = props.configuration.keySerializer;
+        formState.linger = props.configuration.linger;
+        formState.otherProperties = props.configuration.otherProperties;
+        formState.retries = props.configuration.retries;
+        formState.topicPattern = props.configuration.topicPattern;
+        formState.valueSerializer = props.configuration.valueSerializer;
+        Object.keys(formState.otherProperties).forEach(key => {
+            otherPropertyList.value.push({ key: key, value: formState.otherProperties[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            otherPropertyList.value.forEach(property => {
+                data.otherProperties[property.key] = property.value;
+            })
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorOtherProperties() {
+    let validateTag = true;
+    otherPropertyList.value.forEach(property => {
+        if (isEmpty(property.key) || isEmpty(property.value)) {
+            validateTag = false;
+        }
+    })
+    if (!validateTag) {
+        return Promise.reject('Other Property不能存在空值！');
+    } else {
+        return Promise.resolve();
+    }
+
+
+
+}
+
+function handleDeleteProperty(index: number) {
+    otherPropertyList.value.splice(index, 1)
+
+}
+
+function handleAddProperty() {
+    otherPropertyList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index bf5c7fd..89b9922 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -35,6 +35,7 @@
     "org.thingsboard.rule.engine.rest.TbRestApiCallNode":"rest-api-call",
     "org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode":"rabbitmq",
     "org.thingsboard.rule.engine.mqtt.TbMqttNode":"mqtt",
+    "org.thingsboard.rule.engine.kafka.TbKafkaNode":"kafka",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From 1c450c5feda9ec5c6154c368090c58a5c91a3454 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 20 Apr 2024 09:42:11 +0800
Subject: [PATCH 30/38] =?UTF-8?q?kafka=20=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue | 54 +++++++++++++++++--
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
index dd1098d..86c8f78 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
@@ -4,15 +4,42 @@
             help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
             <Input v-model:value="formState.topicPattern" />
         </Form.Item>
-        <Form.Item label="Key Pattern" name="keyPattern" help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。
-        可选择的如果指定了有效的分区号，则在发送记录时将使用该分区号。如果没有指定分区，则将使用密钥。如果两者都未指定，则将以循环方式分配分区。">
+        <Form.Item label="Key Pattern" name="keyPattern"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。
+                                                                    可选择的如果指定了有效的分区号，则在发送记录时将使用该分区号。如果没有指定分区，则将使用密钥。如果两者都未指定，则将以循环方式分配分区。">
             <Input v-model:value="formState.keyPattern" />
         </Form.Item>
-        <Form.Item label="Bootstrap servers" name="bootstrapServers" :rules="[{ required: true, message: '请输入Bootstrap servers!' }]">
+        <Form.Item label="Bootstrap servers" name="bootstrapServers"
+            :rules="[{ required: true, message: '请输入Bootstrap servers!' }]">
             <Input v-model:value="formState.bootstrapServers" />
         </Form.Item>
         <Form.Item label="Automatically retry times if fails" name="retries">
-           <InputNumber v-model:value="formState.retries" :min="0"/>
+            <InputNumber v-model:value="formState.retries" :min="0" :style="{ width: '100%' }" />
+        </Form.Item>
+        <Form.Item label="Produces batch size in bytes" name="batchSize">
+            <InputNumber v-model:value="formState.batchSize" :min="0" :style="{ width: '100%' }" />
+        </Form.Item>
+        <Form.Item label="Time to buffer locally" name="linger">
+            <InputNumber v-model:value="formState.linger" :min="0" addon-after="毫秒" :style="{ width: '100%' }" />
+        </Form.Item>
+        <Form.Item label="Client buffer max size in bytes" name="bufferMemory">
+            <InputNumber v-model:value="formState.bufferMemory" :min="0" :style="{ width: '100%' }" />
+        </Form.Item>
+        <Form.Item label="Number of acknowledgements" name="acks"
+            :rules="[{ required: true, message: '请选择acknowledgements 数量' }]">
+            <Select v-model:value="formState.acks" :min="0" :style="{ width: '100%' }">
+                <Select.Option value="all">all</Select.Option>
+                <Select.Option value="-1">-1</Select.Option>
+                <Select.Option value="0">0</Select.Option>
+                <Select.Option value="1">1</Select.Option>
+            </Select>
+        </Form.Item>
+        <Form.Item label="key serializer" name="keySerializer" :rules="[{ required: true, message: '请输入 key serializer' }]">
+            <Input v-model:value="formState.keySerializer" />
+        </Form.Item>
+        <Form.Item label="value serializer" name="valueSerializer"
+            :rules="[{ required: true, message: '请输入 value serializer' }]">
+            <Input v-model:value="formState.valueSerializer" />
         </Form.Item>
         <Form.Item label="Other Properties" name="otherProperties" :rules="[{ validator: validatorOtherProperties }]">
 
@@ -36,6 +63,23 @@
             </Table>
             <Button class="my-4" type="primary" @click="handleAddProperty">添加</Button>
         </Form.Item>
+        <Form.Item name="addMetadataKeyValuesAsKafkaHeaders" help="如果选中，消息元数据中的键值对将作为具有预定义字符集编码的字节数组添加到传出记录头中。">
+            <Checkbox v-model:checked="formState.addMetadataKeyValuesAsKafkaHeaders">
+                向Kafka记录头添加消息元数据键值对
+            </Checkbox>
+        </Form.Item>
+        <Form.Item label="charset encoding" name="kafkaHeadersCharset"
+            v-if="formState.addMetadataKeyValuesAsKafkaHeaders == true">
+            <Select v-model:value="formState.kafkaHeadersCharset">
+                <Select.Option value="US-ASCII">US-ASCII</Select.Option>
+                <Select.Option value="ISO-8859-1">ISO-8859-1</Select.Option>
+                <Select.Option value="UTF-8">UTF-8</Select.Option>
+                <Select.Option value="UTF-16BE">UTF-16BE</Select.Option>
+                <Select.Option value="UTF-16LE">UTF-16LE</Select.Option>
+                <Select.Option value="UTF-16">UTF-16</Select.Option>
+            </Select>
+
+        </Form.Item>
     </Form>
 </template>
 <script lang="ts">
@@ -46,7 +90,7 @@ export default defineComponent({
 <script lang="ts" setup >
 import { ref, watch, defineComponent, reactive } from 'vue';
 import { Icon } from '/@/components/Icon';
-import { Form, Input, Button, Tooltip, InputNumber, Checkbox, Select, Row, Col, InputPassword } from 'ant-design-vue';
+import { Form, Input, Button, Tooltip, InputNumber, Checkbox, Select } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 import { isEmpty } from 'lodash';
 
-- 
Gitee


From 7c5c65b475f6951e1e5da55c48b367813b39eb77 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 20 Apr 2024 10:24:47 +0800
Subject: [PATCH 31/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BEgcp=20pubsub?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/EXTERNAL/gcpPubsub.vue       | 190 ++++++++++++++++++
 .../ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue |  30 ++-
 .../flow/nodeTpl/rule-chain-types.json        |   1 +
 3 files changed, 220 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue
new file mode 100644
index 0000000..2cbf308
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue
@@ -0,0 +1,190 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Form.Item label="GCP project ID" name="projectId" :rules="[{ required: true, message: '请输入Project ID!' }]">
+            <Input v-model:value="formState.projectId" />
+        </Form.Item>
+        <Form.Item label="Topic name" name="topicName" :rules="[{ required: true, message: '请输入Topic name!' }]">
+            <Input v-model:value="formState.topicName" />
+        </Form.Item>
+
+        <Form.Item label="GCP service account key file" name="serviceAccountKey"
+            :rules="[{ validator: validatorServiceAccountKey }]">
+            <Upload.Dragger v-model:fileList="fileList" :before-upload="beforeUpload">
+                <p class="ant-upload-drag-icon">
+                    <Icon :icon="'ant-design:upload-outlined'" />
+                </p>
+                <p class="ant-upload-text">拖放或者点击选择一个文件</p>
+            </Upload.Dragger>
+        </Form.Item>
+
+        <Form.Item label="Message attribute" name="messageAttributes" :rules="[{ validator: validatorMessageAttributes }]">
+            <Alert type="success" message="在名称/值字段中，使用${metadataKey}表示元数据中的值，使用$[messageKey]表示消息正文中的值" />
+
+            <Table class="message-attribute-table">
+                <tr class="header">
+                    <th>Key</th>
+                    <th>Value</th>
+                </tr>
+                <tr class="content" v-for="(attribute, index) in messageAttributeList" :key="index">
+                    <td class="py-2 px-4"> <Input v-model:value="attribute.key" placeholder="输入Key" />
+                    </td>
+                    <td> <Input v-model:value="attribute.value" placeholder="输入Value" />
+                    </td>
+                    <td>
+                        <Tooltip title="删除" class="pl-4">
+                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                @click="handleDeleteAttribute(index)" />
+                        </Tooltip>
+                    </td>
+                </tr>
+            </Table>
+            <Button class="my-4" type="primary" @click="handleAddAttribute">添加</Button>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "gcp-pubsub",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Input, Button, Tooltip, Alert, Upload } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    messageAttributes: Recordable,
+    projectId: string,
+    serviceAccountKey: string,
+    serviceAccountKeyFileName: string,
+    topicName: string,
+}
+const fileList = ref<Array<any>>([]);
+
+const messageAttributeList = ref<Array<any>>([]);
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    messageAttributes: {},
+    projectId: 'my-google-cloud-project-id',
+    serviceAccountKey: undefined,
+    serviceAccountKeyFileName: undefined,
+    topicName: 'my-pubsub-topic-name',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        fileList.value = [];
+        formState.messageAttributes = props.configuration.messageAttributes;
+        formState.projectId = props.configuration.projectId;
+        formState.serviceAccountKey = props.configuration.serviceAccountKey;
+        formState.serviceAccountKeyFileName = props.configuration.serviceAccountKeyFileName;
+        formState.topicName = props.configuration.topicName;
+        Object.keys(formState.messageAttributes).forEach(key => {
+            messageAttributeList.value.push({ key: key, value: formState.messageAttributes[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            messageAttributeList.value.forEach(attribute => {
+                data.messageAttributes[attribute.key] = attribute.value;
+            })
+            data.serviceAccountKeyFileName = fileList.value[0].name;
+            data.serviceAccountKey = fileList.value[0].originFileObj;
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorMessageAttributes() {
+    let validateTag = true;
+    messageAttributeList.value.forEach(attribute => {
+        if (isEmpty(attribute.key) || isEmpty(attribute.value)) {
+            validateTag = false;
+        }
+    })
+    if (!validateTag) {
+        return Promise.reject('Message Attribute不能存在空值！');
+    } else {
+        return Promise.resolve();
+    }
+
+
+
+}
+
+
+function beforeUpload(file: any) {
+    fileList.value = [file];
+
+    return false;
+}
+
+function validatorServiceAccountKey() {
+    if (fileList.value.length < 1) {
+        return Promise.reject('请上传 service account key file！');
+    } else {
+        return Promise.resolve();
+    }
+}
+
+function handleDeleteAttribute(index: number) {
+    messageAttributeList.value.splice(index, 1)
+
+}
+
+function handleAddAttribute() {
+    messageAttributeList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
+<style lang="less">
+.ant-form-item-has-error {
+    .message-attribute-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.message-attribute-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
index 86c8f78..095d59a 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/kafka.vue
@@ -43,7 +43,7 @@
         </Form.Item>
         <Form.Item label="Other Properties" name="otherProperties" :rules="[{ validator: validatorOtherProperties }]">
 
-            <Table class="header-table">
+            <Table class="properties-table">
                 <tr class="header">
                     <th>Key</th>
                     <th>Value</th>
@@ -205,3 +205,31 @@ function handleAddProperty() {
 defineExpose({ getConfiguration })
 
 </script>
+<style lang="less">
+.ant-form-item-has-error {
+    .properties-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.properties-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 89b9922..5dc08ff 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -36,6 +36,7 @@
     "org.thingsboard.rule.engine.rabbitmq.TbRabbitMqNode":"rabbitmq",
     "org.thingsboard.rule.engine.mqtt.TbMqttNode":"mqtt",
     "org.thingsboard.rule.engine.kafka.TbKafkaNode":"kafka",
+    "org.thingsboard.rule.engine.gcp.pubsub.TbPubSubNode":"gcp-pubsub",
 
     "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
     "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-- 
Gitee


From 31a523b1d06a321b3eb11a62a3ca04e95eab4bf5 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 20 Apr 2024 10:25:30 +0800
Subject: [PATCH 32/38] todo

---
 src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue
index 2cbf308..8fc60e9 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/EXTERNAL/gcpPubsub.vue
@@ -108,6 +108,7 @@ async function getConfiguration() {
                 data.messageAttributes[attribute.key] = attribute.value;
             })
             data.serviceAccountKeyFileName = fileList.value[0].name;
+            //TODO: 文件转化
             data.serviceAccountKey = fileList.value[0].originFileObj;
         }
         return data;
-- 
Gitee


From 3f6a916ea27ee7bba99357660e5529f47a9ced30 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 20 Apr 2024 11:20:07 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20to-emial?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/TRANSFORMATION/splitArrayMsg.vue  |  56 +++++++
 .../flow/nodeTpl/TRANSFORMATION/toEmail.vue   | 143 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  24 +--
 3 files changed, 212 insertions(+), 11 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/splitArrayMsg.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/toEmail.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/splitArrayMsg.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/splitArrayMsg.vue
new file mode 100644
index 0000000..5eb4807
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/splitArrayMsg.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "split-array-msg",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/toEmail.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/toEmail.vue
new file mode 100644
index 0000000..1e1e2a4
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/toEmail.vue
@@ -0,0 +1,143 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-bold">Email 发送人</p>
+            <div class="p-2">
+                <Form.Item label="来自" name="fromTemplate" :rules="[{ required: true, message: '请输入来自那个邮件' }]"
+                    help="使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。">
+                    <Input v-model:value="formState.fromTemplate" />
+                </Form.Item>
+            </div>
+
+        </div>
+
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-bold">收件人</p>
+            <div class="p-2">
+                <Alert message="逗号分隔的地址列表。所有输入字段都支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
+                <Row :gutter="20">
+                    <Col :span="8">
+                    <Form.Item label="邮箱" name="toTemplate" :rules="[{ required: true, message: '请输入收件人邮箱' }]">
+                        <Input v-model:value="formState.toTemplate" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="8">
+                    <Form.Item label="抄送" name="ccTemplate">
+                        <Input v-model:value="formState.ccTemplate" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="8">
+                    <Form.Item label="密件抄送" name="bccTemplate">
+                        <Input v-model:value="formState.bccTemplate" />
+                    </Form.Item>
+                    </Col>
+                </Row>
+            </div>
+
+        </div>
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-bold">主题/内容</p>
+            <div class="p-2">
+                <Alert message="所有输入字段都支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
+                <Form.Item label="主题" name="subjectTemplate" :rules="[{ required: true, message: '请输入主题' }]">
+                    <Input v-model:value="formState.subjectTemplate" />
+                </Form.Item>
+                <Form.Item label="邮件类型" name="mailBodyType">
+                    <Select v-model:value="formState.mailBodyType">
+                        <Select.Option value="false">
+                            <p> Plain Text</p>
+                            <p class="text-sm">简单、无格式的文本，没有特殊的样式或格式。</p>
+                        </Select.Option>
+                        <Select.Option value="true">
+                            <p> HTML</p>
+                            <p class="text-sm">允许您使用HTML标记在您的mai主体中进行格式化、链接和图像。</p>
+                        </Select.Option>
+                        <Select.Option value="dynamic">
+                            <p> Use body type template</p>
+                            <p class="text-sm">允许基于模板化功能动态使用纯文本或HTML正文类型</p>
+                        </Select.Option>
+                    </Select>
+                </Form.Item>
+                <Form.Item label="内容模版" name="isHtmlTemplate" v-if="formState.mailBodyType == 'dynamic'">
+                    <Input v-model:value="formState.isHtmlTemplate" />
+                </Form.Item>
+                <Form.Item label="内容" name="bodyTemplate" :rules="[{ required: true, message: '请输入内容' }]">
+                    <Input v-model:value="formState.bodyTemplate" />
+                </Form.Item>
+            </div>
+        </div>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "to-email",
+    components: { Alert }
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Alert, Form, Input, Select, Row, Col } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    bccTemplate: string,
+    bodyTemplate: string,
+    ccTemplate: string,
+    fromTemplate: string,
+    isHtmlTemplate: string,
+    mailBodyType: string,
+    subjectTemplate: string,
+    toTemplate: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    bccTemplate: undefined,
+    bodyTemplate: 'Device ${deviceName} has high temperature $[temperature]',
+    ccTemplate: undefined,
+    fromTemplate: 'info@testmail.org',
+    isHtmlTemplate: undefined,
+    mailBodyType: 'false',
+    subjectTemplate: 'Device ${deviceType} temperature high',
+    toTemplate: '${userEmail}',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.bccTemplate = props.configuration.bccTemplate;
+        formState.bodyTemplate = props.configuration.bodyTemplate;
+        formState.ccTemplate = props.configuration.ccTemplate;
+        formState.fromTemplate = props.configuration.fromTemplate;
+        formState.isHtmlTemplate = props.configuration.isHtmlTemplate;
+        formState.mailBodyType = props.configuration.mailBodyType;
+        formState.subjectTemplate = props.configuration.subjectTemplate;
+        formState.toTemplate = props.configuration.toTemplate;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 5dc08ff..2467f44 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -24,10 +24,15 @@
     "org.thingsboard.rule.engine.metadata.TbGetTenantAttributeNode":"tenant-attributes",
     "org.thingsboard.rule.engine.metadata.TbGetTenantDetailsNode":"tenant-details",
 
-    "org.thingsboard.rule.engine.flow.TbAckNode":"acknowledge",
-    "org.thingsboard.rule.engine.flow.TbCheckpointNode":"checkpoint",
-    "org.thingsboard.rule.engine.flow.TbRuleChainOutputNode":"output",
-    "org.thingsboard.rule.engine.flow.TbRuleChainInputNode":"rule-chain",
+    "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
+    "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
+    "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
+    "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path",
+    "org.thingsboard.rule.engine.transform.TbTransformMsgNode":"script",
+    "org.thingsboard.rule.engine.transform.TbRenameKeysNode":"rename-keys",
+    "org.thingsboard.rule.engine.deduplication.TbMsgDeduplicationNode":"deduplication",
+    "org.thingsboard.rule.engine.transform.TbSplitArrayMsgNod":"split-array-msg",
+    "org.thingsboard.rule.engine.mail.TbMsgToEmailNode":"to-email",
 
     "org.thingsboard.rule.engine.sms.TbSendSmsNode":"send-sms",
     "org.thingsboard.rule.engine.notification.TbNotificationNode":"send-notification",
@@ -38,11 +43,8 @@
     "org.thingsboard.rule.engine.kafka.TbKafkaNode":"kafka",
     "org.thingsboard.rule.engine.gcp.pubsub.TbPubSubNode":"gcp-pubsub",
 
-    "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode":"change-originator",
-    "org.thingsboard.rule.engine.transform.TbCopyKeysNode":"copy-key-value-pairs",
-    "org.thingsboard.rule.engine.transform.TbDeleteKeysNode":"delete-key-value-pairs",
-    "org.thingsboard.rule.engine.transform.TbJsonPathNode":"json-path",
-    "org.thingsboard.rule.engine.transform.TbTransformMsgNode":"script",
-    "org.thingsboard.rule.engine.transform.TbRenameKeysNode":"rename-keys",
-    "org.thingsboard.rule.engine.deduplication.TbMsgDeduplicationNode":"deduplication"
+    "org.thingsboard.rule.engine.flow.TbAckNode":"acknowledge",
+    "org.thingsboard.rule.engine.flow.TbCheckpointNode":"checkpoint",
+    "org.thingsboard.rule.engine.flow.TbRuleChainOutputNode":"output",
+    "org.thingsboard.rule.engine.flow.TbRuleChainInputNode":"rule-chain"
 }
-- 
Gitee


From e021f7989fbd17cefb383958324166ef8d8ec2fe Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Mon, 22 Apr 2024 10:19:44 +0800
Subject: [PATCH 34/38] =?UTF-8?q?=E6=94=B9=E5=8F=98=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=93=BE=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/ENRICHMENT/originatorAttributes.vue          | 2 +-
 .../ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue | 4 ++--
 .../flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue       | 4 ++--
 .../ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue   | 4 ++--
 .../ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue     | 2 +-
 .../ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue   | 2 +-
 .../ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue     | 4 ++--
 .../flow/nodeTpl/TRANSFORMATION/changeOriginator.vue          | 4 ++--
 .../ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue   | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
index 62147fb..6e87e4f 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">原始属性</p>
+            <p class="text-base font-bold">原始属性</p>
             <div class="p-2">
                 <Form.Item label="客户端属性" name="clientAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
                     <Select v-model:value="formState.clientAttributeNames" mode="tags">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
index c6db479..5784713 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
@@ -7,7 +7,7 @@
             </Select>
         </Form.Item>
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">提取间隔</p>
+            <p class="text-base font-bold">提取间隔</p>
             <div class="p-2">
                 <Form.Item name="useMetadataIntervalPatterns">
                     <div class="flex items-center">
@@ -66,7 +66,7 @@
             </div>
         </div>
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">提取策略</p>
+            <p class="text-base font-bold">提取策略</p>
             <div class="p-2">
                 <Form.Item name="fetchMode">
                     <Radio.Group v-model:value="formState.fetchMode" button-style="solid" :style="{ display: 'flex' }"
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
index 9d8f893..39c93a0 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedDeviceAttributes.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">设备关系查询</p>
+            <p class="text-base font-bold">设备关系查询</p>
             <div class="p-2">
                 <Row :gutter="20">
                     <Col :span="12">
@@ -57,7 +57,7 @@
 
         </div>
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">相关设备属性</p>
+            <p class="text-base font-bold">相关设备属性</p>
             <div class="p-2">
                 <Form.Item label="客户端属性" name="clientAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
                     <Select v-model:value="formState.clientAttributeNames" mode="tags">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
index 392c4fc..e62d6f2 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/relatedEntityData.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">关系查询</p>
+            <p class="text-base font-bold">关系查询</p>
             <div class="p-2">
                 <Row :gutter="20">
                     <Col :span="12">
@@ -77,7 +77,7 @@
 
         </div>
         <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-            <p class="text-base font-medium">要获取的数据</p>
+            <p class="text-base font-bold">要获取的数据</p>
             <div class="p-2">
                 <Form.Item name="dataToFetch">
                     <Radio.Group v-model:value="formState.dataToFetch" button-style="solid" :style="{ display: 'flex' }"
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
index 8053f15..6ace537 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
         <div class="border  border-neutral-400 p-2 rounded">
-            <p class="text-base font-medium">检查字段</p>
+            <p class="text-base font-bold">检查字段</p>
             <div class="p-2">
                 <Form.Item label="消息字段" name="messageNames" :rules="[{ validator: validatorFieldName }]">
                     <Select v-model:value="formState.messageNames" mode="tags">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
index 2a7d40d..0e6fd8b 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
         <div class="border  border-neutral-400 p-2 rounded">
-            <p class="text-base font-medium">关系搜索参数</p>
+            <p class="text-base font-bold">关系搜索参数</p>
             <div class="p-2">
                 <Form.Item label="方向" name="direction">
                     <Select v-model:value="formState.direction">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
index 9f7b745..44d9126 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
@@ -1,7 +1,7 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
         <div class="border  border-neutral-400 p-2 rounded">
-            <p class="text-base font-medium">坐标字段</p>
+            <p class="text-base font-bold">坐标字段</p>
             <div class="p-2">
                 <Row :gutter="20">
                     <Col :span="12">
@@ -20,7 +20,7 @@
             </div>
         </div>
         <div class="border  border-neutral-400 p-2 rounded mt-3">
-            <p class="text-base font-medium">地理围栏</p>
+            <p class="text-base font-bold">地理围栏</p>
             <div class="p-2">
                 <Form.Item label="边界类型" name="perimeterType" :rules="[{ required: true, message: '边界类型必选!' }]">
                     <Select v-model:value="formState.perimeterType">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
index 8f26023..82a41e7 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/changeOriginator.vue
@@ -11,7 +11,7 @@
     </Form.Item>
     <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4"
       v-if="formState.originatorSource == OriginatorSource.RELATED">
-      <p class="text-base font-medium">关系查询</p>
+      <p class="text-base font-bold">关系查询</p>
       <div class="p-2">
         <Row :gutter="20">
           <Col :span="12">
@@ -60,7 +60,7 @@
     </div>
     <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4"
       v-if="formState.originatorSource == OriginatorSource.ENTITY">
-      <p class="text-base font-medium">实体名称匹配模式</p>
+      <p class="text-base font-bold">实体名称匹配模式</p>
       <div class="p-2">
         <Row :gutter="20">
           <Col :span="12">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
index 0a9d656..5c75592 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/deduplication.vue
@@ -4,7 +4,7 @@
       <InputNumber v-model:value="formState.interval" :min="1" :step="1" :precision="0" :style="{ width: '100%' }" />
     </Form.Item>
     <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
-      <p class="text-base font-medium">存储</p>
+      <p class="text-base font-bold">存储</p>
       <div class="p-2">
         <Form.Item name="strategy">
           <Radio.Group v-model:value="formState.strategy" button-style="solid" :style="{ display: 'flex' }" class="w-full"
-- 
Gitee


From 2fcf5958c9060858d434a8707578dee3331b4ea2 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Mon, 22 Apr 2024 15:25:34 +0800
Subject: [PATCH 35/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BEACTION=20delet?=
 =?UTF-8?q?e-attribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/telemetryEnum.ts                    |   6 +
 .../flow/nodeTpl/ACTION/assignToCustomer.vue  |  74 +++++++
 .../flow/nodeTpl/ACTION/clearAlarm.vue        | 121 ++++++++++++
 .../flow/nodeTpl/ACTION/copyToView.vue        |  56 ++++++
 .../flow/nodeTpl/ACTION/createAlarm.vue       | 180 ++++++++++++++++++
 .../flow/nodeTpl/ACTION/createRelation.vue    | 139 ++++++++++++++
 .../flow/nodeTpl/ACTION/delayDeprecated.vue   |  77 ++++++++
 .../flow/nodeTpl/ACTION/deleteAttributes.vue  |  85 +++++++++
 .../flow/nodeTpl/TRANSFORMATION/script.vue    |   4 +-
 .../flow/nodeTpl/rule-chain-types.json        |   8 +
 10 files changed, 748 insertions(+), 2 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/assignToCustomer.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/clearAlarm.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/copyToView.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/createAlarm.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/delayDeprecated.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue

diff --git a/src/enums/telemetryEnum.ts b/src/enums/telemetryEnum.ts
index d56acda..dee3257 100644
--- a/src/enums/telemetryEnum.ts
+++ b/src/enums/telemetryEnum.ts
@@ -48,4 +48,10 @@ export const SCOPE_OPTIONS = [
   { value: Scope.SERVER_SCOPE, label: '服务端属性' },
   { value: Scope.SHARED_SCOPE, label: '共享属性' },
   { value: 'LATEST_TELEMETRY', label: '遥测数据' },
+]
+
+export const SCOPE_OPTIONS_SIMPLE = [
+  { value: Scope.CLIENT_SCOPE, label: '客户端属性' },
+  { value: Scope.SERVER_SCOPE, label: '服务端属性' },
+  { value: Scope.SHARED_SCOPE, label: '共享属性' },
 ]
\ No newline at end of file
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/assignToCustomer.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/assignToCustomer.vue
new file mode 100644
index 0000000..e9e343e
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/assignToCustomer.vue
@@ -0,0 +1,74 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="客户名称匹配" name="customerNamePattern" :rules="[{ required: true, message: '客户名称匹配必填!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.customerNamePattern">
+            </Input>
+        </Form.Item>
+        <Form.Item name="createCustomerIfNotExists">
+            <Checkbox v-model:checked="formState.createCustomerIfNotExists">创建新客户；如果不存在</Checkbox>
+        </Form.Item>
+        <Form.Item label="客户缓存过期时间" name="customerCacheExpiration" :rules="[{ required: true, message: '客户缓存过期时间必填!' }]"
+            help="指定存储找到的客户记录所允许的最大时间间隔。0值表示记录永远不会过期。">
+            <InputNumber v-model:value="formState.customerCacheExpiration" :min="0" :addon-after="'秒'"
+                :style="{ width: '100%' }" />
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "assign-to-customer",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Checkbox, Form, Input, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    createCustomerIfNotExists: boolean,
+    customerCacheExpiration: number,
+    customerNamePattern: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    createCustomerIfNotExists: false,
+    customerCacheExpiration: 300,
+    customerNamePattern: '',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.createCustomerIfNotExists = props.configuration.createCustomerIfNotExists;
+        formState.customerCacheExpiration = props.configuration.customerCacheExpiration;
+        formState.customerNamePattern = props.configuration.customerNamePattern;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/clearAlarm.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/clearAlarm.vue
new file mode 100644
index 0000000..2e42b6c
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/clearAlarm.vue
@@ -0,0 +1,121 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="scriptLang">
+            <div class="flex justify-center mb-2">
+                <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+                    <Radio.Button value="JS">JavaScript</Radio.Button>
+                    <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+                </Radio.Group>
+            </div>
+        </Form.Item>
+        <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
+            <div>
+                <div class="flex justify-between">
+                    <p class="text-gray-500">function Details(msg, metadata, msgType) {</p>
+                    <Space>
+                        <Tooltip title="格式化">
+                            <Icon class="cursor-pointer" @click="handleFormatScript"
+                                :icon="'ant-design:format-painter-filled'" />
+                        </Tooltip>
+                        <Tooltip title="测试脚本功能">
+                            <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+                        </Tooltip>
+                        <Tooltip title="全屏">
+                            <Icon class="cursor-pointer" @click="handleFullScreen"
+                                :icon="'ant-design:fullscreen-outlined'" />
+                        </Tooltip>
+                    </Space>
+                </div>
+                <div class="py-2">
+                    <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.alarmDetailsBuildJs"
+                        :mode="'javascript'" class="border border-gray-400" />
+                    <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.alarmDetailsBuildTbel"
+                        :mode="'javascript'" class="border border-gray-400" />
+                </div>
+                <div class="text-gray-500">}</div>
+            </div>
+
+            <Button class="mt-2" type="primary" @click="handleTestScript">测试详情函数</Button>
+
+        </Form.Item>
+        <Form.Item label="报警类型" name="alarmType" :rules="[{ required: true, message: '报警类型必填!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.alarmType" />
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "clear-alarm",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Radio, Space, Tooltip, Form, Button, Input } from 'ant-design-vue';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    scriptLang: 'JS' | 'TBEL',
+    alarmType: string,
+    alarmDetailsBuildJs: string,
+    alarmDetailsBuildTbel: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scriptLang: 'TBEL',
+    alarmType: 'General Alarm',
+    alarmDetailsBuildJs: "",
+    alarmDetailsBuildTbel: "",
+})
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scriptLang = props.configuration.scriptLang;
+        formState.alarmType = props.configuration.alarmType;
+        formState.alarmDetailsBuildJs = props.configuration.alarmDetailsBuildJs;
+        formState.alarmDetailsBuildTbel = props.configuration.alarmDetailsBuildTbel;
+
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/copyToView.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/copyToView.vue
new file mode 100644
index 0000000..5858591
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/copyToView.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "copy-to-view",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/createAlarm.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/createAlarm.vue
new file mode 100644
index 0000000..ce0a724
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/createAlarm.vue
@@ -0,0 +1,180 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Form.Item name="useMessageAlarmData">
+            <Checkbox v-model:checked="formState.useMessageAlarmData">使用消息报警数据</Checkbox>
+        </Form.Item>
+        <Form.Item name="overwriteAlarmDetails" v-if="formState.useMessageAlarmData == true">
+            <Checkbox v-model:checked="formState.overwriteAlarmDetails">覆盖报警详细信息</Checkbox>
+        </Form.Item>
+        <template v-if="formState.useMessageAlarmData == false">
+            <Form.Item name="scriptLang">
+                <div class="flex justify-center mb-2">
+                    <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+                        <Radio.Button value="JS">JavaScript</Radio.Button>
+                        <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+                    </Radio.Group>
+                </div>
+            </Form.Item>
+            <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
+                <div>
+                    <div class="flex justify-between">
+                        <p class="text-gray-500">function Details(msg, metadata, msgType) {</p>
+                        <Space>
+                            <Tooltip title="格式化">
+                                <Icon class="cursor-pointer" @click="handleFormatScript"
+                                    :icon="'ant-design:format-painter-filled'" />
+                            </Tooltip>
+                            <Tooltip title="测试脚本功能">
+                                <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+                            </Tooltip>
+                            <Tooltip title="全屏">
+                                <Icon class="cursor-pointer" @click="handleFullScreen"
+                                    :icon="'ant-design:fullscreen-outlined'" />
+                            </Tooltip>
+                        </Space>
+                    </div>
+                    <div class="py-2">
+                        <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.alarmDetailsBuildJs"
+                            :mode="'javascript'" class="border border-gray-400" />
+                        <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.alarmDetailsBuildTbel"
+                            :mode="'javascript'" class="border border-gray-400" />
+                    </div>
+                    <div class="text-gray-500">}</div>
+                </div>
+
+                <Button class="mt-2" type="primary" @click="handleTestScript">测试详情函数</Button>
+
+            </Form.Item>
+            <Form.Item label="报警类型" name="alarmType" :rules="[{ required: true, message: '报警类型必填!' }]"
+                help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+                <Input v-model:value="formState.alarmType" />
+            </Form.Item>
+            <Form.Item name="dynamicSeverity">
+                <Checkbox v-model:checked="formState.dynamicSeverity">使用警报等级配置</Checkbox>
+            </Form.Item>
+            <Form.Item label="报警等级" name="severity" v-if="formState.dynamicSeverity == false">
+                <Select v-model:value="formState.severity" :options="ALARM_SEVERITY_OPTIONS" />
+            </Form.Item>
+            <Form.Item label="报警等级配置" name="severity" v-if="formState.dynamicSeverity == true"
+                :rules="[{ required: true, message: '报警等级配置必填!' }]"
+                help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。警报严重程度应为系统（关键、主要等）">
+                <Input v-model:value="formState.severity" />
+            </Form.Item>
+
+            <Form.Item name="propagate">
+                <Checkbox v-model:checked="formState.propagate">向相关实体传播警报</Checkbox>
+            </Form.Item>
+            <Form.Item label="要传播的关系类型" name="relationTypes" v-if="formState.propagate == true">
+                <Select v-model:value="formState.relationTypes" mode="tags" />
+            </Form.Item>
+
+            <Form.Item name="propagateToOwner">
+                <Checkbox v-model:checked="formState.propagateToOwner">向实体所有者（客户或租户）传播警报</Checkbox>
+            </Form.Item>
+
+            <Form.Item name="propagateToTenant">
+                <Checkbox v-model:checked="formState.propagateToTenant">向租户传播警报</Checkbox>
+            </Form.Item>
+        </template>
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "create-alarm",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Radio, Select, Checkbox, Space, Tooltip, Form, Button, Input } from 'ant-design-vue';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { ALARM_SEVERITY_OPTIONS } from '/@/enums/alarmEnum';
+
+interface Configuration {
+    scriptLang: 'JS' | 'TBEL',
+    alarmType: string,
+    alarmDetailsBuildJs: string,
+    alarmDetailsBuildTbel: string,
+    severity: string,
+    dynamicSeverity: boolean,
+    propagate: boolean,
+    propagateToOwner: boolean,
+    propagateToTenant: boolean,
+    relationTypes: [],
+    useMessageAlarmData: boolean,
+    overwriteAlarmDetails: boolean,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scriptLang: 'TBEL',
+    alarmType: 'General Alarm',
+    alarmDetailsBuildJs: '',
+    alarmDetailsBuildTbel: '',
+    dynamicSeverity: false,
+    propagate: false,
+    propagateToOwner: false,
+    propagateToTenant: false,
+    severity: 'CRITICAL',
+    relationTypes: [],
+    useMessageAlarmData: false,
+    overwriteAlarmDetails: false,
+})
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scriptLang = props.configuration.scriptLang;
+        formState.alarmType = props.configuration.alarmType;
+        formState.alarmDetailsBuildJs = props.configuration.alarmDetailsBuildJs;
+        formState.alarmDetailsBuildTbel = props.configuration.alarmDetailsBuildTbel;
+        formState.dynamicSeverity = props.configuration.dynamicSeverity;
+        formState.overwriteAlarmDetails = props.configuration.overwriteAlarmDetails;
+        formState.propagate = props.configuration.propagate;
+        formState.propagateToOwner = props.configuration.propagateToOwner;
+        formState.propagateToTenant = props.configuration.propagateToTenant;
+        formState.relationTypes = props.configuration.relationTypes;
+        formState.severity = props.configuration.severity;
+        formState.useMessageAlarmData = props.configuration.useMessageAlarmData;
+
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue
new file mode 100644
index 0000000..dc1fae0
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue
@@ -0,0 +1,139 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="方向" name="direction">
+            <Select v-model:value="formState.direction">
+                <Select.Option value="FROM">从</Select.Option>
+                <Select.Option value="TO">到</Select.Option>
+            </Select>
+        </Form.Item>
+        <Row :gutter="20">
+            <Col :span="8">
+            <Form.Item label="实体类型" name="entityType" :rules="[{ required: true, message: '实体类型必填!' }]">
+                <Select v-model:value="formState.entityType" :options="entityTypeOptions">
+                </Select>
+            </Form.Item>
+            </Col>
+            <template v-if="formState.entityType == EntityType.DEVICE || formState.entityType == EntityType.ASSET">
+                <Col :span="8">
+                <Form.Item label="匹配名称" name="entityNamePattern" :rules="[{ required: true, message: '匹配名称称必填!' }]">
+                    <Input v-model:value="formState.entityNamePattern" />
+                </Form.Item>
+                </Col>
+                <Col :span="8">
+                <Form.Item label="匹配类型" name="entityTypePattern" :rules="[{ required: true, message: '匹配类型必填!' }]">
+                    <Input v-model:value="formState.entityTypePattern" />
+                </Form.Item>
+                </Col>
+            </template>
+            <template v-else>
+                <Col :span="16">
+                <Form.Item label="匹配名称" name="entityNamePattern" :rules="[{ required: true, message: '匹配名称称必填!' }]">
+                    <Input v-model:value="formState.entityNamePattern" />
+                </Form.Item>
+                </Col>
+            </template>
+        </Row>
+        <div class="text-sm font-light mb-4" style="margin-top: -20px;">
+            使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。
+        </div>
+        <Form.Item label="匹配关系类型" name="relationType" :rules="[{ required: true, message: '关系类型必填!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.relationType" />
+        </Form.Item>
+        <Form.Item name="createEntityIfNotExists"
+            v-if="formState.entityType == EntityType.DEVICE || formState.entityType == EntityType.ASSET"
+            help="如果上面的实体集不存在，请创建一个新的实体集。">
+            <Checkbox v-model:checked="formState.createEntityIfNotExists">创建新实体；如果不存在</Checkbox>
+        </Form.Item>
+        <Form.Item name="removeCurrentRelations" help="根据方向和类型删除传入消息的原始发件人的当前关系。">
+            <Checkbox v-model:checked="formState.removeCurrentRelations">删除当前关系</Checkbox>
+        </Form.Item>
+        <Form.Item name="changeOriginatorToRelatedEntity" help="用于将提交的消息作为来自另一个实体的消息进行处理。">
+            <Checkbox v-model:checked="formState.changeOriginatorToRelatedEntity">将发起人变更为相关实体</Checkbox>
+        </Form.Item>
+        <Form.Item label="实体缓存过期时间" name="entityCacheExpiration" :rules="[{ required: true, message: '实体缓存过期时间必填!' }]"
+            help="指定存储找到的实体记录所允许的最大时间间隔。0值表示记录永远不会过期。">
+            <InputNumber v-model:value="formState.entityCacheExpiration" :min="0" :addon-after="'秒'"
+                :style="{ width: '100%' }" />
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "create-relation",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select, Input, InputNumber, Checkbox, Row, Col } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+
+interface Configuration {
+    changeOriginatorToRelatedEntity: boolean,
+    createEntityIfNotExists: false,
+    direction: 'FROM' | 'TO',
+    entityCacheExpiration: 300,
+    entityNamePattern: string,
+    entityType: string,
+    entityTypePattern: string,
+    relationType: string,
+    removeCurrentRelations: false,
+}
+
+const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
+    return item.value == EntityType.DEVICE
+        || item.value == EntityType.ASSET
+        || item.value == EntityType.ENTITY_VIEW
+        || item.value == EntityType.TENANT
+        || item.value == EntityType.CUSTOMER
+        || item.value == EntityType.USER
+        || item.value == EntityType.DASHBOARD
+        || item.value == EntityType.EDGE
+})
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        ENTITY_TYPE_OPTIONS
+        formState.changeOriginatorToRelatedEntity = props.configuration.changeOriginatorToRelatedEntity;
+        formState.createEntityIfNotExists = props.configuration.createEntityIfNotExists;
+        formState.direction = props.configuration.direction;
+        formState.entityCacheExpiration = props.configuration.entityCacheExpiration;
+        formState.entityNamePattern = props.configuration.entityNamePattern;
+        formState.entityType = props.configuration.entityType;
+        formState.entityTypePattern = props.configuration.entityTypePattern;
+        formState.relationType = props.configuration.relationType;
+        formState.removeCurrentRelations = props.configuration.removeCurrentRelations;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/delayDeprecated.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/delayDeprecated.vue
new file mode 100644
index 0000000..c4ff293
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/delayDeprecated.vue
@@ -0,0 +1,77 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="useMetadataPeriodInSecondsPatterns" help="如果选中，则规则节点使用消息元数据或数据中的以秒为单位的时间间隔模式，假设时间间隔为秒。">
+            <Checkbox v-model:checked="formState.useMetadataPeriodInSecondsPatterns">使用匹配周期（秒）</Checkbox>
+        </Form.Item>
+        <Form.Item label="匹配周期(秒)" name="periodInSecondsPattern" v-if="formState.useMetadataPeriodInSecondsPatterns == true"
+            :rules="[{ required: true, message: '匹配周期必填!' }]" help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.periodInSecondsPattern" />
+        </Form.Item>
+        <Form.Item label="周期" name="periodInSeconds" v-if="formState.useMetadataPeriodInSecondsPatterns == false"
+            :rules="[{ required: true, message: '周期必填!' }]">
+            <InputNumber v-model:value="formState.periodInSeconds" addon-after="秒" :style="{ width: '100%' }" />
+        </Form.Item>
+        <Form.Item label="最大等待消息数" name="maxPendingMsgs" :rules="[{ required: true, message: '最大等待消息数必填!' }]">
+            <InputNumber v-model:value="formState.maxPendingMsgs" :style="{ width: '100%' }" />
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "delay-deprecated",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Checkbox, Input, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    maxPendingMsgs: number,
+    periodInSeconds: number,
+    periodInSecondsPattern: string,
+    useMetadataPeriodInSecondsPatterns: boolean,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    maxPendingMsgs: 1000,
+    periodInSeconds: 60,
+    periodInSecondsPattern: undefined,
+    useMetadataPeriodInSecondsPatterns: false,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.maxPendingMsgs = props.configuration.maxPendingMsgs;
+        formState.periodInSeconds = props.configuration.periodInSeconds;
+        formState.periodInSecondsPattern = props.configuration.periodInSecondsPattern;
+        formState.useMetadataPeriodInSecondsPatterns = props.configuration.useMetadataPeriodInSecondsPatterns;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue
new file mode 100644
index 0000000..2604b43
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue
@@ -0,0 +1,85 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="设备属性范围" name="scope" :rules="[{ required: true, message: '设备属性范围必填!' }]">
+            <Select v-model:value="formState.scope" :options="SCOPE_OPTIONS_SIMPLE">
+            </Select>
+        </Form.Item>
+        <Form.Item label="属性值" name="keys" :rules="[{ required: true, message: '属性值必填!' }]">
+            <Select v-model:value="formState.keys" mode="tags">
+            </Select>
+        </Form.Item>
+        <Form.Item label="属性值" name="keys" :rules="[{ required: true, message: '属性值必填!' }]">
+            <Select v-model:value="formState.keys" mode="tags">
+            </Select>
+        </Form.Item>
+        <Form.Item name="sendAttributesDeletedNotification" help="将有关已删除属性的通知作为单独的消息发送到规则引擎队列。">
+            <Checkbox v-model:checked="formState.sendAttributesDeletedNotification">发送属性删除通知</Checkbox>
+        </Form.Item>
+        <Form.Item name="notifyDevice" v-if="formState.scope == Scope.SHARED_SCOPE"
+            help="如果启用，则强制向设备通知有关共享属性删除的信息。如果禁用，则通知行为由传入消息元数据中的“notifyDevice”参数控制。若要打开通知，消息元数据必须包含设置为“true”的“notifyDevice”参数。在任何其他情况下，都不会向设备触发通知。">
+            <Checkbox v-model:checked="formState.notifyDevice">强制通知设备</Checkbox>
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "delete-attribute",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Checkbox, Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { SCOPE_OPTIONS_SIMPLE, Scope } from '/@/enums/telemetryEnum';
+
+interface Configuration {
+    keys: [],
+    notifyDevice: boolean,
+    scope: string,
+    sendAttributesDeletedNotification: boolean,
+
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    keys: [],
+    notifyDevice: false,
+    scope: "SERVER_SCOPE",
+    sendAttributesDeletedNotification: false,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+
+        formState.keys = props.configuration.keys;
+        formState.notifyDevice = props.configuration.notifyDevice;
+        formState.scope = props.configuration.scope;
+        formState.sendAttributesDeletedNotification = props.configuration.sendAttributesDeletedNotification;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
index 1ae3def..a12224d 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/TRANSFORMATION/script.vue
@@ -11,7 +11,7 @@
     <Form.Item :name="formState.scriptLang == 'TBEL' ? 'tbelScript' : 'jsScript'">
       <div>
         <div class="flex justify-between">
-          <p class="text-gray-500">function Filter(msg, metadata, msgType) {</p>
+          <p class="text-gray-500">function Transform(msg, metadata, msgType) {</p>
           <Space>
             <Tooltip title="格式化">
               <Icon class="cursor-pointer" @click="handleFormatScript" :icon="'ant-design:format-painter-filled'" />
@@ -32,7 +32,7 @@
         </div>
         <div class="text-gray-500">}</div>
       </div>
-      <Button class="mt-2" type="primary" @click="handleTestScript">测试脚本功能</Button>
+      <Button class="mt-2" type="primary" @click="handleTestScript">测试转换函数</Button>
     </Form.Item>
   </Form>
 </template>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 2467f44..72472f5 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -34,6 +34,14 @@
     "org.thingsboard.rule.engine.transform.TbSplitArrayMsgNod":"split-array-msg",
     "org.thingsboard.rule.engine.mail.TbMsgToEmailNode":"to-email",
 
+    "org.thingsboard.rule.engine.action.TbAssignToCustomerNode":"assign-to-customer",
+    "org.thingsboard.rule.engine.action.TbClearAlarmNode":"clear-alarm",
+    "org.thingsboard.rule.engine.action.TbCopyAttributesToEntityViewNode":"copy-to-view",
+    "org.thingsboard.rule.engine.action.TbCreateAlarmNode":"create-alarm",
+    "org.thingsboard.rule.engine.action.TbCreateRelationNode":"create-relation",
+    "org.thingsboard.rule.engine.delay.TbMsgDelayNode":"delay-deprecated",
+    "org.thingsboard.rule.engine.telemetry.TbMsgDeleteAttributesNode":"delete-attributes",
+
     "org.thingsboard.rule.engine.sms.TbSendSmsNode":"send-sms",
     "org.thingsboard.rule.engine.notification.TbNotificationNode":"send-notification",
     "org.thingsboard.rule.engine.mail.TbSendEmailNode":"send-email",
-- 
Gitee


From 7b95c28ea4fe12f239d8a825ba0c030f0b60d682 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Mon, 22 Apr 2024 17:18:46 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20Action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/ACTION/createRelation.vue    |  17 +-
 ...leteAttributes.vue => deleteAttribute.vue} |   6 +-
 .../flow/nodeTpl/ACTION/deleteRelation.vue    | 116 ++++++++++++++
 .../flow/nodeTpl/ACTION/deviceProfile.vue     |  69 ++++++++
 .../flow/nodeTpl/ACTION/deviceState.vue       |  57 +++++++
 .../ruleChain/flow/nodeTpl/ACTION/log.vue     | 113 +++++++++++++
 .../flow/nodeTpl/ACTION/mathFunction.vue      |  62 ++++++++
 .../flow/nodeTpl/ACTION/messageCount.vue      |  66 ++++++++
 .../flow/nodeTpl/ACTION/pushToEdge.vue        |  64 ++++++++
 .../flow/nodeTpl/ACTION/rpcCallReply.vue      |  67 ++++++++
 .../flow/nodeTpl/ACTION/rpcCallRequest.vue    |  57 +++++++
 .../flow/nodeTpl/ACTION/saveAttributes.vue    |  92 +++++++++++
 .../flow/nodeTpl/ACTION/saveTimeseries.vue    |  72 +++++++++
 .../flow/nodeTpl/ACTION/saveToCustomTable.vue | 150 ++++++++++++++++++
 .../nodeTpl/ACTION/synchronizationEnd.vue     |  57 +++++++
 .../nodeTpl/ACTION/synchronizationStart.vue   |  57 +++++++
 .../nodeTpl/ACTION/unassignFromCustomer.vue   |  68 ++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  18 ++-
 18 files changed, 1197 insertions(+), 11 deletions(-)
 rename src/views/things/ruleChain/flow/nodeTpl/ACTION/{deleteAttributes.vue => deleteAttribute.vue} (92%)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteRelation.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceProfile.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceState.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/log.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/messageCount.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/pushToEdge.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallReply.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallRequest.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/saveAttributes.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/saveTimeseries.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/saveToCustomTable.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationEnd.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationStart.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/unassignFromCustomer.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue
index dc1fae0..6a575cb 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/createRelation.vue
@@ -72,14 +72,14 @@ import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
 
 interface Configuration {
     changeOriginatorToRelatedEntity: boolean,
-    createEntityIfNotExists: false,
+    createEntityIfNotExists: boolean,
     direction: 'FROM' | 'TO',
-    entityCacheExpiration: 300,
+    entityCacheExpiration: number,
     entityNamePattern: string,
     entityType: string,
     entityTypePattern: string,
     relationType: string,
-    removeCurrentRelations: false,
+    removeCurrentRelations: boolean,
 }
 
 const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
@@ -106,13 +106,20 @@ const props = defineProps({
 const formRef = ref<FormInstance>();
 
 const formState = reactive<any>({
-    version: 0,
+    changeOriginatorToRelatedEntity: false,
+    createEntityIfNotExists: false,
+    direction: 'FROM',
+    entityCacheExpiration: 300,
+    entityNamePattern: undefined,
+    entityType: undefined,
+    entityTypePattern: undefined,
+    relationType: undefined,
+    removeCurrentRelations: false,
 });
 
 watch(
     () => props.configuration,
     () => {
-        ENTITY_TYPE_OPTIONS
         formState.changeOriginatorToRelatedEntity = props.configuration.changeOriginatorToRelatedEntity;
         formState.createEntityIfNotExists = props.configuration.createEntityIfNotExists;
         formState.direction = props.configuration.direction;
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttribute.vue
similarity index 92%
rename from src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue
rename to src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttribute.vue
index 2604b43..e89ed39 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteAttribute.vue
@@ -9,10 +9,6 @@
             <Select v-model:value="formState.keys" mode="tags">
             </Select>
         </Form.Item>
-        <Form.Item label="属性值" name="keys" :rules="[{ required: true, message: '属性值必填!' }]">
-            <Select v-model:value="formState.keys" mode="tags">
-            </Select>
-        </Form.Item>
         <Form.Item name="sendAttributesDeletedNotification" help="将有关已删除属性的通知作为单独的消息发送到规则引擎队列。">
             <Checkbox v-model:checked="formState.sendAttributesDeletedNotification">发送属性删除通知</Checkbox>
         </Form.Item>
@@ -56,7 +52,7 @@ const formRef = ref<FormInstance>();
 const formState = reactive<any>({
     keys: [],
     notifyDevice: false,
-    scope: "SERVER_SCOPE",
+    scope: Scope.SERVER_SCOPE,
     sendAttributesDeletedNotification: false,
 });
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteRelation.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteRelation.vue
new file mode 100644
index 0000000..fbb2b02
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deleteRelation.vue
@@ -0,0 +1,116 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Form.Item name="deleteForSingleEntity" help="根据方向和类型删除传入消息的原始发件人与指定实体或实体列表的关系。">
+            <Checkbox v-model:checked="formState.deleteForSingleEntity">删除与特定实体的关系</Checkbox>
+        </Form.Item>
+        <Form.Item label="方向" name="direction">
+            <Select v-model:value="formState.direction">
+                <Select.Option value="FROM">从</Select.Option>
+                <Select.Option value="TO">到</Select.Option>
+            </Select>
+        </Form.Item>
+        <Row :gutter="20">
+            <Col :span="8">
+            <Form.Item label="实体类型" name="entityType" :rules="[{ required: true, message: '实体类型必填!' }]">
+                <Select v-model:value="formState.entityType" :options="entityTypeOptions">
+                </Select>
+            </Form.Item>
+            </Col>
+            <Col :span="16">
+            <Form.Item label="匹配名称" name="entityNamePattern" :rules="[{ required: true, message: '匹配名称称必填!' }]"
+                help=" 使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+                <Input v-model:value="formState.entityNamePattern" />
+            </Form.Item>
+            </Col>
+        </Row>
+        <Form.Item label="匹配关系类型" name="relationType" :rules="[{ required: true, message: '关系类型必填!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.relationType" />
+        </Form.Item>
+
+        <Form.Item label="实体缓存过期时间" name="entityCacheExpiration" :rules="[{ required: true, message: '实体缓存过期时间必填!' }]"
+            help="指定存储找到的实体记录所允许的最大时间间隔。0值表示记录永远不会过期。">
+            <InputNumber v-model:value="formState.entityCacheExpiration" :min="0" :addon-after="'秒'"
+                :style="{ width: '100%' }" />
+        </Form.Item>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "delete-relation",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select, Input, InputNumber, Checkbox, Row, Col } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+
+interface Configuration {
+    deleteForSingleEntity: boolean,
+    direction: 'FROM' | 'TO',
+    entityCacheExpiration: boolean,
+    entityNamePattern: string,
+    entityType: string,
+    entityTypePattern: string,
+    relationType: string,
+}
+
+const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
+    return item.value == EntityType.DEVICE
+        || item.value == EntityType.ASSET
+        || item.value == EntityType.ENTITY_VIEW
+        || item.value == EntityType.TENANT
+        || item.value == EntityType.CUSTOMER
+        || item.value == EntityType.USER
+        || item.value == EntityType.DASHBOARD
+        || item.value == EntityType.EDGE
+})
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    deleteForSingleEntity: true,
+    direction: 'FROM',
+    entityCacheExpiration: 300,
+    entityNamePattern: undefined,
+    entityType: undefined,
+    entityTypePattern: undefined,
+    relationType: undefined,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.deleteForSingleEntity = props.configuration.deleteForSingleEntity;
+        formState.direction = props.configuration.direction;
+        formState.entityCacheExpiration = props.configuration.entityCacheExpiration;
+        formState.entityNamePattern = props.configuration.entityNamePattern;
+        formState.entityType = props.configuration.entityType;
+        formState.entityTypePattern = props.configuration.entityTypePattern;
+        formState.relationType = props.configuration.relationType;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceProfile.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceProfile.vue
new file mode 100644
index 0000000..2db7d79
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceProfile.vue
@@ -0,0 +1,69 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="fetchAlarmRulesStateOnStart">
+            <Checkbox v-model:value="formState.fetchAlarmRulesStateOnStart">
+                保持报警规则状态
+            </Checkbox>
+        </Form.Item>
+        <Form.Item name="persistAlarmRulesState">
+            <Checkbox v-model:value="formState.persistAlarmRulesState">
+                获取报警规则状态
+            </Checkbox>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "device-profile",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Checkbox } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    fetchAlarmRulesStateOnStart: boolean,
+    persistAlarmRulesState: boolean,
+
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    fetchAlarmRulesStateOnStart: false,
+    persistAlarmRulesState: false,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.fetchAlarmRulesStateOnStart = props.configuration.fetchAlarmRulesStateOnStart;
+        formState.persistAlarmRulesState = props.configuration.persistAlarmRulesState;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceState.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceState.vue
new file mode 100644
index 0000000..c4bdcbb
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/deviceState.vue
@@ -0,0 +1,57 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="event" >
+            <Input v-model:value="formState.event">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "device-state",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    event: string
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    event: 'ACTIVITY_EVENT',
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.event = props.configuration.event },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/log.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/log.vue
new file mode 100644
index 0000000..0acfadc
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/log.vue
@@ -0,0 +1,113 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="scriptLang">
+            <div class="flex justify-center mb-2">
+                <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+                    <Radio.Button value="JS">JavaScript</Radio.Button>
+                    <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+                </Radio.Group>
+            </div>
+        </Form.Item>
+        <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
+            <div>
+                <div class="flex justify-between">
+                    <p class="text-gray-500">function ToString(msg, metadata, msgType) {</p>
+                    <Space>
+                        <Tooltip title="格式化">
+                            <Icon class="cursor-pointer" @click="handleFormatScript"
+                                :icon="'ant-design:format-painter-filled'" />
+                        </Tooltip>
+                        <Tooltip title="测试脚本功能">
+                            <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+                        </Tooltip>
+                        <Tooltip title="全屏">
+                            <Icon class="cursor-pointer" @click="handleFullScreen"
+                                :icon="'ant-design:fullscreen-outlined'" />
+                        </Tooltip>
+                    </Space>
+                </div>
+                <div class="py-2">
+                    <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.jsScript" :mode="'javascript'"
+                        class="border border-gray-400" />
+                    <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.tbelScript"
+                        :mode="'javascript'" class="border border-gray-400" />
+                </div>
+                <div class="text-gray-500">}</div>
+            </div>
+
+            <Button class="mt-2" type="primary" @click="handleTestScript">测试toString函数</Button>
+
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "log",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Radio, Button, Tooltip, Space } from 'ant-design-vue';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    scriptLang: 'JS' | 'TBEL',
+    jsScript: string,
+    tbelScript: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scriptLang: 'TBEL',
+    jsScript: '',
+    tbelScript: '',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scriptLang = props.configuration.scriptLang;
+        formState.jsScript = props.configuration.jsScript;
+        formState.tbelScript = props.configuration.tbelScript;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue
new file mode 100644
index 0000000..9a24a2f
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue
@@ -0,0 +1,62 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "math-function",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    arguments: Array<any>,
+    customFunction: string,
+    operation: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    arguments: [],
+    customFunction: '(x - 32) / 1.8',
+    operation: 'CUSTOM',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.arguments = props.configuration.arguments;
+        formState.customFunction = props.configuration.customFunction;
+        formState.operation = props.configuration.operation;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/messageCount.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/messageCount.vue
new file mode 100644
index 0000000..9b584f6
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/messageCount.vue
@@ -0,0 +1,66 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="间隔" name="interval" :rules="[{ required: true, }]">
+            <InputNumber v-model:value="formState.interval" addon-after="秒" :style="{ width: '100%' }">
+            </InputNumber>
+        </Form.Item>
+        <Form.Item label="输出遥测数据Key前缀" name="telemetryPrefix" :rules="[{ required: true, message: '输出遥测数据Key前缀必填' }]">
+            <Input v-model:value="formState.telemetryPrefix">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "message-count",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    interval: number,
+    telemetryPrefix: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    interval: 1,
+    telemetryPrefix: 'messageCount',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.interval = props.configuration.interval;
+        formState.telemetryPrefix = props.configuration.telemetryPrefix;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/pushToEdge.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/pushToEdge.vue
new file mode 100644
index 0000000..b2c4155
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/pushToEdge.vue
@@ -0,0 +1,64 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="设备属性范围" name="scope" :rules="[{ required: true, message: '设备属性范围必填!' }]">
+            <Select v-model:value="formState.scope" :options="SCOPE_OPTIONS_SIMPLE">
+            </Select>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "push-to-edge",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { SCOPE_OPTIONS_SIMPLE, Scope } from '/@/enums/telemetryEnum';
+
+interface Configuration {
+    scope: string,
+
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scope: Scope.SERVER_SCOPE,
+
+
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scope = props.configuration.scope;
+
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallReply.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallReply.vue
new file mode 100644
index 0000000..0c71842
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallReply.vue
@@ -0,0 +1,67 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="Request Id Metadata attribute name" name="requestIdMetaDataAttribute"
+            :rules="[{ required: true, }]">
+            <Input v-model:value="formState.requestIdMetaDataAttribute">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "rpc-call-reply",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    requestIdMetaDataAttribute: string,
+    serviceIdMetaDataAttribute: string,
+    sessionIdMetaDataAttribute: string,
+
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    requestIdMetaDataAttribute: 'requestId',
+    serviceIdMetaDataAttribute: 'serviceId',
+    sessionIdMetaDataAttribute: 'sessionId',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.requestIdMetaDataAttribute = props.configuration.requestIdMetaDataAttribute;
+        formState.serviceIdMetaDataAttribute = props.configuration.serviceIdMetaDataAttribute;
+        formState.sessionIdMetaDataAttribute = props.configuration.sessionIdMetaDataAttribute;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallRequest.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallRequest.vue
new file mode 100644
index 0000000..c34827a
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/rpcCallRequest.vue
@@ -0,0 +1,57 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="超时时间" name="timeoutInSeconds" :rules="[{ required: true, message: '超时时间必填!' }]">
+            <InputNumber v-model:value="formState.timeoutInSeconds" :addon-after="'秒'" :style="{ width: '100%' }">
+            </InputNumber>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "rpc-call-request",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    timeoutInSeconds: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    timeoutInSeconds: 60,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.timeoutInSeconds = props.configuration.timeoutInSeconds },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveAttributes.vue
new file mode 100644
index 0000000..973ad35
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveAttributes.vue
@@ -0,0 +1,92 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="设备属性范围" name="scope" :rules="[{ required: true, message: '设备属性范围必填!' }]">
+            <Select v-model:value="formState.scope" :options="SCOPE_OPTIONS_SIMPLE">
+            </Select>
+        </Form.Item>
+        <Form.Item name="updateAttributesOnlyOnValueChange">
+            <div class="border  border-neutral-300 rounded-md  px-4 py-3">
+                <Switch size="small" v-model:checked="formState.updateAttributesOnlyOnValueChange" />
+                <span class="ml-2">仅当值更改时保存属性</span>
+            </div>
+        </Form.Item>
+        <Form.Item name="sendAttributesUpdatedNotification" v-if="formState.scope != Scope.CLIENT_SCOPE">
+            <div class="border  border-neutral-300 rounded-md  px-4 py-3">
+                <Switch size="small" v-model:checked="formState.sendAttributesUpdatedNotification" />
+                <span class="ml-2"> 发送属性更新通知</span>
+
+            </div>
+        </Form.Item>
+
+        <Form.Item name="notifyDevice" v-if="formState.scope == Scope.SHARED_SCOPE">
+            <div class="border  border-neutral-300 rounded-md  px-4 py-3">
+                <Switch size="small" v-model:checked="formState.notifyDevice" />
+                <span class="ml-2"> 强制通知设备</span>
+            </div>
+        </Form.Item>
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "save-attributes",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select, Switch } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { SCOPE_OPTIONS_SIMPLE, Scope } from '/@/enums/telemetryEnum';
+
+interface Configuration {
+    scope: string,
+    notifyDevice: boolean,
+    sendAttributesUpdatedNotification: boolean,
+    updateAttributesOnlyOnValueChange: boolean,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scope: Scope.SERVER_SCOPE,
+    notifyDevice: false,
+    sendAttributesUpdatedNotification: false,
+    updateAttributesOnlyOnValueChange: false,
+
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scope = props.configuration.scope;
+        formState.notifyDevice = props.configuration.notifyDevice;
+        formState.sendAttributesUpdatedNotification = props.configuration.sendAttributesUpdatedNotification;
+        formState.updateAttributesOnlyOnValueChange = props.configuration.updateAttributesOnlyOnValueChange;
+
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveTimeseries.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveTimeseries.vue
new file mode 100644
index 0000000..9df12de
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveTimeseries.vue
@@ -0,0 +1,72 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="默认TTL(秒)" name="defaultTTL" :rules="[{ required: true, message: '默认TTL(秒)必填!' }]">
+            <InputNumber v-model:value="formState.defaultTTL" :style="{ width: '100%' }">
+            </InputNumber>
+        </Form.Item>
+        <Form.Item name="skipLatestPersistence">
+            <Checkbox v-model:checked="formState.skipLatestPersistence">Skip latest persistence</Checkbox>
+        </Form.Item>
+        <Form.Item name="useServerTs" help="启用此设置可使用消息处理的时间戳，而不是消息的时间戳。如果合并来自多个来源（设备、资产等）的消息，则可用于各种顺序处理。">
+            <Checkbox v-model:checked="formState.useServerTs">使用服务端时间戳</Checkbox>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "save-timeseries",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, InputNumber, Checkbox } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    defaultTTL: number,
+    skipLatestPersistence: boolean,
+    useServerTs: boolean,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    defaultTTL: 0,
+    skipLatestPersistence: false,
+    useServerTs: false,
+
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.defaultTTL = props.configuration.defaultTTL;
+        formState.skipLatestPersistence = props.configuration.skipLatestPersistence;
+        formState.useServerTs = props.configuration.useServerTs;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveToCustomTable.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveToCustomTable.vue
new file mode 100644
index 0000000..6efe7a3
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/saveToCustomTable.vue
@@ -0,0 +1,150 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="自定义表名称" name="tableName" :rules="[{ required: true, message: '自定义表名称必填!' }]"
+            help="输入不带前缀“cs_tb_”的表名。">
+            <Input v-model:value="formState.tableName" />
+        </Form.Item>
+        <Form.Item label="属性映射" name="fieldsMapping" :rules="[{ validator: validatorFieldsMapping }]">
+            <Table class="mapping-table">
+                <tr class="header">
+                    <th>Message FileId</th>
+                    <th>Table column</th>
+                </tr>
+                <tr class="content" v-for="(mapping, index) in mappingList" :key="index">
+                    <td class="py-2 px-4">
+                        <Input v-model:value="mapping.key" placeholder="输入原属性" />
+                    </td>
+                    <td> <Input v-model:value="mapping.value" placeholder="输入目标属性" />
+                    </td>
+                    <td>
+                        <Tooltip title="删除" class="pl-4">
+                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                @click="handleDeleteMapping(index)" />
+                        </Tooltip>
+                    </td>
+                </tr>
+            </Table>
+            <Button class="my-4" type="primary" @click="handleAddMapping">添加映射</Button>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "save-to-custom-table",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Input, Button, Tooltip } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    fieldsMapping: Recordable,
+    tableName: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const mappingList = ref<Array<any>>([]);
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    fieldsMapping: {},
+    tableName: undefined,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        mappingList.value = [];
+        formState.fieldsMapping = props.configuration.fieldsMapping;
+        formState.tableName = props.configuration.tableName;
+        Object.keys(formState.fieldsMapping).forEach(key => {
+            mappingList.value.push({ key: key, value: formState.fieldsMapping[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            mappingList.value.forEach(mapping => {
+                data.fieldsMapping[mapping.key] = mapping.value;
+            })
+        }
+
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorFieldsMapping() {
+    let validateTag = true;
+    mappingList.value.forEach(mapping => {
+        if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+            validateTag = false;
+        }
+    })
+    if (!validateTag) {
+        return Promise.reject('属性映射不能存在空值！');
+    } else {
+        return Promise.resolve();
+    }
+
+}
+
+function handleDeleteMapping(index: number) {
+    mappingList.value.splice(index, 1)
+}
+
+function handleAddMapping() {
+    mappingList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
+<style lang="less">
+.ant-form-item-has-error {
+    .mapping-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.mapping-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationEnd.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationEnd.vue
new file mode 100644
index 0000000..2447011
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationEnd.vue
@@ -0,0 +1,57 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "synchronization-end",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationStart.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationStart.vue
new file mode 100644
index 0000000..d71dfe5
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/synchronizationStart.vue
@@ -0,0 +1,57 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "synchronization-start",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/unassignFromCustomer.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/unassignFromCustomer.vue
new file mode 100644
index 0000000..c81a175
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/unassignFromCustomer.vue
@@ -0,0 +1,68 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="匹配客户名称" name="customerNamePattern" :rules="[{ required: true, message: '客户名称必填!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Input v-model:value="formState.customerNamePattern">
+            </Input>
+        </Form.Item>
+        <Form.Item label="客户缓存过期时间" name="customerCacheExpiration" :rules="[{ required: true, message: '客户缓存过期时间必填!' }]"
+            help="指定存储找到的客户记录所允许的最大时间间隔。0值表示记录永远不会过期。">
+            <InputNumber v-model:value="formState.customerCacheExpiration" :addon-after="'秒'" :style="{ width: '100%' }">
+            </InputNumber>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "unassign-from-customer",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    customerCacheExpiration: number,
+    customerNamePattern: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    customerCacheExpiration: 300,
+    customerNamePattern: undefined,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.customerCacheExpiration = props.configuration.customerCacheExpiration;
+        formState.customerNamePattern = props.configuration.customerNamePattern;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 72472f5..40b2c55 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -40,7 +40,23 @@
     "org.thingsboard.rule.engine.action.TbCreateAlarmNode":"create-alarm",
     "org.thingsboard.rule.engine.action.TbCreateRelationNode":"create-relation",
     "org.thingsboard.rule.engine.delay.TbMsgDelayNode":"delay-deprecated",
-    "org.thingsboard.rule.engine.telemetry.TbMsgDeleteAttributesNode":"delete-attributes",
+    "org.thingsboard.rule.engine.telemetry.TbMsgDeleteAttributesNode":"delete-attribute",
+    "org.thingsboard.rule.engine.action.TbDeleteRelationNode":"delete-relation",
+    "org.thingsboard.rule.engine.profile.TbDeviceProfileNode":"device-profile",
+    "org.thingsboard.rule.engine.action.TbDeviceStateNode":"device-state",
+    "org.thingsboard.rule.engine.action.TbLogNode":"log",
+    "org.thingsboard.rule.engine.math.TbMathNode":"math-function",
+    "org.thingsboard.rule.engine.action.TbMsgCountNode":"message-count",
+    "org.thingsboard.rule.engine.edge.TbMsgPushToEdgeNode":"push-to-edge",
+    "org.thingsboard.rule.engine.rpc.TbSendRPCReplyNode":"rpc-call-reply",
+    "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode":"rpc-call-request",
+    "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode":"save-attributes",
+    "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode":"save-timeseries",
+    "org.thingsboard.rule.engine.action.TbSaveToCustomCassandraTableNode":"save-to-custom-table",
+    "org.thingsboard.rule.engine.transaction.TbSynchronizationEndNode":"synchronization-end",
+    "org.thingsboard.rule.engine.transaction.TbSynchronizationBeginNode":"synchronization-start",
+    "org.thingsboard.rule.engine.action.TbUnassignFromCustomerNode":"unassign-from-customer",
+    
 
     "org.thingsboard.rule.engine.sms.TbSendSmsNode":"send-sms",
     "org.thingsboard.rule.engine.notification.TbNotificationNode":"send-notification",
-- 
Gitee


From 27772624f0ca6aa7397945b966bbaa2d65a51b73 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 23 Apr 2024 11:34:12 +0800
Subject: [PATCH 37/38] Action complete

---
 .../flow/nodeTpl/ACTION/generator.vue         | 253 ++++++++++++++++++
 .../nodeTpl/ACTION/gpsGeofencingEvents.vue    | 181 +++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   2 +
 3 files changed, 436 insertions(+)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/generator.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ACTION/gpsGeofencingEvents.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/generator.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/generator.vue
new file mode 100644
index 0000000..0373325
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/generator.vue
@@ -0,0 +1,253 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="消息计数" name="msgCount" :rules="[{ required: true, message: '消息计数必填!' }]">
+            <InputNumber v-model:value="formState.msgCount" :min="0" :style="{ width: '100%' }">
+            </InputNumber>
+        </Form.Item>
+        <Form.Item label="周期（秒）" name="periodInSeconds" :rules="[{ required: true, message: '周期必填!' }]">
+            <InputNumber v-model:value="formState.periodInSeconds" :min="0" :style="{ width: '100%' }">
+            </InputNumber>
+        </Form.Item>
+        <Row :gutter="20">
+            <Col :span="8">
+            <Form.Item label="发起" name="originatorType" :rules="[{ required: true }]">
+                <Select v-model:value="formState.originatorType" :options="entityTypeOptions" @change="onEntityTypeChange">
+                </Select>
+            </Form.Item>
+            </Col>
+            <Col :span="16">
+            <Form.Item label=" " name="originatorId" :rules="[{ required: true }]">
+                <Select v-model:value="formState.originatorId" :options="entityIdOptions">
+                </Select>
+            </Form.Item>
+            </Col>
+        </Row>
+        <Form.Item label="队列" name="queueName">
+            <Select v-model:value="formState.queueName">
+                <Select.Option v-for="(option, index) in queueOptions" :key="index" :value="option.value">
+                    {{ option.label }}
+                    <p>
+                        <Tag>
+                            <small>提交策略:</small>
+                            {{ SUBMIT_STRATEGY_OPTIONS.find((item) => item.value === option.submitStrategy)?.label
+                                || option.submitStrategy }}
+                        </Tag>
+                        <Tag>
+                            <small>处理策略:</small>
+                            {{ PROCESSING_STRATEGY_OPTIONS.find((item) => item.value === option.processingStrategy)?.label
+                                || option.processingStrategy }}
+                        </Tag>
+                    </p>
+                </Select.Option>
+            </Select>
+        </Form.Item>
+        <Form.Item name="scriptLang">
+            <div class="flex justify-center mb-2">
+                <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+                    <Radio.Button value="JS">JavaScript</Radio.Button>
+                    <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+                </Radio.Group>
+            </div>
+        </Form.Item>
+        <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
+            <div>
+                <div class="flex justify-between">
+                    <p class="text-gray-500">function Generate(prevMsg, prevMetadata, prevMsgType) {</p>
+                    <Space>
+                        <Tooltip title="格式化">
+                            <Icon class="cursor-pointer" @click="handleFormatScript"
+                                :icon="'ant-design:format-painter-filled'" />
+                        </Tooltip>
+                        <Tooltip title="测试脚本功能">
+                            <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+                        </Tooltip>
+                        <Tooltip title="全屏">
+                            <Icon class="cursor-pointer" @click="handleFullScreen"
+                                :icon="'ant-design:fullscreen-outlined'" />
+                        </Tooltip>
+                    </Space>
+                </div>
+                <div class="py-2">
+                    <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.jsScript" :mode="'javascript'"
+                        class="border border-gray-400" />
+                    <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.tbelScript"
+                        :mode="'javascript'" class="border border-gray-400" />
+                </div>
+                <div class="text-gray-500">}</div>
+            </div>
+
+            <Button class="mt-2" type="primary" @click="handleTestScript">测试generate函数</Button>
+
+        </Form.Item>
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "generator",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive, onMounted } from 'vue';
+import { Form, InputNumber, Select, Tag, Row, Col, Radio, Space, Tooltip, Button } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { Icon } from '/@/components/Icon';
+import { useUserStore } from '/@/store/modules/user';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { PROCESSING_STRATEGY_OPTIONS, SUBMIT_STRATEGY_OPTIONS } from '/@/enums/queueEnum';
+import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+import { queueList } from '/@/api/things/queue';
+import { getTenantDeviceInfoList } from '/@/api/things/device';
+import { getTenantAssetInfoList } from '/@/api/things/asset';
+import { getTenantEntityViewInfos } from '/@/api/things/entityView';
+import { tenantById } from '/@/api/things/tenant';
+import { customerList } from '/@/api/things/customer';
+import { userList } from '/@/api/things/user';
+import { currentTenantDashboardList } from '/@/api/things/dashboard';
+
+interface Configuration {
+    msgCount: number,
+    originatorId: string,
+    originatorType: string,
+    periodInSeconds: number,
+    scriptLang: 'JS' | 'TBEL',
+    queueName: string,
+    tbelScript: string,
+    jsScript: string,
+}
+const userStore = useUserStore();
+
+
+const queueOptions = ref<any[]>([]);
+
+const entityIdOptions = ref<any[]>([]);
+
+
+const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
+    return item.value == EntityType.DEVICE
+        || item.value == EntityType.ASSET
+        || item.value == EntityType.ENTITY_VIEW
+        || item.value == EntityType.TENANT
+        || item.value == EntityType.CUSTOMER
+        || item.value == EntityType.USER
+        || item.value == EntityType.DASHBOARD
+        || item.value == EntityType.EDGE
+})
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    msgCount: 0,
+    originatorId: undefined,
+    originatorType: undefined,
+    queueName: undefined,
+    periodInSeconds: 1,
+    scriptLang: 'TBEL',
+    tbelScript: '',
+    jsScript: '',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.msgCount = props.configuration.msgCount;
+        formState.queueName = props.configuration.queueName;
+        formState.originatorId = props.configuration.originatorId;
+        formState.originatorType = props.configuration.originatorType;
+        formState.periodInSeconds = props.configuration.periodInSeconds;
+        formState.scriptLang = props.configuration.scriptLang;
+        formState.tbelScript = props.configuration.tbelScript;
+        formState.jsScript = props.configuration.jsScript;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+onMounted(async () => {
+    await fetchQueueList();
+})
+
+async function fetchQueueList() {
+    const queueListResult = await queueList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' }, 'TB_RULE_ENGINE');
+    queueOptions.value = queueListResult.data.map(item => {
+        return {
+            value: item.name,
+            label: item.name,
+            submitStrategy: item.submitStrategy?.type,
+            processingStrategy: item.processingStrategy?.type
+        }
+    })
+
+}
+
+
+async function onEntityTypeChange(entityType: EntityType) {
+    switch (entityType) {
+        case EntityType.DEVICE:
+            const deviceListResult = await getTenantDeviceInfoList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+            entityIdOptions.value = deviceListResult.data.map(device => ({ label: device.name, value: device.id.id }))
+            break;
+        case EntityType.ASSET:
+            const assetListResult = await getTenantAssetInfoList({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+            entityIdOptions.value = assetListResult.data.map(device => ({ label: device.name, value: device.id.id }))
+            break;
+        case EntityType.ENTITY_VIEW:
+            const entityViewListResult = await getTenantEntityViewInfos({ pageSize: 50, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+            entityIdOptions.value = entityViewListResult.data.map(device => ({ label: device.name, value: device.id.id }))
+            break;
+        case EntityType.TENANT:
+            const tenantResult = await tenantById(userStore.getUserInfo.tenantId.id);
+            entityIdOptions.value = [{ label: tenantResult.title, id: tenantResult.id.id }]
+            break;
+        case EntityType.CUSTOMER:
+            const customerListResult = await customerList({ pageSize: 50, page: 0, sortProperty: 'title', sortOrder: 'ASC' });
+            entityIdOptions.value = customerListResult.data.map(device => ({ label: device.name, value: device.id.id }))
+            break;
+        case EntityType.USER:
+            const userListResult = await userList({ pageSize: 50, page: 0, sortProperty: 'email', sortOrder: 'ASC' });
+            entityIdOptions.value = userListResult.data.map(device => ({ label: device.name, value: device.id.id }))
+            break;
+        case EntityType.DASHBOARD:
+            const dashboardListResult = await currentTenantDashboardList({ pageSize: 50, page: 0, sortProperty: 'title', sortOrder: 'ASC' });
+            entityIdOptions.value = dashboardListResult.data.map(device => ({ label: device.name, value: device.id.id }))
+            break;
+        default:
+            entityIdOptions.value = [];
+    }
+}
+
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/gpsGeofencingEvents.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/gpsGeofencingEvents.vue
new file mode 100644
index 0000000..9f68ba4
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/gpsGeofencingEvents.vue
@@ -0,0 +1,181 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="纬度字段" name="latitudeKeyName" :rules="[{ required: true, message: '纬度字段名称不能为空!' }]">
+            <Input v-model:value="formState.latitudeKeyName">
+            </Input>
+        </Form.Item>
+        <Form.Item label="经度字段" name="longitudeKeyName" :rules="[{ required: true, message: '经度字段名称不能为空!' }]">
+            <Input v-model:value="formState.longitudeKeyName" />
+        </Form.Item>
+        <Form.Item label="边界类型" name="perimeterType" :rules="[{ required: true, message: '边界类型必选!' }]">
+            <Select v-model:value="formState.perimeterType">
+                <Select.Option value="POLYGON">多边形</Select.Option>
+                <Select.Option value="CIRCLE">圆形</Select.Option>
+            </Select>
+        </Form.Item>
+        <Form.Item name="fetchPerimeterInfoFromMessageMetadata">
+            <Checkbox v-model:checked="formState.fetchPerimeterInfoFromMessageMetadata"> 从元数据中获取边界信息</Checkbox>
+        </Form.Item>
+        <Form.Item label="边界信息字段" name="perimeterKeyName" :rules="[{ required: true, message: '边界信息字段不能为空!' }]"
+            help="包含边界信息的元数据字段名称。" v-if="formState.fetchPerimeterInfoFromMessageMetadata == true">
+            <Input v-model:value="formState.perimeterKeyName" />
+        </Form.Item>
+        <Form.Item label="范围边界定义" name="polygonsDefinition" :rules="[{ required: true, message: '范围边界不能为空!' }]"
+            help="使用以下格式手动定义多边形：[[lat1，lon1]，[lat2，lon2]，...，[latN，lonN]]。"
+            v-if="formState.fetchPerimeterInfoFromMessageMetadata == false && formState.perimeterType == 'POLYGON'">
+            <Input v-model:checked="formState.polygonsDefinition" />
+        </Form.Item>
+        <Row :gutter="20"
+            v-if="formState.fetchPerimeterInfoFromMessageMetadata == false && formState.perimeterType == 'CIRCLE'">
+            <Col :span="12">
+            <Form.Item label="圆心纬度" name="centerLatitude" :rules="[{ required: true, message: '圆心纬度不能为空!' }]">
+                <InputNumber v-model:value="formState.centerLatitude" :style="{ width: '100%' }" :step="0.01" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="圆心经度" name="centerLongitude" :rules="[{ required: true, message: '圆心经度不能为空!' }]">
+                <InputNumber v-model:value="formState.centerLatitude" :style="{ width: '100%' }" :step="0.01" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="范围" name="range" :rules="[{ required: true, message: '范围不能为空!' }]">
+                <InputNumber v-model:value="formState.range" :style="{ width: '100%' }" :step="0.01" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="范围单位" name="rangeUnit" :rules="[{ required: true, message: '范围单位不能为空!' }]">
+                <Select v-model:value="formState.rangeUnit" :default-value="'METER'" :options="rangeUnitOptions">
+                </Select>
+            </Form.Item>
+            </Col>
+        </Row>
+        <Row :gutter="20">
+            <Col :span="12">
+            <Form.Item label="min Inside Duration" name="minInsideDuration" :rules="[{ required: true, }]">
+                <InputNumber v-model:value="formState.minInsideDuration" :style="{ width: '100%' }" :min="1" :step="1" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="单位" name="minInsideDurationTimeUnit" :rules="[{ required: true }]">
+                <Select v-model:value="formState.minInsideDurationTimeUnit" :options="TIME_UNIT_OPTIONS">
+                </Select>
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="min Outside Duration" name="minOutsideDuration" :rules="[{ required: true, }]">
+                <InputNumber v-model:value="formState.minOutsideDuration" :style="{ width: '100%' }" :min="1" :step="1" />
+            </Form.Item>
+            </Col>
+            <Col :span="12">
+            <Form.Item label="单位" name="minOutsideDurationTimeUnit" :rules="[{ required: true }]">
+                <Select v-model:value="formState.minOutsideDurationTimeUnit" :options="TIME_UNIT_OPTIONS">
+                </Select>
+            </Form.Item>
+            </Col>
+        </Row>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "gps-geofencing-events",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, InputNumber, Select, Checkbox, Row, Col } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { TIME_UNIT_OPTIONS } from '/@/enums/telemetryEnum';
+
+interface Configuration {
+    centerLatitude: string,
+    centerLongitude: string,
+    fetchPerimeterInfoFromMessageMetadata: boolean,
+    latitudeKeyName: string,
+    longitudeKeyName: string,
+    minInsideDuration: number,
+    minInsideDurationTimeUnit: string,
+    minOutsideDuration: number,
+    minOutsideDurationTimeUnit: string,
+    perimeterKeyName: string,
+    perimeterType: 'POLYGON' | 'CIRCLE',
+    polygonsDefinition: string,
+    range: number,
+    rangeUnit: 'METER' | 'KILOMETER' | 'FOOT' | 'MILE' | 'NAUTICAL_MILE',
+    reportPresenceStatusOnEachMessage: boolean,
+}
+
+const rangeUnitOptions = [
+    { value: 'METER', label: '米' },
+    { value: 'KILOMETER', label: '千米' },
+    { value: 'FOOT', label: '英尺' },
+    { value: 'MILE', label: '英里' },
+    { value: 'NAUTICAL_MILE', label: '海里' }
+]
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+    ruleChainId: { type: String, default: '' }
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    centerLatitude: undefined,
+    centerLongitude: undefined,
+    fetchPerimeterInfoFromMessageMetadata: true,
+    latitudeKeyName: 'latitude',
+    longitudeKeyName: 'longitude',
+    perimeterKeyName: 'ss_perimeter',
+    perimeterType: 'POLYGON',
+    polygonsDefinition: undefined,
+    range: undefined,
+    rangeUnit: undefined,
+    minInsideDuration: 1,
+    minInsideDurationTimeUnit: 'MINUTES',
+    minOutsideDuration: 1,
+    minOutsideDurationTimeUnit: 'MINUTES',
+    reportPresenceStatusOnEachMessage: true,
+});
+
+
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.centerLatitude = props.configuration.centerLatitude;
+        formState.centerLongitude = props.configuration.centerLongitude;
+        formState.fetchPerimeterInfoFromMessageMetadata = props.configuration.fetchPerimeterInfoFromMessageMetadata;
+        formState.latitudeKeyName = props.configuration.latitudeKeyName;
+        formState.longitudeKeyName = props.configuration.longitudeKeyName;
+        formState.minInsideDuration = props.configuration.minInsideDuration;
+        formState.minInsideDurationTimeUnit = props.configuration.minInsideDurationTimeUnit;
+        formState.minOutsideDuration = props.configuration.minOutsideDuration;
+        formState.minOutsideDurationTimeUnit = props.configuration.minOutsideDurationTimeUnit;
+        formState.perimeterKeyName = props.configuration.perimeterKeyName;
+        formState.perimeterType = props.configuration.perimeterType;
+        formState.polygonsDefinition = props.configuration.polygonsDefinition;
+        formState.range = props.configuration.range;
+        formState.rangeUnit = props.configuration.rangeUnit;
+        formState.reportPresenceStatusOnEachMessage = props.configuration.reportPresenceStatusOnEachMessage;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 40b2c55..ee2a650 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -44,6 +44,8 @@
     "org.thingsboard.rule.engine.action.TbDeleteRelationNode":"delete-relation",
     "org.thingsboard.rule.engine.profile.TbDeviceProfileNode":"device-profile",
     "org.thingsboard.rule.engine.action.TbDeviceStateNode":"device-state",
+    "org.thingsboard.rule.engine.debug.TbMsgGeneratorNode":"generator",
+    "org.thingsboard.rule.engine.geo.TbGpsGeofencingActionNode":"gps-geofencing-events",
     "org.thingsboard.rule.engine.action.TbLogNode":"log",
     "org.thingsboard.rule.engine.math.TbMathNode":"math-function",
     "org.thingsboard.rule.engine.action.TbMsgCountNode":"message-count",
-- 
Gitee


From 3a45e3ec2146b0f990dcb2b89a2d0703d8dd6fb3 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Tue, 23 Apr 2024 15:25:35 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=20math=20func?=
 =?UTF-8?q?tion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/nodeTpl/ACTION/mathFunction.vue      | 164 +++++++++++++++++-
 1 file changed, 162 insertions(+), 2 deletions(-)

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue b/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue
index 9a24a2f..cb0ac8b 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ACTION/mathFunction.vue
@@ -1,5 +1,109 @@
 <template>
     <Form ref="formRef" :model="formState" layout="vertical">
+        <Form.Item label="函数" name="operation" :rules="[{ required: true, message: '函数类型必选!' }]">
+            <Select v-model:value="formState.operation" @change="onOperationChange">
+                <Select.Option value="CUSTOM">
+                    <p> CUSTOM | 自定义函数</p>
+                    <p class="text-sm">使用此函数可以指定复杂的数学表达式</p>
+                </Select.Option>
+                <Select.Option value="ADD">
+                    <p> ADD | 相加</p>
+                    <p class="text-sm">x + y</p>
+                </Select.Option>
+                <Select.Option value="SUB">
+                    <p> SUB | 相减</p>
+                    <p class="text-sm">x - y</p>
+                </Select.Option>
+                <Select.Option value="MULT">
+                    <p> MULT | 相乘</p>
+                    <p class="text-sm">x * y</p>
+                </Select.Option>
+                <Select.Option value="DIV">
+                    <p> DIV | 相除</p>
+                    <p class="text-sm">x / y</p>
+                </Select.Option>
+            </Select>
+        </Form.Item>
+        <div class="border  border-neutral-400 p-2 rounded mt-3">
+            <p class="text-base font-bold">参数</p>
+            <div class="p-4">
+                <Row :gutter="20" v-for="(argument, index) in formState.arguments" :key="index"
+                    class="border  border-neutral-400 p-2 mb-3 rounded">
+                    <Col :span="2">
+                    <div class="h-full place-content-center">
+                        <span class="text-base font-bold">= {{ argument.name }}</span>
+                    </div>
+                    </Col>
+                    <Col :span="20">
+                    <Row :gutter="20">
+                        <Col :span="24">
+                        <Form.Item :name="['arguments', index, 'type']" :rules="[{ required: true }]">
+                            <Select v-model:value="formState.arguments[index].type">
+                                <Select.Option value="MESSAGE_BODY"> 从 Message 获取参数</Select.Option>
+                                <Select.Option value="MESSAGE_METADATA"> 从 Message Metadata 获取参数 </Select.Option>
+                                <Select.Option value="ATTRIBUTE">从 实体的属性 获取参数</Select.Option>
+                                <Select.Option value="TIME_SERIES">从 实体的遥测数据 获取参数</Select.Option>
+                                <Select.Option value="CONSTANT">定义常量值</Select.Option>
+                            </Select>
+                        </Form.Item>
+                        </Col>
+                        <Col :span="12">
+                        <Form.Item label="值" :name="['arguments', index, 'key']" :rules="[{ required: true }]">
+                            <Input v-model:value="formState.arguments[index].key" />
+                        </Form.Item>
+                        </Col>
+                        <Col :span="12">
+                        <Form.Item label="默认值" :name="['arguments', index, 'defaultValue']">
+                            <InputNumber v-model:value="formState.arguments[index].defaultValue"
+                                :style="{ width: '100%' }" />
+                        </Form.Item>
+                        </Col>
+                    </Row>
+                    </Col>
+                    <Col :span="2">
+                    <div class="h-full place-content-center" v-show="formState.operation == 'CUSTOM'">
+                        <Tooltip title="删除" class="pl-4">
+                            <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                @click="handleDeleteArgument(index)" />
+                        </Tooltip>
+                    </div>
+
+                    </Col>
+                </Row>
+                <Button block type="primary" :disabled="formState.operation != 'CUSTOM'"
+                    @click="handleAddArguments">添加</Button>
+            </div>
+        </div>
+        <div class="border  border-neutral-400 p-2 rounded mt-3" v-if="formState.operation == 'CUSTOM'">
+            <p class="text-base font-bold">数学表达式</p>
+            <div class="p-2">
+                <Form.Item name="customFunction" help="指定要计算的数学表达式。默认表达式演示如何将华氏温度转换为摄氏温度" :rules="[{ required: true }]">
+                    <Input v-model:value="formState.customFunction" default-value="(x - 32) / 1.8" />
+                </Form.Item>
+            </div>
+        </div>
+        <div class="border  border-neutral-400 p-2 rounded mt-3">
+            <p class="text-base font-bold">结果</p>
+            <div class="p-2">
+                <Form.Item label="类型" :name="['result', 'type']" :rules="[{ required: true, }]">
+                    <Select v-model:value="formState.result.type">
+                        <Select.Option value="MESSAGE_BODY"> 结果输出到 Message </Select.Option>
+                        <Select.Option value="MESSAGE_METADATA"> 结果输出到 Message Metadata </Select.Option>
+                        <Select.Option value="ATTRIBUTE">结果存储到实体的 属性</Select.Option>
+                        <Select.Option value="TIME_SERIES">结果存储到实体的 遥测数据</Select.Option>
+                    </Select>
+                </Form.Item>
+                <Form.Item label="key" :name="['result', 'key']" :rules="[{ required: true, }]">
+                    <Input v-model:value="formState.result.key">
+                    </Input>
+                </Form.Item>
+                <Form.Item label="浮点后的位数" :name="['result', 'resultValuePrecision']" :rules="[{ required: true, }]"
+                    help="使用0将结果转换为整数">
+                    <InputNumber v-model:value="formState.result.resultValuePrecision" :min="0"
+                        :style="{ width: '100%' }" />
+                </Form.Item>
+            </div>
+        </div>
 
 
 
@@ -12,13 +116,25 @@ export default defineComponent({
 </script>
 <script lang="ts" setup >
 import { ref, watch, defineComponent, reactive } from 'vue';
-import { Form, } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Select, Input, InputNumber, Row, Col, Button, Tooltip } from 'ant-design-vue';
 import { FormInstance } from 'ant-design-vue/lib/form';
 
+interface Arguments {
+    name: string,
+    type: 'MESSAGE_BODY' | 'MESSAGE_METADATA' | 'ATTRIBUTE' | 'TIME_SERIES' | 'CONSTANT',
+    key: string,
+    defaultValue: number,
+    attributeScope: 'SHARED_SCOPE' | 'SERVER_SCOPE',
+    resultValuePrecision: number,
+
+}
+
 interface Configuration {
-    arguments: Array<any>,
+    arguments: Array<Arguments>,
     customFunction: string,
     operation: string,
+    result: Arguments,
 }
 
 
@@ -45,6 +161,7 @@ watch(
         formState.arguments = props.configuration.arguments;
         formState.customFunction = props.configuration.customFunction;
         formState.operation = props.configuration.operation;
+        formState.result = props.configuration.result;
     },
     { immediate: true }
 )
@@ -57,6 +174,49 @@ async function getConfiguration() {
     }
 }
 
+function onOperationChange(operate) {
+    if (operate == 'CUSTOM') {
+        formState.customFunction = '(x - 32) / 1.8';
+        formState.arguments = [{ name: 'x', type: 'MESSAGE_BODY', key: '', defaultValue: undefined }];
+    } else {
+        formState.customFunction = undefined;
+        formState.arguments = [
+            { name: 'x', type: 'MESSAGE_BODY', key: '', defaultValue: undefined },
+            { name: 'y', type: 'MESSAGE_BODY', key: '', defaultValue: undefined }
+        ];
+    }
+}
+
+function handleAddArguments() {
+    if (formState.arguments.length) {
+        formState.arguments.push({ name: generateName(), type: 'MESSAGE_BODY', key: '', defaultValue: undefined, });
+    } else {
+        formState.arguments = [{ name: 'x', type: 'MESSAGE_BODY', key: '', defaultValue: undefined, }]
+    }
+
+}
+function handleDeleteArgument(index: number) {
+    formState.arguments.splice(index, 1)
+}
+
+function generateName() {
+    if (!formState.arguments.length) {
+        return 'x';
+    }
+    const last = formState.arguments.length - 1;
+    const lastName = formState.arguments[last].name;
+    if (lastName == 'x') {
+        return 'y';
+    } else if (lastName == 'y') {
+        return 'z';
+    } else if (lastName == 'z') {
+        return 'a'
+    } else {
+        const asciiCode = lastName.charCodeAt(0);
+        return String.fromCharCode(asciiCode + 1);
+    }
+}
+
 defineExpose({ getConfiguration })
 
 </script>
-- 
Gitee