From f00d69d30e122781621442764985f94ef08709fe Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 23 Mar 2023 18:02:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10841=E3=80=8110838=E3=80=8110835?=
 =?UTF-8?q?=E3=80=8110834=E3=80=8110828=E3=80=8110827?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Menu/Detail/BasicInfo.vue    | 62 ++++++++++++---
 src/views/system/Menu/index.vue               |  7 +-
 .../Platforms/Api/components/ApiTest.vue      | 51 ++++++++++--
 .../Platforms/Api/components/ChooseApi.vue    |  3 +
 .../Platforms/Api/components/LeftTree.vue     | 79 +++++++++++--------
 vite.config.ts                                |  4 +-
 6 files changed, 147 insertions(+), 59 deletions(-)

diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 1b2cc56d..52111879 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -11,6 +11,7 @@
                             {
                                 required: true,
                                 message: '请上传图标',
+                                trigger: 'change',
                             },
                         ]"
                         style="flex: 0 0 186px"
@@ -45,11 +46,22 @@
                                 label="名称"
                                 name="name"
                                 :rules="[
-                                    { required: true, message: '请输入名称',trigger: 'change', },
-                                    { max: 64, message: '最多可输入64个字符', trigger: 'change', },
+                                    {
+                                        required: true,
+                                        message: '请输入名称',
+                                        trigger: 'change',
+                                    },
+                                    {
+                                        max: 64,
+                                        message: '最多可输入64个字符',
+                                        trigger: 'change',
+                                    },
                                 ]"
                             >
-                                <j-input v-model:value="form.data.name" />
+                                <j-input
+                                    v-model:value="form.data.name"
+                                    placeholder="请输入名称"
+                                />
                             </j-form-item>
                         </j-col>
                         <j-col :span="12">
@@ -57,15 +69,26 @@
                                 label="编码"
                                 name="code"
                                 :rules="[
-                                    { required: true, message: '请输入编码', trigger: 'change', },
-                                    { max: 64, message: '最多可输入64个字符', trigger: 'change', },
+                                    {
+                                        required: true,
+                                        message: '请输入编码',
+                                        trigger: 'change',
+                                    },
+                                    {
+                                        max: 64,
+                                        message: '最多可输入64个字符',
+                                        trigger: 'change',
+                                    },
                                     {
                                         validator: form.checkCode,
                                         trigger: 'blur',
                                     },
                                 ]"
                             >
-                                <j-input v-model:value="form.data.code" />
+                                <j-input
+                                    v-model:value="form.data.code"
+                                    placeholder="请输入编码"
+                                />
                             </j-form-item>
                         </j-col>
                         <j-col :span="12">
@@ -80,7 +103,10 @@
                                     { max: 128, message: '最多可输入128字符' },
                                 ]"
                             >
-                                <j-input v-model:value="form.data.url" />
+                                <j-input
+                                    v-model:value="form.data.url"
+                                    placeholder="请输入页面地址"
+                                />
                             </j-form-item>
                         </j-col>
                         <j-col :span="12">
@@ -94,7 +120,11 @@
                                     },
                                 ]"
                             >
-                                <j-input v-model:value="form.data.sortIndex" />
+                                <j-input-number
+                                    v-model:value="form.data.sortIndex"
+                                    placeholder="请输入排序"
+                                    style="width: 100%"
+                                />
                             </j-form-item>
                         </j-col>
                     </j-row>
@@ -104,6 +134,8 @@
                     <j-textarea
                         v-model:value="form.data.describe"
                         :rows="4"
+                        show-count
+                        :maxlength="200"
                         placeholder="请输入说明"
                     />
                 </j-form-item>
@@ -277,7 +309,7 @@ const form = reactive({
                     accessSupport:
                         resp.result?.accessSupport?.value || 'unsupported',
                 };
-                form.sourceCode = resp.result.code
+                form.sourceCode = resp.result.code;
             });
         // 获取关联菜单
         getMenuTree_api({ paging: false }).then((resp: any) => {
@@ -292,10 +324,11 @@ const form = reactive({
         });
     },
     checkCode: async (_rule: Rule, value: string): Promise<any> => {
-        if (!value) return Promise.reject('请输入编码');
+        if (!value) return Promise.reject('');
         else if (value.length > 64) return Promise.reject('最多可输入64个字符');
         // 编辑时不校验原本的编码
-        else if (routeParams.id && value === form.sourceCode) return Promise.resolve('');
+        else if (routeParams.id && value === form.sourceCode)
+            return Promise.resolve('');
         else {
             const resp: any = await validCode_api({
                 code: value,
@@ -372,6 +405,13 @@ type assetType = {
     label: string;
     value: string;
 };
+
+watch(
+    () => form.data.icon,
+    () => {
+        basicFormRef.value?.validate();
+    },
+);
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index c754bc3c..c7875e19 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -32,9 +32,7 @@
                 </template>
                 <template #createTime="slotProps">
                     {{
-                        moment(slotProps.createTime).format(
-                            'YYYY-MM-DD HH:mm:ss',
-                        )
+                        dayjs(slotProps.createTime).format('YYYY-MM-DD HH:mm:ss')
                     }}
                 </template>
                 <template #action="slotProps">
@@ -81,7 +79,7 @@ import PermissionButton from '@/components/PermissionButton/index.vue';
 
 import { getMenuTree_api, delMenuInfo_api } from '@/api/system/menu';
 import { message } from 'jetlinks-ui-components';
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 const permission = 'system/Menu';
 
@@ -143,6 +141,7 @@ const columns = [
             type: 'date',
         },
         width: 180,
+        scopedSlots: true,
     },
     {
         title: '操作',
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index 14afd101..e9019723 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -80,17 +80,35 @@
                         </j-table>
                     </j-form>
 
-                    <j-pagination
-                        :pageSize="requestBody.pageSize"
-                        v-model:current="requestBody.pageNum"
-                        :total="requestBody.params.paramsTable.length"
-                        hideOnSinglePage
-                        style="text-align: center"
-                    />
+                    <div
+                        class="pager"
+                        v-if="
+                            requestBody.params.paramsTable.length &&
+                            requestBody.pageSize
+                        "
+                    >
+                        <j-select
+                            v-model:value="requestBody.pageNum"
+                            style="width: 60px"
+                        >
+                            <j-select-option
+                                v-for="(val, i) in pageArr"
+                                :value="i + 1"
+                                >{{ i + 1 }}</j-select-option
+                            >
+                        </j-select>
+                        <j-pagination
+                            :pageSize="requestBody.pageSize"
+                            v-model:current="requestBody.pageNum"
+                            :total="requestBody.params.paramsTable.length"
+                            hideOnSinglePage
+                            style="text-align: center"
+                        />
+                    </div>
                     <j-button
                         type="dashed"
                         @click="requestBody.addRow"
-                        style="width: 100%; text-align: center; margin-top: 5px;"
+                        style="width: 100%; text-align: center; margin-top: 5px"
                     >
                         <AIcon type="PlusOutlined" />新增
                     </j-button>
@@ -251,6 +269,12 @@ type requestObj = {
     name: string;
     value: string;
 };
+const pageArr = computed(() => {
+    const maxPageNum = Math.ceil(
+        requestBody.params.paramsTable.length / requestBody.pageSize,
+    );
+    return new Array(maxPageNum).fill(1);
+});
 </script>
 
 <style lang="less" scoped>
@@ -311,6 +335,17 @@ type requestObj = {
                     padding: 0 8px;
                     height: 56px;
                 }
+                .pager {
+                    display: flex;
+                    justify-content: center;
+                    margin: 8px 0;
+                    .ant-pagination {
+                        margin-left: 8px;
+                        :deep(.ant-pagination-item) {
+                            display: none;
+                        }
+                    }
+                }
             }
             :deep(.ant-form-item) {
                 margin-bottom: 0;
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index e6783527..9aae81d3 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -77,6 +77,9 @@ const rowSelection = {
             });
         }
     },
+    onChange: (keys: string[]) => {
+        rowSelection.selectedRowKeys.value = keys;
+    },
     selectedRowKeys: ref<string[]>([]),
 };
 const save = async () => {
diff --git a/src/views/system/Platforms/Api/components/LeftTree.vue b/src/views/system/Platforms/Api/components/LeftTree.vue
index f05f0e66..f61750e8 100644
--- a/src/views/system/Platforms/Api/components/LeftTree.vue
+++ b/src/views/system/Platforms/Api/components/LeftTree.vue
@@ -1,15 +1,20 @@
 <template>
-    <j-tree
-        :tree-data="treeData"
-        @select="clickSelectItem"
-        v-model:selected-keys="selectedKeys"
-        showLine
-        class="left-tree-container"
-    >
-        <template #title="{ name }">
-            {{ name }}
+    <j-spin :spinning="spinning">
+        <template #indicator>
+            <AIcon type="LoadingOutlined" />
         </template>
-    </j-tree>
+        <j-tree
+            :tree-data="treeData"
+            @select="clickSelectItem"
+            v-model:selected-keys="selectedKeys"
+            showLine
+            class="left-tree-container"
+        >
+            <template #title="{ name }">
+                {{ name }}
+            </template>
+        </j-tree>
+    </j-spin>
 </template>
 
 <script setup lang="ts">
@@ -32,8 +37,10 @@ const props = defineProps<{
 
 const treeData = ref<TreeProps['treeData']>([]);
 const selectedKeys = ref<string[]>([]);
+const spinning = ref(false);
 const getTreeData = () => {
     let tree: treeNodeTpye[] = [];
+    spinning.value = true;
     getTreeOne_api().then((resp: any) => {
         tree = resp.urls.map((item: any) => ({
             ...item,
@@ -44,32 +51,36 @@ const getTreeData = () => {
         if (props.mode === 'appManger') allPromise.push(apiOperations_api());
         else if (props.mode === 'home')
             allPromise.push(getApiGranted_api(props.code as string));
-        Promise.all(allPromise).then((values) => {
-            values.forEach((item: any, i) => {
-                if (props.mode === 'api') {
-                    tree[i].schemas = item.components.schemas;
-                    tree[i].children = combData(item.paths);
-                } else if (i < values.length - 2) {
-                    const paths = filterPath(
-                        item.paths,
-                        values[values.length - 1].result as string[],
-                    );
-                    tree[i].children = combData(paths);
-                    tree[i].schemas = item.components.schemas;
-                }
-            });
-            if (props.hasHome) {
-                tree.unshift({
-                    key: 'home',
-                    name: '首页',
-                    schemas: {},
-                    children: [],
+        Promise.all(allPromise)
+            .then((values) => {
+                values.forEach((item: any, i) => {
+                    if (props.mode === 'api') {
+                        tree[i].schemas = item.components.schemas;
+                        tree[i].children = combData(item.paths);
+                    } else if (i < values.length - 2) {
+                        const paths = filterPath(
+                            item.paths,
+                            values[values.length - 1].result as string[],
+                        );
+                        tree[i].children = combData(paths);
+                        tree[i].schemas = item.components.schemas;
+                    }
                 });
-                selectedKeys.value = ['home'];
-            }
+                if (props.hasHome) {
+                    tree.unshift({
+                        key: 'home',
+                        name: '首页',
+                        schemas: {},
+                        children: [],
+                    });
+                    selectedKeys.value = ['home'];
+                }
 
-            treeData.value = tree;
-        });
+                treeData.value = tree;
+            })
+            .finally(() => {
+                spinning.value = false;
+            });
     });
 };
 const clickSelectItem: TreeProps['onSelect'] = (key: any[], node: any) => {
diff --git a/vite.config.ts b/vite.config.ts
index baf145c2..3686a5bf 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                  target: 'http://120.77.179.54:8844', // 120测试
-                //   target: 'http://192.168.33.46:8844', // 本地开发环境
+                //   target: 'http://120.77.179.54:8844', // 120测试
+                  target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')