Merge branch 'ww' into 'main'

fix: 修改产品详情跳转设备列表查询pageSize参数不正确

See merge request yunteng/thingskit-front!510

@@ -150,7 +150,7 @@
 
       const getIsFixed = computed(() => {
         /* eslint-disable-next-line */
-        mixSideHasChildren.value = unref(childrenMenus).length > 0;interfaceDisplay
+        mixSideHasChildren.value = unref(childrenMenus).length > 0;
         const isFixed = unref(getMixSideFixed) && unref(mixSideHasChildren);
         if (isFixed) {
           /* eslint-disable-next-line */

@@ -120,7 +120,7 @@ export class VAxios {
       if (userStore && userStore.jwtToken) {
         try {
           const res = jwt_decode(userStore.jwtToken) as JwtModel;
-          const currentTime = new Date().getTime() / 1000;
+          const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
           if (currentTime >= res.exp && this.isNeedTokenURL(config.url)) {
             await this.refreshTokenBeforeReq(userStore.doRefresh);
           }

@@ -182,7 +182,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, unref, nextTick, h, onUnmounted, ref } from 'vue';
+  import { defineComponent, reactive, unref, h, onMounted } from 'vue';
   import {
     DeviceModel,
     DeviceRecord,
@@ -216,7 +216,7 @@
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Authority } from '/@/components/Authority';
-  import { useRouter } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { useBatchOperation } from '/@/utils/useBatchOperation';
 
   export default defineComponent({
@@ -243,7 +243,7 @@
       const { createMessage } = useMessage();
       const go = useGo();
       const ROUTER = useRouter();
-      const immediateStatus = ref(false);
+      const ROUTE = useRoute();
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
@@ -259,9 +259,7 @@
           reload,
           setLoading,
           setSelectedRowKeys,
-          setTableData,
           getForm,
-          setPagination,
           getSelectRowKeys,
           getSelectRows,
           getRowSelection,
@@ -269,17 +267,13 @@
       ] = useTable({
         title: '设备列表',
         api: devicePage,
-        immediate: immediateStatus.value,
         columns,
         beforeFetch: (params) => {
           const { deviceProfileId } = params;
           const obj = {
             ...params,
             ...{
-              deviceProfileIds:
-                deviceProfileId === undefined || deviceProfileId === null || deviceProfileId == ''
-                  ? null
-                  : [deviceProfileId],
+              deviceProfileIds: deviceProfileId ? [deviceProfileId] : null,
             },
           };
           delete obj.deviceProfileId;
@@ -313,54 +307,6 @@
 
       const { isExistOption } = useBatchOperation(getRowSelection, setSelectedRowKeys);
 
-      function getParams(keyword) {
-        const reg = new RegExp('(^|&)' + keyword + '=([^&]*)(&|$)', 'i');
-        const r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]);
-        return null; //注意此处参数是中文，解码使用的方法是unescape ，那么在传值的时候如果是中文，需要使用escape('曲浩')方法来编码。
-      }
-
-      const count = ref(0);
-      const onCloseVal = ref(0);
-      const deviceProfileId = ref('');
-      count.value = Number(getParams('count'));
-      deviceProfileId.value = getParams('deviceProfileId') || '';
-      const setRowClassName = async () => {
-        if (deviceProfileId.value !== undefined) {
-          const { items, total } = await devicePage({
-            page: 1,
-            pageSize: count.value === 0 ? 10 : count.value,
-            deviceProfileIds:
-              deviceProfileId.value === undefined ||
-              deviceProfileId.value === null ||
-              deviceProfileId.value == ''
-                ? null
-                : [deviceProfileId.value],
-          });
-          setPagination({ total });
-          nextTick(() => {
-            setTableData(items);
-            const { setFieldsValue, resetFields } = getForm();
-            setFieldsValue({
-              deviceProfileId: deviceProfileId.value || null,
-            });
-            if (onCloseVal.value == 1) {
-              resetFields();
-            }
-          });
-        } else {
-          setTimeout(() => {
-            reload();
-          }, 80);
-        }
-      };
-      setRowClassName();
-      onUnmounted(() => {
-        deviceProfileId.value = '';
-        count.value = 10;
-        onCloseVal.value = 1;
-      });
-
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const role: string = userInfo.roles[0];
 
@@ -494,6 +440,11 @@
         reload();
       };
 
+      onMounted(() => {
+        const queryParams = ROUTE.query as Record<'deviceProfileId', undefined | string>;
+        const { setFieldsValue } = getForm();
+        setFieldsValue({ deviceProfileId: queryParams.deviceProfileId });
+      });
       return {
         registerTable,
         handleCreate,

@@ -66,6 +66,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
     build: {
       target: 'es2015',
       outDir: OUTPUT_DIR,
+      // minify: 'terser', // The minify mode is set to use terser to remove console
       terserOptions: {
         compress: {
           keep_infinity: true,