fix: bug#10232

package-lock.json

@@ -5180,7 +5180,7 @@
     "node_modules/jetlinks-ui-components": {
       "version": "1.0.5",
       "resolved": "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz",
-      "integrity": "sha512-u1jqTyBWHB+b/NOKimucxNMYxet6g9Hi/I30T1VNWGq+x/Gf2zjz8dJoxjUcLW+9t/yjG6opWUE8Z8NWQRp3Eg==",
+      "integrity": "sha512-zrMe/4PjtWNCQtlP6kNLA7hVyQ7ftPSgivQZp8TGcpbUMOU/IYyCLQ0+VoWcqEopTSt1zEzEazodR4EjEzv7pQ==",
       "dependencies": {
         "@vueuse/core": "^9.12.0",
         "ant-design-vue": "^3.2.15",
@@ -8343,6 +8343,8 @@
     },
     "node_modules/npm/node_modules/debug/node_modules/ms": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "inBundle": true,
       "license": "MIT"
     },
@@ -9913,6 +9915,8 @@
     },
     "node_modules/npm/node_modules/request/node_modules/form-data": {
       "version": "2.3.3",
+      "resolved": "https://registry.jetlinks.cn/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -9926,6 +9930,8 @@
     },
     "node_modules/npm/node_modules/request/node_modules/tough-cookie": {
       "version": "2.5.0",
+      "resolved": "https://registry.jetlinks.cn/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "inBundle": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -10156,6 +10162,8 @@
     },
     "node_modules/npm/node_modules/string-width/node_modules/strip-ansi": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -17272,7 +17280,7 @@
     "jetlinks-ui-components": {
       "version": "1.0.5",
       "resolved": "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz",
-      "integrity": "sha512-u1jqTyBWHB+b/NOKimucxNMYxet6g9Hi/I30T1VNWGq+x/Gf2zjz8dJoxjUcLW+9t/yjG6opWUE8Z8NWQRp3Eg==",
+      "integrity": "sha512-zrMe/4PjtWNCQtlP6kNLA7hVyQ7ftPSgivQZp8TGcpbUMOU/IYyCLQ0+VoWcqEopTSt1zEzEazodR4EjEzv7pQ==",
       "requires": {
         "@vueuse/core": "^9.12.0",
         "ant-design-vue": "^3.2.15",
@@ -19672,6 +19680,8 @@
           "dependencies": {
             "ms": {
               "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
               "bundled": true
             }
           }
@@ -20833,6 +20843,8 @@
           "dependencies": {
             "form-data": {
               "version": "2.3.3",
+              "resolved": "https://registry.jetlinks.cn/form-data/-/form-data-2.3.3.tgz",
+              "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
               "bundled": true,
               "requires": {
                 "asynckit": "^0.4.0",
@@ -20842,6 +20854,8 @@
             },
             "tough-cookie": {
               "version": "2.5.0",
+              "resolved": "https://registry.jetlinks.cn/tough-cookie/-/tough-cookie-2.5.0.tgz",
+              "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
               "bundled": true,
               "requires": {
                 "psl": "^1.1.28",
@@ -20994,6 +21008,8 @@
             },
             "strip-ansi": {
               "version": "4.0.0",
+              "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
               "bundled": true,
               "requires": {
                 "ansi-regex": "^3.0.0"

src/views/notice/Config/Log/index.vue

@@ -1,21 +1,22 @@
+<!-- 通知记录 -->
 <template>
     <j-modal v-model:visible="_vis" title="通知记录" :footer="null" width="70%">
-        <pro-search
+        <pro-search type="simple" :columns="columns" @search="handleSearch" />
-            type="simple"
-            :columns="columns"
-            @search="handleSearch"
-        />
 
         <JProTable
-            ref="instanceRef"
+            ref="logRef"
+            model="table"
             :columns="columns"
             :request="(e:any) => configApi.getHistory(e, data.id)"
             :defaultParams="{
+                pageSize: 5,
                 sorts: [{ name: 'notifyTime', order: 'desc' }],
                 terms: [{ column: 'notifyType$IN', value: data.type }],
             }"
             :params="params"
-            model="table"
+            :pagination="{
+                pageSizeOptions: ['5', '10', '20', '50', '100'],
+            }"
         >
             <template #notifyTime="slotProps">
                 {{ moment(slotProps.notifyTime).format('YYYY-MM-DD HH:mm:ss') }}
@@ -127,9 +128,7 @@ const params = ref<Record<string, any>>({});
  * @param params
  */
 const handleSearch = (e: any) => {
-    // console.log('handleSearch e:', e);
     params.value = e;
-    // console.log('params.value: ', params.value);
 };
 
 /**
@@ -169,5 +168,3 @@ const handleDetail = (e: any) => {
     });
 };
 </script>
-
-<style lang="less" scoped></style>

src/views/notice/Template/Log/index.vue

@@ -1,21 +1,22 @@
+<!-- 通知记录 -->
 <template>
     <j-modal v-model:visible="_vis" title="通知记录" :footer="null" width="70%">
-        <pro-search
+        <pro-search type="simple" :columns="columns" @search="handleSearch" />
-            type="simple"
-            :columns="columns"
-            @search="handleSearch"
-        />
 
         <JProTable
-            ref="instanceRef"
+            ref="logRef"
+            model="table"
             :columns="columns"
             :request="(e:any) => templateApi.getHistory(e, data.id)"
             :defaultParams="{
+                pageSize: 5,
                 sorts: [{ name: 'notifyTime', order: 'desc' }],
                 terms: [{ column: 'notifyType$IN', value: data.type }],
             }"
             :params="params"
-            model="table"
+            :pagination="{
+                pageSizeOptions: ['5', '10', '20', '50', '100'],
+            }"
         >
             <template #notifyTime="slotProps">
                 {{ moment(slotProps.notifyTime).format('YYYY-MM-DD HH:mm:ss') }}
@@ -127,9 +128,7 @@ const params = ref<Record<string, any>>({});
  * @param params
  */
 const handleSearch = (e: any) => {
-    // console.log('handleSearch e:', e);
     params.value = e;
-    // console.log('params.value: ', params.value);
 };
 
 /**
@@ -169,5 +168,3 @@ const handleDetail = (e: any) => {
     });
 };
 </script>
-
-<style lang="less" scoped></style>

yarn.lock

@@ -3860,7 +3860,7 @@
   "version" "0.0.3"
 
 "jetlinks-ui-components@^1.0.5":
-  "integrity" "sha512-u1jqTyBWHB+b/NOKimucxNMYxet6g9Hi/I30T1VNWGq+x/Gf2zjz8dJoxjUcLW+9t/yjG6opWUE8Z8NWQRp3Eg=="
+  "integrity" "sha512-zrMe/4PjtWNCQtlP6kNLA7hVyQ7ftPSgivQZp8TGcpbUMOU/IYyCLQ0+VoWcqEopTSt1zEzEazodR4EjEzv7pQ=="
   "resolved" "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz"
   "version" "1.0.5"
   dependencies: