Merge branch 'ww' into 'main'

fix: rule data flow carry params incorrect

See merge request huang/yun-teng-iot-front!474

@@ -5,6 +5,8 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
+    <meta name="keywords" content="Thingskit 物联网平台" />
+    <meta name="description" content="Thingskit 物联网平台" />
     <meta http-equiv="Expires" content="0" />
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />

@@ -168,6 +168,7 @@ export interface DeviceRecord {
   provisionType: string;
   deviceType: string;
   deviceCount: number;
+  tbDeviceId: string;
   tbProfileId: string;
   profileData: ProfileData;
   defaultQueueName: string;

@@ -307,6 +307,7 @@
     if (keys === Active.PENDING) {
       reloadPending();
     } else {
+      reloadSelected();
       setProps({
         dataSource: unref(selectedRows),
       });
@@ -319,6 +320,8 @@
       if (props.value && !props.value.length) {
         selectedRowKeys.value = [];
         selectedRows.value = [];
+        pendingTotal.value = 0;
+        selectedTotal.value = 0;
       }
     }
   );

+<script lang="ts" setup>
+  import { h } from 'vue';
+  import { Description, useDescription } from '/@/components/Description';
+  import { BasicModal, useModal } from '/@/components/Modal';
+
+  const [register] = useModal();
+
+  const [registerDes] = useDescription({
+    bordered: false,
+    column: 1,
+    labelStyle: {
+      width: '100px',
+      textAlign: 'right',
+      justifyContent: 'right',
+      paddingRight: '20px',
+    },
+    data: {
+      copyright:
+        'ThingsKit物联网平台版权归成都云腾五洲科技有限公司所有,您可以任意商用,但请注意保留本版权声明',
+      website: 'https://thingskit.com',
+      authorization: '若不想保留本版权声明,请前往以下链接查看移出方法,',
+    },
+    schema: [
+      {
+        field: 'copyright',
+        label: '版权声明',
+      },
+      {
+        field: 'website',
+        label: '官网',
+        render: (val: string) => {
+          return h(
+            'span',
+            { class: 'text-blue-500 cursor-pointer', onClick: () => open(val) },
+            val
+          );
+        },
+      },
+      {
+        field: 'authorization',
+        label: '商业授权',
+        render: (val: string) => {
+          console.log(val);
+          // https://community.thingskit.com/question/20.html
+          return h('div', {}, [
+            h('span', val),
+            h(
+              'span',
+              {
+                class: 'text-blue-500 cursor-pointer',
+                onClick: () => open('https://community.thingskit.com/question/20.html'),
+              },
+              '点击前往'
+            ),
+          ]);
+        },
+      },
+    ],
+  });
+</script>
+
+<template>
+  <BasicModal
+    @register="register"
+    title="关于我们"
+    width="50%"
+    cancel-text="关闭"
+    :show-ok-btn="false"
+  >
+    <Description @register="registerDes" />
+  </BasicModal>
+</template>

+<script lang="ts" setup>
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+  import { Tooltip } from 'ant-design-vue';
+
+  const handleJump = () => {
+    open('https://docs.thingskit.com');
+  };
+</script>
+
+<template>
+  <Tooltip title="帮助文档">
+    <QuestionCircleOutlined class="text-base cursor-pointer" @click="handleJump" />
+  </Tooltip>
+</template>

@@ -37,6 +37,7 @@
           :text="t('layout.header.dropdownItemChangePassword')"
           icon="ant-design:unlock-twotone"
         />
+        <MenuItem key="aboutSoftware" text="关于软件" icon="ant-design:message-outline" />
         <MenuItem
           v-if="getUseLockPage"
           key="lock"
@@ -57,6 +58,7 @@
     ref="personalRef"
     @register="registerPersonal"
   />
+  <AboutSoftwareModal @register="registerModal" />
 </template>
 <script lang="ts">
   // components
@@ -74,8 +76,9 @@
   import { getAuthCache } from '/@/utils/auth';
   import { useRouter } from 'vue-router';
   import { usePermission } from '/@/hooks/web/usePermission';
+  import AboutSoftwareModal from '../AboutSoftwareModal.vue';
 
-  type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal' | 'changePassword';
+  type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal' | 'changePassword' | 'aboutSoftware';
 
   export default defineComponent({
     name: 'UserDropdown',
@@ -85,6 +88,7 @@
       MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
       LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
       PersonalChild: createAsyncComponent(() => import('../personal/index.vue')),
+      AboutSoftwareModal,
     },
     props: {
       theme: propTypes.oneOf(['dark', 'light']),
@@ -120,6 +124,11 @@
         openModal(true);
       }
 
+      const [registerModal, { openModal: openAboutSoftwareModal }] = useModal();
+      function handleOpenAboutSoftwareModal() {
+        openAboutSoftwareModal();
+      }
+
       //  login out
       function handleLoginOut() {
         userStore.confirmLoginOut();
@@ -138,6 +147,8 @@
           case 'changePassword':
             changePassword();
             break;
+          case 'aboutSoftware':
+            handleOpenAboutSoftwareModal();
         }
       }
 
@@ -180,6 +191,7 @@
         register,
         getUseLockPage,
         hasPermission,
+        registerModal,
       };
     },
   });

@@ -39,6 +39,8 @@
 
       <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
 
+      <HelpDoc />
+
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
 
       <AppLocalePicker
@@ -75,6 +77,7 @@
 
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   import { useLocale } from '/@/locales/useLocale';
+  import HelpDoc from './components/HelpDoc.vue';
 
   export default defineComponent({
     name: 'LayoutHeader',
@@ -92,6 +95,7 @@
       SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
         loading: true,
       }),
+      HelpDoc,
     },
     props: {
       fixed: propTypes.bool,

@@ -196,26 +196,25 @@
       const dataSource = ref([]);
       const go = useGo();
       const helpDoc = ref([
-        {
-          title: '如何接入设备?',
-          href: 'https://docs.thingskit.com/thingskit-link/operation-guide/device-manage.html#%E8%AE%BE%E5%A4%87%E5%88%97%E8%A1%A8',
-          target: '_blank ',
-        },
-        {
-          title: '什么是产品?',
-          href: 'https://docs.thingskit.com/thingskit-link/operation-guide/device-manage.html#%E8%AE%BE%E5%A4%87%E9%85%8D%E7%BD%AE',
-          target: '_blank ',
-        },
-        {
-          title: '云组态模板如何使用?',
-          href: 'https://docs.thingskit.com/',
-          target: '_blank ',
-        },
-        {
-          title: '查看全部>>',
-          href: 'https://docs.thingskit.com/',
-          target: '_blank ',
-        },
+        //   title: '如何接入设备?',
+        //   href: 'https://docs.thingskit.com/thingskit-link/operation-guide/device-manage.html#%E8%AE%BE%E5%A4%87%E5%88%97%E8%A1%A8',
+        //   target: '_blank ',
+        // },
+        // {
+        //   title: '什么是产品?',
+        //   href: 'https://docs.thingskit.com/thingskit-link/operation-guide/device-manage.html#%E8%AE%BE%E5%A4%87%E9%85%8D%E7%BD%AE',
+        //   target: '_blank ',
+        // },
+        // {
+        //   title: '云组态模板如何使用?',
+        //   href: 'https://docs.thingskit.com/',
+        //   target: '_blank ',
+        // },
+        // {
+        //   title: '查看全部>>',
+        //   href: 'https://docs.thingskit.com/',
+        //   target: '_blank ',
+        // },
       ]);
       const activeKey = ref('tab1');
       const tabListTitle = [

 <template>
   <div class="p-4 md:flex">
-    <div class="md:w-7/10 w-full !mr-4 enter-y">
+    <div
+      class="md:w-7/10 w-full !mr-4 enter-y"
+      :class="role !== RoleEnum.SYS_ADMIN && '!md:w-full !mr-0'"
+    >
       <GrowCard :loading="loading" class="enter-y" :role="role" />
       <SiteAnalysisMessage class="!my-4 enter-y" :loading="loading" :role="role" />
       <SiteAnalysis class="!my-4 enter-y" :loading="loading" :role="role" />
@@ -10,7 +13,7 @@
         </Card>
       </div>
     </div>
-    <div class="md:w-3/10 w-full enter-y">
+    <div v-if="role === RoleEnum.SYS_ADMIN" class="md:w-3/10 w-full enter-y">
       <Card
         :style="{ width: '100%', height: !isAdmin(role) ? '100%' : '98.4%' }"
         :title="!isAdmin(role) ? '帮助文档' : ''"
@@ -29,7 +32,7 @@
   import HelpDoc from './components/HelpDoc.vue';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
-  import { isAdmin } from '/@/enums/roleEnum';
+  import { isAdmin, RoleEnum } from '/@/enums/roleEnum';
 
   defineExpose({
     isAdmin,
@@ -39,6 +42,8 @@
 
   const role: string = userInfo?.roles[0];
 
+  console.log({ role });
+
   const loading = ref(true);
 
   setTimeout(() => {

@@ -278,6 +278,7 @@
             if (isApiHeaders && Object.values(isApiHeaders).includes('')) {
               return createMessage.error('请填写属性');
             }
+            Object.assign(allPostForm, { clientProperties: {} });
             const res = await postAddConvertApi(allPostForm);
             if (res) {
               closeModalAfterSuccess && closeModal();
@@ -303,6 +304,7 @@
               }
             }
             Object.assign(noEditObj, getTypeObj, {
+              clientProperties: {},
               datasourceType: allPostForm.datasourceType,
               datasourceContent: allPostForm.datasourceContent,
             });

@@ -64,9 +64,9 @@ const handleGroupDevice = (options: DeviceRecord[]) => {
   options.forEach((item) => {
     if (map.has(item.profileId)) {
       const deviceList = map.get(item.profileId)!;
-      deviceList.push(item.id);
+      deviceList.push(item.tbDeviceId);
     } else {
-      map.set(item.profileId, [item.id]);
+      map.set(item.profileId, [item.tbDeviceId]);
     }
   });
   const value = Array.from(map.entries()).map(([product, devices]) => ({ product, devices }));
@@ -230,7 +230,8 @@ export const modeForm = (submitFn?: Function): FormSchema[] => {
 
         return {
           labelField: 'name',
-          valueField: 'id',
+          valueField: 'tbDeviceId',
+          primaryKey: 'tbDeviceId',
           pendingTableProps: {
             ...TransferTableProps,
             api: devicePage,
@@ -261,12 +262,14 @@ export const modeForm = (submitFn?: Function): FormSchema[] => {
           initSelectedOptions: async ({ setSelectedTotal }) => {
             const values = getFieldsValue();
             const convertConfigId = Reflect.get(values, BasicInfoFormField.CONVERT_CONFIG_ID);
+            const deviceProfileIds = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_PRODUCT);
             const devices = Reflect.get(values, BasicInfoFormField.DATA_SOURCE_DEVICE);
             if (convertConfigId && devices) {
               const { items, total } = await devicePage({
                 page: 1,
                 pageSize: 10,
                 convertConfigId: values[BasicInfoFormField.CONVERT_CONFIG_ID],
+                deviceProfileIds,
                 selected: true,
               });
               setSelectedTotal(total);

@@ -69,10 +69,11 @@
           ...record,
           [BasicInfoFormField.DATA_SOURCE_PRODUCT]:
             record?.datasourceContent?.convertProducts || [],
-          [BasicInfoFormField.DATA_SOURCE_DEVICE]:
-            (record?.datasourceContent?.convertDevices || []).reduce((prev, next) => {
-              return [...prev, ...(next?.devices || [])];
-            }, []) || [],
+          [BasicInfoFormField.DATA_SOURCE_DEVICE]: record?.datasourceContent?.convertDevices,
+          // [BasicInfoFormField.DATA_SOURCE_DEVICE]:
+          //   (record?.datasourceContent?.convertDevices || []).reduce((prev, next) => {
+          //     return [...prev, ...(next?.devices || [])];
+          //   }, []) || [],
         };
         setFieldsValue(value);
       };

@@ -132,13 +132,13 @@
   const provideOrgid = ref('');
 
   const { createMessage } = useMessage();
-  const triggerData = ref([]);
-  const conditionData = ref([]);
-  const actionData = ref([]);
+  const triggerData = ref<number[]>([]);
+  const conditionData = ref<number[]>([]);
+  const actionData = ref<number[]>([]);
   const skipUnwrap = {
-    triggerItemRefs: ref([]),
-    conditionItemRefs: ref([]),
-    actionItemRefs: ref([]),
+    triggerItemRefs: ref<InstanceType<typeof TriggerOrCondition>[]>([]),
+    conditionItemRefs: ref<InstanceType<typeof TriggerOrCondition>[]>([]),
+    actionItemRefs: ref<InstanceType<typeof Action>[]>([]),
   };
   const title = computed(
     () => `${isUpdate.value === 3 ? '查看' : isUpdate.value ? '编辑' : '新增'}场景联动`
@@ -387,6 +387,7 @@
       doActions.forEach((action, index) => {
         nextTick(() => {
           const selectProductId = ref('');
+          console.log('doActions', unref(skipUnwrap.actionItemRefs));
           // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
             ...action,

@@ -536,6 +536,7 @@ export const actionSchema: FormSchema[] = [
         params: {
           dictCode: 'custom_define',
         },
+        numberToString: true,
         getPopupContainer: () => document.body,
         onChange: () => {
           setFieldsValue({ doContext: null, thingsModelId: null });

@@ -81,6 +81,7 @@
 
 <script lang="ts">
   import { defineComponent } from 'vue';
+  import { isNumber } from '/@/utils/is';
   export default defineComponent({
     components: {
       VNodes: (_, { attrs }) => {
@@ -261,9 +262,13 @@
   };
 
   const setFieldsFormValueFun = (fieldsValue) => {
+    console.log(getFieldsValue());
+
     setFieldsValue({
       ...fieldsValue,
-      ...(fieldsValue.commandType ? { commandType: String(fieldsValue.commandType) } : {}),
+      ...(isNumber(fieldsValue.commandType)
+        ? { commandType: String(fieldsValue.commandType) }
+        : {}),
     });
   };
   //ft-add

@@ -80,6 +80,7 @@
   // import { useUserStore } from '/@/store/modules/user';
   import { getPlatForm } from '/@/api/oem/index';
   import defaultShowLogoImg from '/@/assets/svg/login-bg.svg';
+  import { useTitle } from '@vueuse/core';
 
   defineProps({
     sessionTimeout: {
@@ -136,6 +137,10 @@
   const localeStore = useLocaleStore();
   const showLocale = localeStore.getShowPicker;
   // const title = computed(() => globSetting?.title ?? '');
+
+  onMounted(() => {
+    useTitle('ThingsKit 物联网平台');
+  });
 </script>
 <style lang="less">
   @prefix-cls: ~'@{namespace}-login';
@@ -195,7 +200,7 @@
       width: 100%;
       height: 100%;
       margin-left: -48%;
-      background-image: v-bind(logoUrl);
+      background-image: v-bind(logourl);
       // background-image: url(/@/assets/svg/login-bg.svg);
       background-position: 100%;
       background-repeat: no-repeat;