Merge branch 'use-pinia'

src/views/settings/menu-settings/MenuSettings.vue

@@ -4,13 +4,13 @@ import {deleteMenuSettings, getMenuSettings, IntergrationMenu} from "@/api/setti
 import {ElButton, ElButtonGroup} from "element-plus";
 import Dialog from "@/views/settings/menu-settings/dialog.vue";
 import {CyMessageBox} from "@/components/cy/message-box";
+import {useCompRef} from "@/utils/useCompRef";
 
 const menuTreeData = ref<IntergrationMenu[]>([])
-const dialogRef = ref()
+const dialogRef = useCompRef(Dialog)
 
 function modify(row) {
-  console.log(row)
-  dialogRef.value.openDialog(row)
+  dialogRef.value!.openDialog(row)
 }
 
 async function loadingData() {
@@ -40,17 +40,22 @@ function addRouterClick(row: IntergrationMenu | null = null) {
     }
   }
 
-  dialogRef.value.openDialog({
+  // @ts-ignore
+  dialogRef.value!.openDialog({
+    cascaders: cascaders,
     children: [],
+    completePath: "",
     component: "",
     icon: "",
     id: null,
+    mainCard: false,
+    mainOverflowAuto: false,
     metaHideTabs: false,
     metaPassRule: false,
+    metaShowMenu: false,
     metaTitle: "",
     name: "",
-    cascaders,
-    parentId: 0,
+    parentId: row?.id,
     path: "",
     pathParams: "",
     redirect: "",

src/views/settings/menu-settings/dialog.vue

@@ -17,11 +17,9 @@ import {
   ElSelectV2
 } from "element-plus";
 import XEUtils from "xe-utils";
-// import * as icon from '../src/icons/iconfont.css'
 import {eachAndReturnList} from "@/utils/cyRefList";
 import {useCompRef} from "@/utils/useCompRef";
 import {QuestionFilled} from "@element-plus/icons-vue";
-import axios from "axios";
 import usePromise from "@/utils/cy-use/usePromise";
 
 const props = defineProps<{
@@ -38,8 +36,8 @@ function importCss() {
   const promise = usePromise<string[]>();
   nextTick(() => {
     const styles: any = document.styleSheets;
-    let sheetsList = [];
-    let sheetsIconList = [];
+    const sheetsList = [];
+    const sheetsIconList = [];
     for (let i = 0; i < styles.length; i++) {
       if (styles[i].href && styles[i].href.indexOf('/icons/iconfont') > -1) {
         sheetsList.push(styles[i]);
@@ -153,13 +151,16 @@ function iconClick(icon) {
   currentData.value.icon = `iconfont ${icon}`
 }
 
+declare type IntergrationMenuV2 = IntergrationMenu & {
+  id: number | null
+}
+
 defineExpose({
-  openDialog: (row: IntergrationMenu) => {
+  openDialog: (row: IntergrationMenuV2) => {
     currentData.value = XEUtils.clone(row, true)
     showDialog.value = true;
   }
 })
-
 </script>
 
 <template>