配置环境变量，添加配置同步按钮

README.en-US.md

@@ -1,181 +0,0 @@
-<h1>vue-pure-admin</h1>
-
-![GitHub license](https://img.shields.io/github/license/pure-admin/vue-pure-admin?style=flat)
-![GitHub stars](https://img.shields.io/github/stars/pure-admin/vue-pure-admin?color=fa6470&style=flat)
-![GitHub forks](https://img.shields.io/github/forks/pure-admin/vue-pure-admin?style=flat)
-
-**English** | [中文](./README.md)
-
-## Introduction
-
-`vue-pure-admin` is an open source free and out-of-the-box middle and background management system template. Developed using the latest mainstream technologies such as `Vue3`, `Vite`, `Element-Plus`, `TypeScript`, `Pinia`, `Tailwindcss`
-
-## Thin version (offering non-internationalized and internationalized versions)
-
-The simplified version is based on the shelf extracted from [vue-pure-admin](https://github.com/pure-admin/vue-pure-admin), which contains main functions and is more suitable for actual project development. The packaged size is introduced globally [element-plus](https://element-plus.org) is still below `2.3MB`, and the full version of the code will be permanently synchronized. After enabling `brotli` compression and `cdn` to replace the local library mode, the package size is less than `350kb`
-
-- [Click me to view the non-internationalized version](https://github.com/pure-admin/pure-admin-thin)
-- [Click me to view Internationalization version](https://github.com/pure-admin/pure-admin-thin/tree/i18n)
-
-## Supporting Video
-
-- [Click Watch Tutorial](https://www.bilibili.com/video/BV1kg411v7QT)
-- [Click Watch UI Design](https://www.bilibili.com/video/BV17g411T7rq)
-
-## Docs (support `PWA` fast, offline access)
-
-- [Click me to view the domestic documentation site](https://yiming_chang.gitee.io/pure-admin-doc)
-- [Click me to view foreign document site](https://pure-admin.github.io/pure-admin-doc)
-
-## Tauri
-
-- [Click Watch Tauri](https://github.com/pure-admin/tauri-pure-admin)
-
-## Electron
-
-- [Click Watch Electron](https://github.com/pure-admin/electron-pure-admin)
-
-## Preview
-
-- [Click me to view the domestic preview station](https://yiming_chang.gitee.io/vue-pure-admin)
-- [Click me to view foreign preview site](https://pure-admin.github.io/vue-pure-admin)
-
-- PC
-<p align="center">
-  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d45c15ccbe674fe291a4faa528d11eda~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
-</p>
-
-- DarkMode
-<p align="center">
-  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/10a351f0d9c94b90ba3b408a786b9ede~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
-</p>
-
-- Mobile
-<p align="center">
-  <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/3061c7b92f6d4cb4bcdf227d966ac696~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
-</p>
-
-### Use Gitpod
-
-Open the project in Gitpod (free online dev environment for GitHub) and start coding immediately.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/pure-admin/vue-pure-admin)
-
-## Install and use
-
-- Get the project code
-
-```bash
-git clone https://github.com/pure-admin/vue-pure-admin.git
-or
-git clone https://gitee.com/yiming_chang/vue-pure-admin.git
-```
-
-- Installation dependencies
-
-```bash
-cd vue-pure-admin
-
-pnpm install
-
-```
-
-- run
-
-```bash
-pnpm serve
-```
-
-- build
-
-```bash
-pnpm build
-```
-
-## Change Log
-
-[CHANGELOG](./CHANGELOG.en_US.md)
-
-## How to contribute
-
-You are very welcome to join！[Raise an issue](https://github.com/pure-admin/vue-pure-admin/issues/new/choose) Or submit a Pull Request
-
-**Pull Request:**
-
-1. Fork code!
-2. Create your own branch: `git checkout -b feat/xxxx`
-3. Submit your changes: `git commit -am 'feat(function): add xxxxx'`
-4. Push your branch: `git push origin feat/xxxx`
-5. submit`pull request`
-
-## Git Contribution submission specification
-
-- reference [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) specification ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular))
-
-  - `feat` Add new features
-  - `fix` Fix the problem/BUG
-  - `style` The code style is related and does not affect the running result
-  - `perf` Optimization/performance improvement
-  - `refactor` Refactor
-  - `revert` Undo edit
-  - `test` Test related
-  - `docs` Documentation/notes
-  - `chore` Dependency update/scaffolding configuration modification etc.
-  - `workflow` Workflow improvements
-  - `ci` Continuous integration
-  - `types` Type definition file changes
-  - `wip` In development
-
-## Browser support
-
-The `Chrome 80+` browser is recommended for local development
-
-Support modern browsers, not IE
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-|                                                                                             not support                                                                                              |                                                                                            last 2 versions                                                                                             |                                                                                                  last 2 versions                                                                                                  |                                                                                                last 2 versions                                                                                                |                                                                                                last 2 versions                                                                                                |
-
-## Maintainer
-
-[xiaoxian521](https://github.com/xiaoxian521)、[Ten-K](https://github.com/Ten-K)
-
-## Donate
-
-If you think this project is helpful to you, you can help the author buy a glass of juice 🍹 Show your support
-
-<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f69bf13c5b854ed5b699807cafa0e3ce~tplv-k3u1fbpfcp-zoom-in-crop-mark:1304:0:0:0.awebp?" width="150px" height="150px" />
-
-## License
-
-In principle, no fees and copyrights are charged, and you can use it with confidence, but if you need secondary open source, please contact the author for permission!
-
-[MIT © xiaoxian521-2023](./LICENSE)
-
-## Backers
-
-Thank you very much for your support, I believe the project will get better and better :heart:
-
-|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |                                                                BenLakes                                                                 |
-| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: |
-| <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/BenLakes"><img src="https://avatars.githubusercontent.com/u/15206046?v=4" width="60px" height="60px" /></a> |
-|                                                                mollerzhu                                                                 |                                                                  TLovers                                                                  |                                                                  cnyyk                                                                  |                                                                                                                                           |                                                                                                                                       |                                                                                                                                         |
-| <a href="https://github.com/mollerzhu"><img src="https://avatars.githubusercontent.com/u/49627902?v=4" width="60px" height="60px" /></a> |  <a href="https://github.com/TLovers"><img src="https://avatars.githubusercontent.com/u/26561694?v=4" width="60px" height="60px" /></a>   |   <a href="https://github.com/cnyyk"><img src="https://avatars.githubusercontent.com/u/275233?v=4" width="60px" height="60px" /></a>    |                                                                                                                                           |                                                                                                                                       |                                                                                                                                         |
-
-## Contributors
-
-Thanks to all the people who contribute :heart:
-
-<a href="https://github.com/pure-admin/vue-pure-admin/graphs/contributors"><img src="https://contrib.rocks/image?repo=pure-admin/vue-pure-admin" /></a>
-
-## `Star`
-
-Many thanks to the kind individuals who leave a star. Your support is much appreciated :heart:
-
-[![Stargazers for vue-pure-admin](https://reporoster.com/stars/pure-admin/vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/stargazers)
-
-## `Fork`
-
-It's so cool that you study hard :heart:
-
-[![Forkers repo roster for vue-pure-admin](https://reporoster.com/forks/pure-admin/vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/network/members)

src/api/user.ts

@@ -2,14 +2,14 @@
  * @Author: Gui
  * @Date: 2023-03-01 19:20:44
  * @LastEditors: guicheng 1625811865@qq.com
- * @LastEditTime: 2025-01-17 17:57:38
+ * @LastEditTime: 2025-02-07 10:53:30
  * @Description: kxs files
  * @filePath:
  */
 import { http } from "@/utils/http";
-import { baseUrlApi } from "./utils";
 import encryptByDES from "@/utils/encryptByDES";
 import { getGroupUrl } from "@/utils/getUrl/getUrl.js";
+import { environment } from "@/api/utils.ts";
 const UrlList = await getGroupUrl();
 
 export type UserResult = {
@@ -50,8 +50,9 @@ export type RefreshTokenResult = {
 export const getLogin = (data?: object) => {
   console.log(data);
   return http.login(
-    // "https://app-manager.kexiaoshuang.com/v1/kxs/sysServer/oauth2/token",
-    "http://test-app-manager.kexiaoshuang.com/v1/kxs/sysServer/oauth2/token",
+    environment == "production"
+      ? "https://app-manager.kexiaoshuang.com/v1/kxs/sysServer/oauth2/token"
+      : "http://test-app-manager.kexiaoshuang.com/v1/kxs/sysServer/oauth2/token",
     data
   );
 };

src/api/utils.ts

@@ -1,10 +1,10 @@
 /*
  * @Author: Gui
  * @Date: 2023-03-08 11:24:34
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-03 14:24:41
+ * @LastEditors: guicheng 1625811865@qq.com
+ * @LastEditTime: 2025-02-07 16:18:12
  * @Description: kxs files
  * @filePath:
  */
-export const baseUrlApi = (url: string) =>
-  `http://test.mpadminap.kexiaoshuang.com${url}`;
+// export const environment = "development";
+export const environment = "production";

src/components/ReIcon/src/Select.vue

@@ -2,6 +2,7 @@
 import { cloneDeep } from "@pureadmin/utils";
 import { IconJson } from "@/components/ReIcon/data";
 import { ref, computed, CSSProperties, toRef, watch } from "vue";
+import { ClickOutside as vClickOutside } from "element-plus";
 type ParameterCSSProperties = (item?: string) => CSSProperties | undefined;
 
 defineOptions({
@@ -16,7 +17,7 @@ const props = defineProps({
 });
 const emit = defineEmits<{ (e: "update:modelValue", v: string) }>();
 
-const visible = ref(false);
+const popoverRef = ref();
 const inputValue = toRef(props, "modelValue");
 const iconList = ref(IconJson);
 const icon = ref("add-location");
@@ -84,7 +85,7 @@ function handleClick({ props }) {
 function onChangeIcon(item) {
   icon.value = item;
   emit("update:modelValue", currentActiveType.value + item);
-  visible.value = false;
+  popoverRef.value.hide();
 }
 
 function onCurrentChange(page) {
@@ -101,6 +102,9 @@ watch(
         0,
         props.modelValue.indexOf(":") + 1
       );
+      currentActiveType.value = currentActiveType.value
+        ? currentActiveType.value
+        : "ep:";
       icon.value = props.modelValue.substring(
         props.modelValue.indexOf(":") + 1
       );
@@ -121,50 +125,25 @@ watch(
   <div class="selector w-[350px]">
     <el-input v-model="inputValue" disabled>
       <template #append>
-        <el-popover
-          :width="350"
-          trigger="click"
-          popper-class="pure-popper"
-          :popper-options="{
-            placement: 'auto'
-          }"
-          :visible="visible"
-        >
+        <el-popover ref="popoverRef" :width="350" trigger="click" popper-class="pure-popper"
+          :popper-options="{ placement: 'auto' }">
           <template #reference>
-            <div
-              class="w-[40px] h-[32px] cursor-pointer flex justify-center items-center"
-              @click="visible = !visible"
-            >
+            <div class="w-[40px] h-[32px] cursor-pointer flex justify-center items-center">
               <IconifyIconOnline :icon="currentActiveType + icon" />
             </div>
           </template>
 
-          <el-input
-            class="p-2"
-            v-model="filterValue"
-            placeholder="搜索图标"
-            clearable
-          />
+          <el-input class="p-2" v-model="filterValue" placeholder="搜索图标" clearable />
           <el-divider border-style="dashed" />
 
           <el-tabs v-model="currentActiveType" @tab-click="handleClick">
-            <el-tab-pane
-              v-for="(pane, index) in tabsList"
-              :key="index"
-              :label="pane.label"
-              :name="pane.name"
-            >
+            <el-tab-pane v-for="(pane, index) in tabsList" :key="index" :label="pane.label" :name="pane.name">
               <el-divider class="tab-divider" border-style="dashed" />
               <el-scrollbar height="220px">
                 <ul class="flex flex-wrap px-2 ml-2">
-                  <li
-                    v-for="(item, key) in pageList"
-                    :key="key"
-                    :title="item"
+                  <li v-for="(item, key) in pageList" :key="key" :title="item"
                     class="icon-item p-2 w-[1/10] cursor-pointer mr-2 mt-1 flex justify-center items-center border border-solid"
-                    :style="iconItemStyle(item)"
-                    @click="onChangeIcon(item)"
-                  >
+                    :style="iconItemStyle(item)" @click="onChangeIcon(item)">
                     <IconifyIconOnline :icon="currentActiveType + item" />
                   </li>
                 </ul>
@@ -173,16 +152,9 @@ watch(
           </el-tabs>
           <el-divider border-style="dashed" />
 
-          <el-pagination
-            small
-            :total="copyIconList[currentActiveType].length"
-            :page-size="pageSize"
-            :current-page="currentPage"
-            background
-            layout="prev, pager, next"
-            class="flex items-center justify-center h-10"
-            @current-change="onCurrentChange"
-          />
+          <el-pagination small :total="copyIconList[currentActiveType].length" :page-size="pageSize"
+            :current-page="currentPage" background layout="prev, pager, next"
+            class="flex items-center justify-center h-10" @current-change="onCurrentChange" />
         </el-popover>
       </template>
     </el-input>

src/router/modules/template.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: Gui
  * @Date: 2023-04-06 14:34:38
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-08 16:07:47
+ * @LastEditors: guicheng 1625811865@qq.com
+ * @LastEditTime: 2025-02-07 14:25:39
  * @Description: kxs files
  * @filePath:
  */
@@ -13,9 +13,8 @@ export default {
   meta: {
     icon: "setting",
     showLink: true,
-    title: '基础组件',
+    title: "基础组件",
     rank: 499
   },
-  children: [
-  ]
+  children: []
 } as RouteConfigsTable;

src/utils/getUrl/getUrl.js

@@ -2,13 +2,14 @@
  * @Author:
  * @Date: 2024-01-04 15:04:20
  * @LastEditors: guicheng 1625811865@qq.com
- * @LastEditTime: 2025-01-17 17:57:27
+ * @LastEditTime: 2025-02-07 14:12:05
  * @Description: kxs files
  * @filePath:
  */
 import axios from "axios";
 import PublicLib from "./PublicLib";
 import CryptoJS from "crypto-js";
+import { environment } from "@/api/utils.ts";
 const request = axios.create({
   // 请求超时时间
   timeout: 5000
@@ -47,7 +48,14 @@ const putURL = list => {
     Key: "URL_INTERFACE",
     Value: list,
     Type: 3,
-    Conf: { dbname: "PROJECT_INTERFACE", version: 1, table: "INTERFACE_List" }
+    Conf: {
+      dbname:
+        environment == "production"
+          ? "APP_MANAGER_PROJECT_INTERFACE"
+          : "TEST_APP_MANAGER_PROJECT_INTERFACE",
+      version: 1,
+      table: "INTERFACE_LIST"
+    }
   });
 };
 
@@ -56,7 +64,14 @@ const getURL = () => {
   return PublicLib.getCookieInfo({
     Key: "URL_INTERFACE",
     Type: 3,
-    Conf: { dbname: "PROJECT_INTERFACE", version: 1, table: "INTERFACE_List" }
+    Conf: {
+      dbname:
+        environment == "production"
+          ? "APP_MANAGER_PROJECT_INTERFACE"
+          : "TEST_APP_MANAGER_PROJECT_INTERFACE",
+      version: 1,
+      table: "INTERFACE_LIST"
+    }
   });
 };
 
@@ -64,8 +79,9 @@ const getURL = () => {
 const getAllPlate = () => {
   return new Promise(async (resolve, reject) => {
     postRequest(
-      "http://test-app-manager.kexiaoshuang.com/noauth/apiinfo/groupsforadmin",
-      // "https://app-manager.kexiaoshuang.com/noauth/apiinfo/groupsforadmin",
+      environment == "production"
+        ? "https://app-manager.kexiaoshuang.com/noauth/apiinfo/groupsforadmin"
+        : "http://test-app-manager.kexiaoshuang.com/noauth/apiinfo/groupsforadmin",
       {
         key: "kxs#2024"
       }
@@ -100,8 +116,9 @@ const getGroupUrl = async (checkPlate = []) => {
       );
     }, 5000);
     postRequest(
-      "http://test-app-manager.kexiaoshuang.com/noauth/apiinfo/listforadmin",
-      // "https://app-manager.kexiaoshuang.com/noauth/apiinfo/listforadmin",
+      environment == "production"
+        ? "https://app-manager.kexiaoshuang.com/noauth/apiinfo/listforadmin"
+        : "http://test-app-manager.kexiaoshuang.com/noauth/apiinfo/listforadmin",
       parameters
     )
       .then(async res => {

src/views/admin/menu/hook.tsx

@@ -4,6 +4,7 @@ import {
   postMenuList,
   putMenuList
 } from "@/api/system";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { type PaginationProps } from "@pureadmin/table";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { reactive, ref, computed, onMounted } from "vue";
@@ -20,20 +21,25 @@ export function useUser() {
     path: "", //路由路径
     parentId: "-1", //父菜单ID
     icon: "", //菜单图标
-    sortOrder: "0", //排序值，越小越靠前
+    sortOrder: "", //排序值，越小越靠前
     embedded: "0", //是否内嵌，0否，1是
     menuType: "0" //菜单类型，0菜单，1按钮
   });
+  const UpdateFormRef = ref();
   const dialogType = ref(1);
   const dataList = ref([]);
   const menuList = ref([]);
   const loading = ref(false);
   const dialogUpdateVisible = ref(false);
   const pagination = reactive<PaginationProps>({
+    // 总数
     total: 0,
-    pageSize: 10,
+    // 条数
+    pageSize: 30,
+    // 页码
     currentPage: 1,
-    background: true
+    background: true,
+    pageSizes: [10, 30, 50, 100]
   });
   const columns: TableColumnList = [
     {
@@ -68,13 +74,15 @@ export function useUser() {
       prop: "meta.icon",
       minWidth: 130,
       cellRenderer: ({ props, row }) => (
-        <el-text size={props.size}>{row.meta.icon}</el-text>
+        <div class="flex items-center justify-center">
+          <IconifyIconOnline icon={row.meta.icon} />
+        </div>
       )
     },
     {
       label: "操作",
       fixed: "right",
-      width: 200,
+      width: 240,
       slot: "operation"
     }
   ];
@@ -115,7 +123,9 @@ export function useUser() {
   // 获取全部菜单列表
   async function Menu() {
     const { data } = await getMenuList({});
+    console.log(data);
     menuList.value = TreeFormatter(data);
+    console.log(menuList.value);
     menuList.value.unshift({
       label: "作为顶级菜单",
       value: "-1"
@@ -123,70 +133,80 @@ export function useUser() {
   }
   Menu();
   async function UpdateFormSubmit() {
-    if (dialogType.value == 1) {
-      const { status, msg } = await postMenuList({
-        name: UpdateForm.value.name,
-        enName: UpdateForm.value.enName,
-        permission: UpdateForm.value.permission,
-        path: UpdateForm.value.path,
-        parentId:
-          UpdateForm.value.parentId === "null"
-            ? null
-            : UpdateForm.value.parentId,
-        icon: UpdateForm.value.icon,
-        visible: visibleswitchvalue.value,
-        sortOrder: UpdateForm.value.sortOrder,
-        keepAlive: keepAliveswitchvalue.value,
-        embedded: UpdateForm.value.embedded,
-        menuType: UpdateForm.value.menuType
-      });
-      if (status == 1) {
-        ElMessage({
-          message: "新增菜单成功",
-          type: "success"
-        });
-        dialogUpdateVisible.value = false;
-        onSearch();
-        Menu();
+    UpdateFormRef.value.validate(async (valid, fields) => {
+      if (valid) {
+        if (dialogType.value == 1) {
+          const { status, msg } = await postMenuList({
+            name: UpdateForm.value.name,
+            enName: UpdateForm.value.enName,
+            permission: UpdateForm.value.permission,
+            path: UpdateForm.value.path,
+            parentId:
+              UpdateForm.value.parentId === "null"
+                ? null
+                : UpdateForm.value.parentId,
+            icon: UpdateForm.value.icon,
+            visible: visibleswitchvalue.value,
+            sortOrder: UpdateForm.value.sortOrder,
+            keepAlive: keepAliveswitchvalue.value,
+            embedded: UpdateForm.value.embedded,
+            menuType: UpdateForm.value.menuType
+          });
+          if (status == 1) {
+            ElMessage({
+              message: "新增菜单成功",
+              type: "success"
+            });
+            dialogUpdateVisible.value = false;
+            onSearch();
+            Menu();
+          } else {
+            ElMessageBox.alert(msg, "提示", {
+              confirmButtonText: "关闭",
+              type: "warning"
+            });
+          }
+        } else {
+          const { status, msg } = await putMenuList({
+            name: UpdateForm.value.name,
+            enName: UpdateForm.value.enName,
+            permission: UpdateForm.value.permission,
+            path: UpdateForm.value.path,
+            parentId:
+              UpdateForm.value.parentId === "null"
+                ? null
+                : UpdateForm.value.parentId,
+            icon: UpdateForm.value.icon,
+            visible: visibleswitchvalue.value,
+            sortOrder: UpdateForm.value.sortOrder,
+            keepAlive: keepAliveswitchvalue.value,
+            embedded: UpdateForm.value.embedded,
+            menuType: UpdateForm.value.menuType,
+            menuId: UpdateForm.value.menuId
+          });
+          if (status == 1) {
+            ElMessage({
+              message: "菜单修改成功",
+              type: "success"
+            });
+            dialogUpdateVisible.value = false;
+            onSearch();
+            Menu();
+          } else {
+            ElMessageBox.alert(msg, "提示", {
+              confirmButtonText: "关闭",
+              type: "warning"
+            });
+          }
+        }
       } else {
-        ElMessageBox.alert(msg, "提示", {
-          confirmButtonText: "关闭",
-          type: "warning"
-        });
-      }
-    } else {
-      const { status, msg } = await putMenuList({
-        name: UpdateForm.value.name,
-        enName: UpdateForm.value.enName,
-        permission: UpdateForm.value.permission,
-        path: UpdateForm.value.path,
-        parentId:
-          UpdateForm.value.parentId === "null"
-            ? null
-            : UpdateForm.value.parentId,
-        icon: UpdateForm.value.icon,
-        visible: visibleswitchvalue.value,
-        sortOrder: UpdateForm.value.sortOrder,
-        keepAlive: keepAliveswitchvalue.value,
-        embedded: UpdateForm.value.embedded,
-        menuType: UpdateForm.value.menuType,
-        menuId: UpdateForm.value.menuId
-      });
-      if (status == 1) {
+        //表单校验失败回调
         ElMessage({
-          message: "菜单修改成功",
-          type: "success"
-        });
-        dialogUpdateVisible.value = false;
-        onSearch();
-        Menu();
-      } else {
-        ElMessageBox.alert(msg, "提示", {
-          confirmButtonText: "关闭",
-          type: "warning"
+          message: "请输入完整信息",
+          type: "error"
         });
       }
-    }
+    });
   }
   function handleDelete(row) {
     ElMessageBox.confirm(`是否删除名称为:${row.name}的菜单? `, "提示", {
@@ -218,16 +238,22 @@ export function useUser() {
       path: "", //路由路径
       parentId: "", //父菜单ID
       icon: "", //菜单图标
-      sortOrder: "0", //排序值，越小越靠前
+      sortOrder: "", //排序值，越小越靠前
       embedded: "0", //是否内嵌，0否，1是
       menuType: "0" //菜单类型，0菜单，1按钮
     };
+    visibleswitchvalue.value = "1";
+    keepAliveswitchvalue.value = "1";
     dialogType.value = 1;
     dialogUpdateVisible.value = true;
+    UpdateFormRef.value && UpdateFormRef.value.resetFields();
   }
   function handleUpdate(row) {
     dialogType.value = 2;
     dialogUpdateVisible.value = true;
+    UpdateFormRef.value && UpdateFormRef.value.resetFields();
+    visibleswitchvalue.value = row.meta.isHide ? "0" : "1";
+    keepAliveswitchvalue.value = row.meta.isKeepAlive ? "1" : "0";
     UpdateForm.value = {
       menuId: row.id ? row.id : "",
       name: row.name ? row.name : "", //菜单名称
@@ -269,13 +295,42 @@ export function useUser() {
   async function onSearch() {
     loading.value = true;
     const { data } = await getMenuList({});
-    console.log('testlog', data);
     dataList.value = data;
     pagination.total = data.length;
     setTimeout(() => {
       loading.value = false;
     }, 500);
   }
+  function handleAddBtn(row) {
+    dialogType.value = 1;
+    UpdateForm.value = {
+      name: "", //菜单名称
+      enName: "", //英文名称
+      permission: "", //权限标识
+      path: "", //路由路径
+      parentId: row.id, //父菜单ID
+      icon: "", //菜单图标
+      sortOrder: "", //排序值，越小越靠前
+      embedded: "0", //是否内嵌，0否，1是
+      menuType: "1" //菜单类型，0菜单，1按钮
+    };
+    dialogUpdateVisible.value = true;
+  }
+  function handleAddChildrenMenu(row) {
+    dialogType.value = 1;
+    UpdateForm.value = {
+      name: "", //菜单名称
+      enName: "", //英文名称
+      permission: "", //权限标识
+      path: "", //路由路径
+      parentId: row.id, //父菜单ID
+      icon: "", //菜单图标
+      sortOrder: "", //排序值，越小越靠前
+      embedded: "0", //是否内嵌，0否，1是
+      menuType: "0" //菜单类型，0菜单，1按钮
+    };
+    dialogUpdateVisible.value = true;
+  }
   onMounted(() => {
     onSearch();
   });
@@ -292,6 +347,7 @@ export function useUser() {
     UpdateFormSubmit,
     submit,
     UpdateForm,
+    UpdateFormRef,
     menuList,
     dialogType,
     AddUser,
@@ -300,6 +356,8 @@ export function useUser() {
     handleDelete,
     handleSizeChange,
     handleCurrentChange,
-    handleSelectionChange
+    handleSelectionChange,
+    handleAddChildrenMenu,
+    handleAddBtn
   };
 }

src/views/admin/menu/index.vue

@@ -5,15 +5,18 @@ export default {
 };
 </script>
 <script setup lang="ts">
+import { reactive } from "vue";
 import { useUser } from "./hook";
 import { hasAuth } from "@/router/utils";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
+import IconSelect from "@/components/ReIcon/src/Select.vue";
 
 import Delete from "@iconify-icons/ep/delete";
 import Search from "@iconify-icons/ep/search";
 import Refresh from "@iconify-icons/ep/refresh";
 import AddFill from "@iconify-icons/ri/add-circle-line";
+import EditPen from "@iconify-icons/ep/edit-pen";
 
 const {
   loading,
@@ -23,6 +26,7 @@ const {
   dialogUpdateVisible,
   UpdateFormSubmit,
   UpdateForm,
+  UpdateFormRef,
   onSearch,
   submit,
   dialogType,
@@ -34,7 +38,9 @@ const {
   handleCurrentChange,
   handleSelectionChange,
   visibleswitchvalue,
-  keepAliveswitchvalue
+  keepAliveswitchvalue,
+  handleAddChildrenMenu,
+  handleAddBtn
 } = useUser();
 defineExpose({
   loading,
@@ -44,6 +50,7 @@ defineExpose({
   dialogUpdateVisible,
   UpdateFormSubmit,
   UpdateForm,
+  UpdateFormRef,
   submit,
   onSearch,
   dialogType,
@@ -55,7 +62,45 @@ defineExpose({
   handleCurrentChange,
   handleSelectionChange,
   visibleswitchvalue,
-  keepAliveswitchvalue
+  keepAliveswitchvalue,
+  handleAddChildrenMenu,
+  handleAddBtn
+});
+
+// 表单校验规则
+const rules = reactive({
+  menuType: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请选择权限类型", trigger: "blur" }
+  ],
+  name: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请输入菜单标题", trigger: "blur" }
+  ],
+  enName: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请输入菜单名称(英文字母名称)", trigger: "blur" }
+  ],
+  permission: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请输入权限标识", trigger: "blur" }
+  ],
+  path: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请输入菜单路径", trigger: "blur" }
+  ],
+  icon: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请选择图标", trigger: "blur" }
+  ],
+  sortOrder: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请输入排序值（越小越靠前）", trigger: "blur" }
+  ],
+  parentId: [
+    // 必传(字段名动态生成)
+    { required: true, message: "请选择父级菜单", trigger: "blur" }
+  ]
 });
 </script>
 
@@ -63,11 +108,10 @@ defineExpose({
 .main
   //- 表格组件
   PureTableBar.mt12(title="后台菜单管理", @refresh="onSearch" )
-    template(#buttons)
+    template(#header)
       el-button(type="primary" :icon="useRenderIcon(AddFill)" @click="AddUser") 新增菜单
     template(v-slot="{ size, checkList }")
-      pure-table(stripe 
-        border,
+      pure-table( 
         row-key="id",
         align-whole="center",
         table-layout="auto",
@@ -98,12 +142,30 @@ defineExpose({
             @click="handleDelete(row)"
             :icon="useRenderIcon(Delete)"
           ) 删除
+          el-button.reset-margin(
+            link
+            type="primary"
+            :size="size"
+            @click="handleAddChildrenMenu(row)"
+            :icon="useRenderIcon(AddFill)"
+            v-if="row.path && row.path.split('/')[row.path.split('/').length - 1] !== 'index'"
+          ) 添加子菜单
+          el-button.reset-margin(
+            link
+            type="primary"
+            :size="size"
+            @click="handleAddBtn(row)"
+            :icon="useRenderIcon(AddFill)"
+            v-if="row.path && row.path.split('/')[row.path.split('/').length - 1] === 'index'"
+          ) 添加按钮
 
-  el-dialog(v-model='dialogUpdateVisible' width="40%" :close-on-click-modal="false" :title="dialogType == 1 ?'添加菜单' : '修改菜单'" )
+  el-dialog(v-model='dialogUpdateVisible' width="40%" draggable :close-on-click-modal="false" :title="dialogType == 1 ? '添加菜单' : '修改菜单'" )
     el-form(:model='UpdateForm' 
+      ref="UpdateFormRef"
+      :rules="rules",
       label-position="left"
       label-width="100px")
-      el-form-item(label='权限类型')
+      el-form-item(label='权限类型' prop="menuType")
         el-select(
           v-model="UpdateForm.menuType"
           placeholder="请选择权限类型"
@@ -124,14 +186,14 @@ defineExpose({
           placeholder="请输入菜单路径")
       el-form-item(label='图标' prop="icon" v-if="UpdateForm.menuType == '0'")
         IconSelect(v-model="UpdateForm.icon")
-      el-form-item(label='排序' prop="path" v-if="UpdateForm.menuType == '0'")
+      el-form-item(label='排序' prop="sortOrder" v-if="UpdateForm.menuType == '0'")
         el-input(v-model='UpdateForm.sortOrder' autocomplete='off' type="number" class="!w-[300px]"
           placeholder="请输入排序值（越小越靠前）")
-      el-form-item(label='是否显示' prop="visibleswitchvalue" v-if="UpdateForm.menuType == '0'")
+      el-form-item(label='菜单是否显示' prop="visibleswitchvalue" v-if="UpdateForm.menuType == '0'")
         el-switch(v-model="visibleswitchvalue" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-value="1" inactive-value="0")
-      el-form-item(label='是否缓存' prop="keepAliveswitchvalue" v-if="UpdateForm.menuType == '0'")
+      el-form-item(label='菜单是否缓存' prop="keepAliveswitchvalue" v-if="UpdateForm.menuType == '0'")
         el-switch(v-model="keepAliveswitchvalue" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-value="1" inactive-value="0")
-      el-form-item(label='父级菜单')
+      el-form-item(label='父级菜单' prop="parentId")
         el-tree-select(
           v-model="UpdateForm.parentId" 
           :data="menuList" 

src/views/app/appBottomNavs/components/add/index.vue

@@ -5,14 +5,30 @@ export default {
 };
 </script>
 <script setup lang="ts">
-import { inject, onMounted, reactive, ref, Uploadfile, UploadImg, Editor, useRenderIcon, ElMessage, ElMessageBox, Upload, Close, http, getGroupUrl, RegularVerification, verification } from "@/utils/importUsed"
+import {
+  inject,
+  onMounted,
+  reactive,
+  ref,
+  Uploadfile,
+  UploadImg,
+  Editor,
+  useRenderIcon,
+  ElMessage,
+  ElMessageBox,
+  Upload,
+  Close,
+  http,
+  getGroupUrl,
+  RegularVerification,
+  verification
+} from "@/utils/importUsed";
 // 接口列表实例
-let UrlList = reactive(null)
+let UrlList = reactive(null);
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["kxsConfigServer"]);
-
-})
+});
 // 组件传参对象
 const props = defineProps<{
   submit: Function;
@@ -26,54 +42,29 @@ const props = defineProps<{
   };
 }>();
 // 表单数据
-let UpdateForm = ref({
-  title: "", //标题
-  selectIcon: "", //选中图标
-  normalIcon: "", //未选中图标
-  selectTextColor: "", //选中文字颜色
-  normalTextColor: "", //未选中文字颜色
-  pageName: "", //关联页面文件
-  noPageHint: "", //空页面提示信息
-  backgroudColor: "", //背景色
-  style: "", //按钮样式
-  scrollerAnimationImages: "", //滚动图片
-  pagPath: "", //PAG文件
-  showTitle: "", //是否显示标题
-  pagLocalPath: "", //pag文件路径
-  pagDefaultIcon: "", //pag默认图标
-  iconSize: "", //图标尺寸
-  statusBarColor: "", //状态栏底色
-  kind: "", //分类
-  pagFlag: "", //是否PAG
-
+const UpdateForm = ref({
+  sourceVersion: "", //来源版本号
+  addVersion: "" //新增版本号
 });
 // 表单实例
-const ruleFormRef = ref()
-
-// 传参选项数据
-// 按钮样式选项数据
-const styleOptionList = [
-]
-// 分类选项数据
-const kindOptionList = [
-]
+const ruleFormRef = ref();
+const submitStatus = ref(false);
 
-// 选项卡参数(默认值为列表某项的id)
-const activeId = ref('1')
 // 提交函数
-const submit = async (formEl) => {
+const submit = async formEl => {
   // 表单校验拦截
-  if (!formEl) return
+  if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       //表单校验成功回调
-      console.log('submit!')
-
-
+      console.log("submit!");
+      console.log("[ UpdateForm.value ] >", UpdateForm.value);
+      if (submitStatus.value) return;
+      submitStatus.value = true;
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appBottomNavsadd.method,
-        url: UrlList.kxsConfigServer.appBottomNavsadd.url,
+        method: UrlList.kxsConfigServer.appBottomNavscopy.method,
+        url: UrlList.kxsConfigServer.appBottomNavscopy.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -83,34 +74,19 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                title: "", //标题
-      selectIcon: "", //选中图标
-      normalIcon: "", //未选中图标
-      selectTextColor: "", //选中文字颜色
-      normalTextColor: "", //未选中文字颜色
-      pageName: "", //关联页面文件
-      noPageHint: "", //空页面提示信息
-      backgroudColor: "", //背景色
-      style: "", //按钮样式
-      scrollerAnimationImages: "", //滚动图片
-      pagPath: "", //PAG文件
-      showTitle: "", //是否显示标题
-      pagLocalPath: "", //pag文件路径
-      pagDefaultIcon: "", //pag默认图标
-      iconSize: "", //图标尺寸
-      statusBarColor: "", //状态栏底色
-      kind: "", //分类
-      pagFlag: "", //是否PAG
-
+          sourceVersion: "", //来源版本号
+          addVersion: "" //新增版本号
         };
         // 关闭新增弹窗;
-        closeVisible()
+        closeVisible();
+        submitStatus.value = false;
       } else {
         //业务失败回调
         ElMessageBox.alert(msg, "提示", {
           confirmButtonText: "关闭",
           type: "warning"
         });
+        submitStatus.value = false;
       }
     } else {
       //表单校验失败回调
@@ -119,123 +95,41 @@ const submit = async (formEl) => {
         type: "error"
       });
     }
-  })
+  });
 };
 
-
-
-
 // 表单校验规则
 const rules = reactive({
-  title: [
-    { required: true, message: '请输入标题', trigger: 'blur' },
-  ],
-  kind: [
-    { required: true, message: '请输入分类', trigger: 'blur' },
+  sourceVersion: [
+    { required: true, message: "请输入来源版本号", trigger: "blur" }
   ],
-
-})
+  addVersion: [{ required: true, message: "请输入新增版本号", trigger: "blur" }]
+});
 // 关闭弹窗回调函数
 const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        title: "", //标题
-    selectIcon: "", //选中图标
-    normalIcon: "", //未选中图标
-    selectTextColor: "", //选中文字颜色
-    normalTextColor: "", //未选中文字颜色
-    pageName: "", //关联页面文件
-    noPageHint: "", //空页面提示信息
-    backgroudColor: "", //背景色
-    style: "", //按钮样式
-    scrollerAnimationImages: "", //滚动图片
-    pagPath: "", //PAG文件
-    showTitle: "", //是否显示标题
-    pagLocalPath: "", //pag文件路径
-    pagDefaultIcon: "", //pag默认图标
-    iconSize: "", //图标尺寸
-    statusBarColor: "", //状态栏底色
-    kind: "", //分类
-    pagFlag: "", //是否PAG
-
+    sourceVersion: "", //来源版本号
+    addVersion: "" //新增版本号
   };
   closeFn();
 };
 
 // 弹窗是否全屏
-const isFullscreen = ref(false)
+const isFullscreen = ref(false);
 </script>
 
 <template lang="pug">
 .main
-  el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="新增" draggable @close="closeVisible")
-    el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
-      el-tab-pane(label="基本资料" name="1")
-        el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-          el-form-item(label='标题' prop="title")
-            el-input(v-model='UpdateForm.title' autocomplete='off'
-              placeholder="请输入标题")
-          el-form-item(label='选中图标' prop="selectIcon")
-            el-input(v-model='UpdateForm.selectIcon' autocomplete='off'
-              placeholder="请输入选中图标")
-          el-form-item(label='未选中图标' prop="normalIcon")
-            el-input(v-model='UpdateForm.normalIcon' autocomplete='off'
-              placeholder="请输入未选中图标")
-          el-form-item(label='选中文字颜色' prop="selectTextColor")
-            el-input(v-model='UpdateForm.selectTextColor' autocomplete='off'
-              placeholder="请输入选中文字颜色")
-          el-form-item(label='未选中文字颜色' prop="normalTextColor")
-            el-input(v-model='UpdateForm.normalTextColor' autocomplete='off'
-              placeholder="请输入未选中文字颜色")
-          el-form-item(label='关联页面文件' prop="pageName")
-            el-input(v-model='UpdateForm.pageName' autocomplete='off'
-              placeholder="请输入关联页面文件")
-          el-form-item(label='空页面提示信息' prop="noPageHint")
-            el-input(v-model='UpdateForm.noPageHint' autocomplete='off'
-              placeholder="请输入空页面提示信息")
-          el-form-item(label='背景色' prop="backgroudColor")
-            el-input(v-model='UpdateForm.backgroudColor' autocomplete='off'
-              placeholder="请输入背景色")
-          el-form-item(label="按钮样式", prop="style")
-            el-select(
-              v-model="UpdateForm.style",
-              placeholder="请选择按钮样式",
-              clearable,
-            )
-              el-option(:label="item.label", :value="item.id" v-for="(item,index) in styleOptionList")
-          el-form-item(label='滚动图片' prop="scrollerAnimationImages")
-            el-input(v-model='UpdateForm.scrollerAnimationImages' autocomplete='off'
-              placeholder="请输入滚动图片")
-          el-form-item(label='PAG文件' prop="pagPath")
-            el-input(v-model='UpdateForm.pagPath' autocomplete='off'
-              placeholder="请输入PAG文件")
-      el-tab-pane(label="基本信息" name="2")
-        el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-          el-form-item(label='是否显示标题' prop="showTitle")
-            el-switch(v-model="UpdateForm.showTitle")
-          el-form-item(label='pag文件路径' prop="pagLocalPath")
-            el-input(v-model='UpdateForm.pagLocalPath' autocomplete='off'
-              placeholder="请输入pag文件路径")
-          el-form-item(label='pag默认图标' prop="pagDefaultIcon")
-            el-input(v-model='UpdateForm.pagDefaultIcon' autocomplete='off'
-              placeholder="请输入pag默认图标")
-          el-form-item(label='图标尺寸' prop="iconSize")
-            el-input-number(v-model='UpdateForm.iconSize' :min="1" :max="1000"
-              placeholder="请输入图标尺寸")
-          el-form-item(label='状态栏底色' prop="statusBarColor")
-            el-input(v-model='UpdateForm.statusBarColor' autocomplete='off'
-              placeholder="请输入状态栏底色")
-          el-form-item(label="分类", prop="kind")
-            el-select(
-              v-model="UpdateForm.kind",
-              placeholder="请选择分类",
-              clearable,
-            )
-              el-option(:label="item.label", :value="item.id" v-for="(item,index) in kindOptionList")
-          el-form-item(label='是否PAG' prop="pagFlag")
-            el-switch(v-model="UpdateForm.pagFlag")
-    el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
+  el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="同步页面配置" draggable @close="closeVisible")
+    el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
+      el-form-item(label='来源版本号' prop="sourceVersion")
+        el-input(v-model='UpdateForm.sourceVersion' autocomplete='off'
+          placeholder="请输入来源版本号")
+      el-form-item(label='新增版本号' prop="addVersion")
+        el-input(v-model='UpdateForm.addVersion' autocomplete='off'
+          placeholder="请输入新增版本号")
 
     .flex.justify-end
       el-button(

src/views/app/appBottomNavs/index.vue

@@ -8,7 +8,7 @@ export default {
 import { provide } from "vue";
 import { useAppBottomNavs } from "./hook";
 import { http } from "@/utils/http";
-import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed"
+import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed";
 import Add from "./components/add/index.vue";
 import EditUpdate from "./components/update/index.vue";
 import Search from "@iconify-icons/ep/search";
@@ -34,22 +34,20 @@ const {
   editUpdateVisible,
   editUpdateFormData,
   kindOptionList,
-  handleDelete,
-
+  handleDelete
 } = useAppBottomNavs();
 // 关闭添加
 const closeAddVisible = () => {
   onSearch(ruleFormRef.value);
   addVisible.value = false;
-}
-provide('closeAddVisible', closeAddVisible)
+};
+provide("closeAddVisible", closeAddVisible);
 // 关闭修改
 const closeEditUpdateVisible = () => {
   onSearch(ruleFormRef.value);
-  editUpdateVisible.value = false
-}
-provide('closeEditUpdateVisible', closeEditUpdateVisible)
-
+  editUpdateVisible.value = false;
+};
+provide("closeEditUpdateVisible", closeEditUpdateVisible);
 </script>
 
 <template lang="pug">
@@ -86,7 +84,7 @@ provide('closeEditUpdateVisible', closeEditUpdateVisible)
     //- 表格组件
     PureTableBar(title="app底部导航", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
-        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
+        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" ) 同步配置至新版本
 
       template(v-slot="{ size, checkList }")
         pure-table( 
@@ -160,4 +158,4 @@ provide('closeEditUpdateVisible', closeEditUpdateVisible)
 :deep(.el-descriptions__header) {
   margin: 16px 0 !important;
 }
-</style>
+</style>

src/views/app/appVersion/index.vue

@@ -8,7 +8,7 @@ export default {
 import { provide } from "vue";
 import { useAppVersion } from "./hook";
 import { http } from "@/utils/http";
-import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed"
+import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed";
 import Add from "./components/add/index.vue";
 import EditUpdate from "./components/update/index.vue";
 import Search from "@iconify-icons/ep/search";
@@ -34,22 +34,20 @@ const {
   editUpdateVisible,
   editUpdateFormData,
   handleDelete,
-  kindOptionList,
-
+  kindOptionList
 } = useAppVersion();
 // 关闭添加
 const closeAddVisible = () => {
   onSearch(ruleFormRef.value);
   addVisible.value = false;
-}
-provide('closeAddVisible', closeAddVisible)
+};
+provide("closeAddVisible", closeAddVisible);
 // 关闭修改
 const closeEditUpdateVisible = () => {
   onSearch(ruleFormRef.value);
-  editUpdateVisible.value = false
-}
-provide('closeEditUpdateVisible', closeEditUpdateVisible)
-
+  editUpdateVisible.value = false;
+};
+provide("closeEditUpdateVisible", closeEditUpdateVisible);
 </script>
 
 <template lang="pug">
@@ -160,4 +158,4 @@ provide('closeEditUpdateVisible', closeEditUpdateVisible)
 :deep(.el-descriptions__header) {
   margin: 16px 0 !important;
 }
-</style>
+</style>

src/views/app/fileUpdateInfo/components/add/index.vue

@@ -5,14 +5,30 @@ export default {
 };
 </script>
 <script setup lang="ts">
-import { inject, onMounted, reactive, ref, Uploadfile, UploadImg, Editor, useRenderIcon, ElMessage, ElMessageBox, Upload, Close, http, getGroupUrl, RegularVerification, verification } from "@/utils/importUsed"
+import {
+  inject,
+  onMounted,
+  reactive,
+  ref,
+  Uploadfile,
+  UploadImg,
+  Editor,
+  useRenderIcon,
+  ElMessage,
+  ElMessageBox,
+  Upload,
+  Close,
+  http,
+  getGroupUrl,
+  RegularVerification,
+  verification
+} from "@/utils/importUsed";
 // 接口列表实例
-let UrlList = reactive(null)
+let UrlList = reactive(null);
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["kxsConfigServer"]);
-
-})
+});
 // 组件传参对象
 const props = defineProps<{
   submit: Function;
@@ -26,33 +42,28 @@ const props = defineProps<{
   };
 }>();
 // 表单数据
-let UpdateForm = ref({
-  versionNum: "", //更新版本
-  path: "", //路径
-  fileName: "", //文件名
-
+const UpdateForm = ref({
+  sourceVersion: "", //来源版本号
+  addVersion: "" //新增版本号
 });
 // 表单实例
-const ruleFormRef = ref()
-
-// 传参选项数据
-
-// 选项卡参数(默认值为列表某项的id)
-const activeId = ref('1')
+const ruleFormRef = ref();
+const submitStatus = ref(false);
 // 提交函数
-const submit = async (formEl) => {
+const submit = async formEl => {
   // 表单校验拦截
-  if (!formEl) return
+  if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       //表单校验成功回调
-      console.log('submit!')
-
-
+      console.log("submit!");
+      console.log("[ UpdateForm.value ] >", UpdateForm.value);
+      if (submitStatus.value) return;
+      submitStatus.value = true;
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.fileUpdateInfoadd.method,
-        url: UrlList.kxsConfigServer.fileUpdateInfoadd.url,
+        method: UrlList.kxsConfigServer.fileUpdateInfocopy.method,
+        url: UrlList.kxsConfigServer.fileUpdateInfocopy.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -62,19 +73,19 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                versionNum: "", //更新版本
-      path: "", //路径
-      fileName: "", //文件名
-
+          sourceVersion: "", //来源版本号
+          addVersion: "" //新增版本号
         };
         // 关闭新增弹窗;
-        closeVisible()
+        closeVisible();
+        submitStatus.value = false;
       } else {
         //业务失败回调
         ElMessageBox.alert(msg, "提示", {
           confirmButtonText: "关闭",
           type: "warning"
         });
+        submitStatus.value = false;
       }
     } else {
       //表单校验失败回调
@@ -83,49 +94,41 @@ const submit = async (formEl) => {
         type: "error"
       });
     }
-  })
+  });
 };
 
-
-
-
 // 表单校验规则
 const rules = reactive({
-  path: [
-    { required: true, message: '请输入路径', trigger: 'blur' },
+  sourceVersion: [
+    { required: true, message: "请输入来源版本号", trigger: "blur" }
   ],
-
-})
+  addVersion: [{ required: true, message: "请输入新增版本号", trigger: "blur" }]
+});
 // 关闭弹窗回调函数
 const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        versionNum: "", //更新版本
-    path: "", //路径
-    fileName: "", //文件名
-
+    sourceVersion: "", //来源版本号
+    addVersion: "" //新增版本号
   };
   closeFn();
 };
 
 // 弹窗是否全屏
-const isFullscreen = ref(false)
+const isFullscreen = ref(false);
 </script>
 
 <template lang="pug">
 .main
-  el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="新增" draggable @close="closeVisible")
+  el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="同步页面配置" draggable @close="closeVisible")
     el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-      el-form-item(label='更新版本' prop="versionNum")
-        el-input-number(v-model='UpdateForm.versionNum' :min="1" :max="1000"
-          placeholder="请输入更新版本")
-      el-form-item(label='路径' prop="path")
-        el-input(v-model='UpdateForm.path' autocomplete='off'
-          placeholder="请输入路径")
-      el-form-item(label='文件名' prop="fileName")
-        el-input(v-model='UpdateForm.fileName' autocomplete='off'
-          placeholder="请输入文件名")
+      el-form-item(label='来源版本号' prop="sourceVersion")
+        el-input(v-model='UpdateForm.sourceVersion' autocomplete='off'
+          placeholder="请输入来源版本号")
+      el-form-item(label='新增版本号' prop="addVersion")
+        el-input(v-model='UpdateForm.addVersion' autocomplete='off'
+          placeholder="请输入新增版本号")
 
     .flex.justify-end
       el-button(

src/views/app/fileUpdateInfo/index.vue

@@ -8,7 +8,7 @@ export default {
 import { provide } from "vue";
 import { useFileUpdateInfo } from "./hook";
 import { http } from "@/utils/http";
-import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed"
+import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed";
 import Add from "./components/add/index.vue";
 import EditUpdate from "./components/update/index.vue";
 import EditUpVersion from "./components/upVersion/index.vue";
@@ -38,28 +38,26 @@ const {
   handleUpVersion,
   handleUpdateFile,
   editUpVersionVisible,
-  editUpVersionFormData,
-
+  editUpVersionFormData
 } = useFileUpdateInfo();
 // 关闭添加
 const closeAddVisible = () => {
   onSearch(ruleFormRef.value);
   addVisible.value = false;
-}
-provide('closeAddVisible', closeAddVisible)
+};
+provide("closeAddVisible", closeAddVisible);
 // 关闭修改
 const closeEditUpdateVisible = () => {
   onSearch(ruleFormRef.value);
-  editUpdateVisible.value = false
-}
-provide('closeEditUpdateVisible', closeEditUpdateVisible)
+  editUpdateVisible.value = false;
+};
+provide("closeEditUpdateVisible", closeEditUpdateVisible);
 // 关闭修改
 const closeEditUpVersionVisible = () => {
   onSearch(ruleFormRef.value);
-  editUpVersionVisible.value = false
-}
-provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
-
+  editUpVersionVisible.value = false;
+};
+provide("closeEditUpVersionVisible", closeEditUpVersionVisible);
 </script>
 
 <template lang="pug">
@@ -92,7 +90,7 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
     //- 表格组件
     PureTableBar(title="资源文件更新信息", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
-        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
+        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()") 同步文件至新版本
         el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleUpdateFile()" v-if="hasAuth(['updateFile'])") 同步文件
 
       template(v-slot="{ size, checkList }")
@@ -181,4 +179,4 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
 :deep(.el-descriptions__header) {
   margin: 16px 0 !important;
 }
-</style>
+</style>

src/views/app/pageUpdateInfo/components/add/index.vue

@@ -5,14 +5,30 @@ export default {
 };
 </script>
 <script setup lang="ts">
-import { inject, onMounted, reactive, ref, Uploadfile, UploadImg, Editor, useRenderIcon, ElMessage, ElMessageBox, Upload, Close, http, getGroupUrl, RegularVerification, verification } from "@/utils/importUsed"
+import {
+  inject,
+  onMounted,
+  reactive,
+  ref,
+  Uploadfile,
+  UploadImg,
+  Editor,
+  useRenderIcon,
+  ElMessage,
+  ElMessageBox,
+  Upload,
+  Close,
+  http,
+  getGroupUrl,
+  RegularVerification,
+  verification
+} from "@/utils/importUsed";
 // 接口列表实例
-let UrlList = reactive(null)
+let UrlList = reactive(null);
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["kxsConfigServer"]);
-
-})
+});
 // 组件传参对象
 const props = defineProps<{
   submit: Function;
@@ -26,49 +42,29 @@ const props = defineProps<{
   };
 }>();
 // 表单数据
-let UpdateForm = ref({
-  moduleVersion: "", //模板更新版本
-  modulePath: "", //模板路径
-  backgroudColor: "", //背景色
-  textColor: "", //前景色
-  statusBarStyle: "", //苹果状态栏
-  showTitle: "", //是否显示头部
-  title: "", //顶部标题
-  showScrollBar: "", //是否显示滚动条
-  skidFlag: "", //是否侧滑返回
-  leftBtn1: "", //左侧按钮1
-  leftBtn2: "", //左侧按钮2
-  rightBtn1: "", //右侧按钮1
-  rightBtn2: "", //右侧按钮2
-  leftAction1: "", //左侧按钮1点击事件
-  leftAction2: "", //左侧按钮2点击事件
-  rightAction1: "", //右侧按钮1点击事件
-  rightAction2: "", //右侧按钮2点击事件
-  gotoPages: "", //下级页面
-  mustUpdate: "", //是否强制更新
-
+const UpdateForm = ref({
+  sourceVersion: "", //来源版本号
+  addVersion: "" //新增版本号
 });
 // 表单实例
-const ruleFormRef = ref()
-
-// 传参选项数据
+const ruleFormRef = ref();
+const submitStatus = ref(false);
 
-// 选项卡参数(默认值为列表某项的id)
-const activeId = ref('1')
 // 提交函数
-const submit = async (formEl) => {
+const submit = async formEl => {
   // 表单校验拦截
-  if (!formEl) return
+  if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       //表单校验成功回调
-      console.log('submit!')
-
-
+      console.log("submit!");
+      console.log("[ UpdateForm.value ] >", UpdateForm.value);
+      if (submitStatus.value) return;
+      submitStatus.value = true;
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.pageUpdateInfoadd.method,
-        url: UrlList.kxsConfigServer.pageUpdateInfoadd.url,
+        method: UrlList.kxsConfigServer.pageUpdateInfocopy.method,
+        url: UrlList.kxsConfigServer.pageUpdateInfocopy.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -78,35 +74,19 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                moduleVersion: "", //模板更新版本
-      modulePath: "", //模板路径
-      backgroudColor: "", //背景色
-      textColor: "", //前景色
-      statusBarStyle: "", //苹果状态栏
-      showTitle: "", //是否显示头部
-      title: "", //顶部标题
-      showScrollBar: "", //是否显示滚动条
-      skidFlag: "", //是否侧滑返回
-      leftBtn1: "", //左侧按钮1
-      leftBtn2: "", //左侧按钮2
-      rightBtn1: "", //右侧按钮1
-      rightBtn2: "", //右侧按钮2
-      leftAction1: "", //左侧按钮1点击事件
-      leftAction2: "", //左侧按钮2点击事件
-      rightAction1: "", //右侧按钮1点击事件
-      rightAction2: "", //右侧按钮2点击事件
-      gotoPages: "", //下级页面
-      mustUpdate: "", //是否强制更新
-
+          sourceVersion: "", //来源版本号
+          addVersion: "" //新增版本号
         };
+        submitStatus.value = false;
         // 关闭新增弹窗;
-        closeVisible()
+        closeVisible();
       } else {
         //业务失败回调
         ElMessageBox.alert(msg, "提示", {
           confirmButtonText: "关闭",
           type: "warning"
         });
+        submitStatus.value = false;
       }
     } else {
       //表单校验失败回调
@@ -115,126 +95,41 @@ const submit = async (formEl) => {
         type: "error"
       });
     }
-  })
+  });
 };
 
-
-
-
 // 表单校验规则
 const rules = reactive({
-  moduleVersion: [
-    { required: true, message: '请输入模板更新版本', trigger: 'blur' },
-    { validator: (rule: any, value: any, callback: any) => { verification.verificationInteger(value, callback) }, trigger: 'blur' },
-  ],
-  modulePath: [
-    { required: true, message: '请输入模板路径', trigger: 'blur' },
-  ],
-  rightAction2: [
-    { required: true, message: '请输入右侧按钮2点击事件', trigger: 'blur' },
+  sourceVersion: [
+    { required: true, message: "请输入来源版本号", trigger: "blur" }
   ],
-
-})
+  addVersion: [{ required: true, message: "请输入新增版本号", trigger: "blur" }]
+});
 // 关闭弹窗回调函数
 const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        moduleVersion: "", //模板更新版本
-    modulePath: "", //模板路径
-    backgroudColor: "", //背景色
-    textColor: "", //前景色
-    statusBarStyle: "", //苹果状态栏
-    showTitle: "", //是否显示头部
-    title: "", //顶部标题
-    showScrollBar: "", //是否显示滚动条
-    skidFlag: "", //是否侧滑返回
-    leftBtn1: "", //左侧按钮1
-    leftBtn2: "", //左侧按钮2
-    rightBtn1: "", //右侧按钮1
-    rightBtn2: "", //右侧按钮2
-    leftAction1: "", //左侧按钮1点击事件
-    leftAction2: "", //左侧按钮2点击事件
-    rightAction1: "", //右侧按钮1点击事件
-    rightAction2: "", //右侧按钮2点击事件
-    gotoPages: "", //下级页面
-    mustUpdate: "", //是否强制更新
-
+    sourceVersion: "", //来源版本号
+    addVersion: "" //新增版本号
   };
   closeFn();
 };
 
 // 弹窗是否全屏
-const isFullscreen = ref(false)
+const isFullscreen = ref(false);
 </script>
 
 <template lang="pug">
 .main
-  el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="新增" draggable @close="closeVisible")
-    el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
-      el-tab-pane(label="基本信息" name="1")
-        el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-          el-form-item(label='模板更新版本' prop="moduleVersion")
-            el-input-number(v-model='UpdateForm.moduleVersion' :min="1" :max="1000"
-              placeholder="请输入模板更新版本")
-          el-form-item(label='模板路径' prop="modulePath")
-            el-input(v-model='UpdateForm.modulePath' autocomplete='off'
-              placeholder="请输入模板路径")
-          el-form-item(label='背景色' prop="backgroudColor")
-            el-input(v-model='UpdateForm.backgroudColor' autocomplete='off'
-              placeholder="请输入背景色")
-          el-form-item(label='前景色' prop="textColor")
-            el-input(v-model='UpdateForm.textColor' autocomplete='off'
-              placeholder="请输入前景色")
-          el-form-item(label="苹果状态栏", prop="statusBarStyle")
-            el-select(
-              v-model="UpdateForm.statusBarStyle",
-              placeholder="请选择苹果状态栏",
-              clearable,
-            )
-              el-option(:label="item.label", :value="item.id" v-for="(item,index) in statusBarStyleOptionList")
-          el-form-item(label='是否显示头部' prop="showTitle")
-            el-switch(v-model="UpdateForm.showTitle")
-          el-form-item(label='顶部标题' prop="title")
-            el-input(v-model='UpdateForm.title' autocomplete='off'
-              placeholder="请输入顶部标题")
-          el-form-item(label='是否显示滚动条' prop="showScrollBar")
-            el-switch(v-model="UpdateForm.showScrollBar")
-          el-form-item(label='是否侧滑返回' prop="skidFlag")
-            el-switch(v-model="UpdateForm.skidFlag")
-          el-form-item(label='左侧按钮1' prop="leftBtn1")
-            el-input(v-model='UpdateForm.leftBtn1' autocomplete='off'
-              placeholder="请输入左侧按钮1")
-          el-form-item(label='左侧按钮2' prop="leftBtn2")
-            el-input(v-model='UpdateForm.leftBtn2' autocomplete='off'
-              placeholder="请输入左侧按钮2")
-          el-form-item(label='右侧按钮1' prop="rightBtn1")
-            el-input(v-model='UpdateForm.rightBtn1' autocomplete='off'
-              placeholder="请输入右侧按钮1")
-          el-form-item(label='右侧按钮2' prop="rightBtn2")
-            el-input(v-model='UpdateForm.rightBtn2' autocomplete='off'
-              placeholder="请输入右侧按钮2")
-          el-form-item(label='左侧按钮1点击事件' prop="leftAction1")
-            el-input(v-model='UpdateForm.leftAction1' autocomplete='off'
-              placeholder="请输入左侧按钮1点击事件")
-          el-form-item(label='左侧按钮2点击事件' prop="leftAction2")
-            el-input(v-model='UpdateForm.leftAction2' autocomplete='off'
-              placeholder="请输入左侧按钮2点击事件")
-          el-form-item(label='右侧按钮1点击事件' prop="rightAction1")
-            el-input(v-model='UpdateForm.rightAction1' autocomplete='off'
-              placeholder="请输入右侧按钮1点击事件")
-          el-form-item(label='右侧按钮2点击事件' prop="rightAction2")
-            el-input(v-model='UpdateForm.rightAction2' autocomplete='off'
-              placeholder="请输入右侧按钮2点击事件")
-      el-tab-pane(label="下级页面" name="2")
-        el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-          el-form-item(label="下级页面", prop="gotoPages")
-            el-transfer(v-model="UpdateForm.gotoPages" :data="gotoPagesOptionList")
-      el-tab-pane(label="基本资料" name="3")
-        el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
-          el-form-item(label='是否强制更新' prop="mustUpdate")
-            el-switch(v-model="UpdateForm.mustUpdate")
-    el-tabs(v-model="activeId" class="demo-tabs" @tab-click="handleClick")
+  el-dialog(v-model='props.addVisible' width="50%" :fullscreen="isFullscreen" title="同步页面配置" draggable @close="closeVisible")
+    el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
+      el-form-item(label='来源版本号' prop="sourceVersion")
+        el-input(v-model='UpdateForm.sourceVersion' autocomplete='off'
+          placeholder="请输入来源版本号")
+      el-form-item(label='新增版本号' prop="addVersion")
+        el-input(v-model='UpdateForm.addVersion' autocomplete='off'
+          placeholder="请输入新增版本号")
 
     .flex.justify-end
       el-button(

src/views/app/pageUpdateInfo/hook.tsx

@@ -1,21 +1,30 @@
-import { reactive, onMounted, ref, ElMessage, ElMessageBox, http, getGroupUrl, RegularVerification, verification, PaginationProps } from "@/utils/importUsed"
+import {
+  reactive,
+  onMounted,
+  ref,
+  ElMessage,
+  ElMessageBox,
+  http,
+  getGroupUrl,
+  RegularVerification,
+  verification,
+  PaginationProps
+} from "@/utils/importUsed";
 // 表单实例
-const ruleFormRef = ref()
+const ruleFormRef = ref();
 export function usePageUpdateInfo() {
   // 接口列表实例
-  let UrlList = reactive(null)
+  let UrlList = reactive(null);
   // 获取当前板块接口列表
   onMounted(async () => {
     UrlList = await getGroupUrl(["kxsConfigServer"]);
     onSearch(ruleFormRef.value);
-
   });
-  let form = reactive({
+  const form = reactive({
     kind: "creater", //分类
     appVersion: "",
     title: "",
-    modulePath: "",
-
+    modulePath: ""
   });
   const dataList = ref([]);
   const loading = ref(false);
@@ -90,11 +99,11 @@ export function usePageUpdateInfo() {
   // 搜索列表
   async function onSearch(formEl) {
     // 表单校验拦截
-    if (!formEl) return
+    if (!formEl) return;
     await formEl.validate(async (valid, fields) => {
       if (valid) {
         //表单校验成功回调
-        console.log('submit!')
+        console.log("submit!");
         // 状态调整为加载中
         loading.value = true;
         // 调用接口（需动态生成接口）
@@ -119,23 +128,21 @@ export function usePageUpdateInfo() {
           type: "error"
         });
       }
-    })
+    });
   }
 
-
-
   // 删除
   function handleDelete(row) {
-    ElMessageBox.confirm(
-      `是否删除该页面模板更新信息? `,
-      "提示",
-      {
-        confirmButtonText: "删除",
-        cancelButtonText: "取消",
-        type: "warning"
-      }
-    ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfodelete.method, url: UrlList.kxsConfigServer.pageUpdateInfodelete.url, params: String(row.id) });
+    ElMessageBox.confirm(`是否删除该页面模板更新信息? `, "提示", {
+      confirmButtonText: "删除",
+      cancelButtonText: "取消",
+      type: "warning"
+    }).then(async () => {
+      const { status, msg }: any = await http.Request({
+        method: UrlList.kxsConfigServer.pageUpdateInfodelete.method,
+        url: UrlList.kxsConfigServer.pageUpdateInfodelete.url,
+        params: String(row.id)
+      });
       if (status === 1) {
         ElMessage({
           message: "删除成功",
@@ -147,15 +154,15 @@ export function usePageUpdateInfo() {
           confirmButtonText: "关闭",
           type: "warning"
         });
-      };
-    })
+      }
+    });
   }
 
   // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
-  };
+  }
 
   //同步文件
   function handleUpdateTemplate() {
@@ -166,16 +173,16 @@ export function usePageUpdateInfo() {
       });
       return;
     }
-    ElMessageBox.confirm(
-      `是否同步页面模板文件? `,
-      "提示",
-      {
-        confirmButtonText: "同步",
-        cancelButtonText: "取消",
-        type: "warning"
-      }
-    ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfoupdateTemplate.method, url: UrlList.kxsConfigServer.pageUpdateInfoupdateTemplate.url, params: { kind: form.kind, appVersion: form.appVersion } });
+    ElMessageBox.confirm(`是否同步页面模板文件? `, "提示", {
+      confirmButtonText: "同步",
+      cancelButtonText: "取消",
+      type: "warning"
+    }).then(async () => {
+      const { status, msg }: any = await http.Request({
+        method: UrlList.kxsConfigServer.pageUpdateInfoupdateTemplate.method,
+        url: UrlList.kxsConfigServer.pageUpdateInfoupdateTemplate.url,
+        params: { kind: form.kind, appVersion: form.appVersion }
+      });
       if (status === 1) {
         ElMessage({
           message: "同步成功",
@@ -187,9 +194,9 @@ export function usePageUpdateInfo() {
           confirmButtonText: "关闭",
           type: "warning"
         });
-      };
-    })
-  };
+      }
+    });
+  }
 
   // 修改
   const editUpdateVisible = ref(false);
@@ -198,7 +205,7 @@ export function usePageUpdateInfo() {
     editUpdateVisible.value = true;
     // 表格数据赋值
     editUpdateFormData.value = row;
-  };
+  }
   // 更新版本号码
   const editUpVersionVisible = ref(false);
   const editUpVersionFormData = ref({});
@@ -226,12 +233,10 @@ export function usePageUpdateInfo() {
         type: "warning"
       });
     }
-  };
+  }
 
   // 分类选项数据
-  const kindOptionList = [
-    { label: '创客版', id: 'creater' }
-  ]
+  const kindOptionList = [{ label: "创客版", id: "creater" }];
 
   return {
     form,
@@ -255,7 +260,6 @@ export function usePageUpdateInfo() {
     handleUpdateTemplate,
     kindOptionList,
     editUpVersionVisible,
-    editUpVersionFormData,
-
+    editUpVersionFormData
   };
 }

src/views/app/pageUpdateInfo/index.vue

@@ -8,7 +8,7 @@ export default {
 import { provide } from "vue";
 import { usePageUpdateInfo } from "./hook";
 import { http } from "@/utils/http";
-import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed"
+import { useRenderIcon, hasAuth, PureTableBar } from "@/utils/importUsed";
 import Add from "./components/add/index.vue";
 import EditUpdate from "./components/update/index.vue";
 import EditUpVersion from "./components/upVersion/index.vue";
@@ -39,28 +39,26 @@ const {
   handleUpdateTemplate,
   editUpVersionVisible,
   editUpVersionFormData,
-  kindOptionList,
-
+  kindOptionList
 } = usePageUpdateInfo();
 // 关闭添加
 const closeAddVisible = () => {
   onSearch(ruleFormRef.value);
   addVisible.value = false;
-}
-provide('closeAddVisible', closeAddVisible)
+};
+provide("closeAddVisible", closeAddVisible);
 // 关闭修改
 const closeEditUpdateVisible = () => {
   onSearch(ruleFormRef.value);
-  editUpdateVisible.value = false
-}
-provide('closeEditUpdateVisible', closeEditUpdateVisible)
+  editUpdateVisible.value = false;
+};
+provide("closeEditUpdateVisible", closeEditUpdateVisible);
 // 关闭修改
 const closeEditUpVersionVisible = () => {
   onSearch(ruleFormRef.value);
-  editUpVersionVisible.value = false
-}
-provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
-
+  editUpVersionVisible.value = false;
+};
+provide("closeEditUpVersionVisible", closeEditUpVersionVisible);
 </script>
 
 <template lang="pug">
@@ -103,7 +101,7 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
     //- 表格组件
     PureTableBar(title="页面模板更新信息", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
-        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
+        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()") 同步配置至新版本
         el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleUpdateTemplate()" v-if="hasAuth(['updateTemplate'])") 同步文件
 
       template(v-slot="{ size, checkList }")
@@ -192,4 +190,4 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
 :deep(.el-descriptions__header) {
   margin: 16px 0 !important;
 }
-</style>
+</style>