From 54e63a095a18cb77e514e593917dcde738ab3955 Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Fri, 10 May 2024 15:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86ts=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/package.json                            | 24 +++++++++----------
 .../verifition/Verify/VerifyPoints.vue        | 10 ++++----
 .../default/components/sidebar/menu.vue       | 11 +++++----
 .../default/components/sidebar/side.vue       | 10 ++++++--
 admin/src/stores/modules/user.ts              |  4 ++--
 .../flow/flow_apply/components/ViewForm.vue   | 12 ++++++++--
 admin/src/views/flow/flow_apply/finish.vue    |  5 ----
 .../flow/flow_history/components/ViewForm.vue | 17 +++++++++----
 admin/src/views/flow/flow_history/done.vue    |  1 -
 admin/src/views/monitor_project/edit.vue      | 20 ++++++++--------
 admin/src/views/monitor_project/index.vue     |  4 ++--
 .../views/setting/permission/menu/edit.vue    |  7 +++---
 server/README.md                              |  5 ++++
 13 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/admin/package.json b/admin/package.json
index 889105f..2912c83 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -14,9 +14,9 @@
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
         "@highlightjs/vue-plugin": "^2.1.0",
-        "@logicflow/core": "^1.2.26",
-        "@logicflow/extension": "^1.2.26",
-        "@vue/shared": "^3.4.23",
+        "@logicflow/core": "^1.2.27",
+        "@logicflow/extension": "^1.2.27",
+        "@vue/shared": "^3.4.27",
         "@vueuse/core": "^10.9.0",
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
@@ -25,16 +25,16 @@
         "crypto-js": "^4.2.0",
         "css-color-function": "^1.3.3",
         "echarts": "^5.5.0",
-        "element-plus": "^2.7.0",
+        "element-plus": "^2.7.2",
         "highlight.js": "^11.9.0",
         "lodash-es": "^4.17.21",
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "query-string": "^9.0.0",
         "vform3-builds": "^3.0.10",
-        "vue": "^3.4.23",
+        "vue": "^3.4.27",
         "vue-clipboard3": "^2.0.0",
-        "vue-echarts": "^6.6.9",
+        "vue-echarts": "^6.7.2",
         "vue-router": "^4.3.2",
         "vue3-video-play": "^1.3.2",
         "vuedraggable": "^4.1.0"
@@ -42,7 +42,7 @@
     "devDependencies": {
         "@rushstack/eslint-patch": "^1.10.2",
         "@types/lodash-es": "^4.17.12",
-        "@types/node": "^20.12.7",
+        "@types/node": "^20.12.11",
         "@types/nprogress": "^0.2.3",
         "@vitejs/plugin-vue": "^5.0.4",
         "@vitejs/plugin-vue-jsx": "^3.1.0",
@@ -51,21 +51,21 @@
         "@vue/tsconfig": "^0.5.1",
         "autoprefixer": "^10.4.19",
         "eslint": "^8.57.0",
-        "eslint-plugin-vue": "^9.25.0",
+        "eslint-plugin-vue": "^9.26.0",
         "execa": "^8.0.1",
         "fs-extra": "^11.2.0",
         "postcss": "^8.4.38",
         "prettier": "^3.2.5",
         "rollup-plugin-visualizer": "^5.12.0",
-        "sass": "^1.75.0",
+        "sass": "^1.77.0",
         "tailwindcss": "^3.4.3",
         "typescript": "~5.4.5",
         "unplugin-auto-import": "^0.17.5",
-        "unplugin-vue-components": "^0.26.0",
-        "vite": "^5.2.9",
+        "unplugin-vue-components": "^0.27.0",
+        "vite": "^5.2.11",
         "vite-plugin-compression": "^0.5.1",
         "vite-plugin-style-import": "^2.0.0",
         "vite-plugin-svg-icons": "^2.0.1",
-        "vue-tsc": "^2.0.13"
+        "vue-tsc": "^2.0.16"
     }
 }
diff --git a/admin/src/components/verifition/Verify/VerifyPoints.vue b/admin/src/components/verifition/Verify/VerifyPoints.vue
index 71828cf..93fba7b 100644
--- a/admin/src/components/verifition/Verify/VerifyPoints.vue
+++ b/admin/src/components/verifition/Verify/VerifyPoints.vue
@@ -40,8 +40,8 @@
                         'line-height': '20px',
                         'border-radius': '50%',
                         position: 'absolute',
-                        top: parseInt(tempPoint.y - 10) + 'px',
-                        left: parseInt(tempPoint.x - 10) + 'px'
+                        top: tempPoint.y - 10 + 'px',
+                        left: tempPoint.x - 10 + 'px'
                     }"
                 >
                     {{ index + 1 }}
@@ -62,7 +62,7 @@
         </div>
     </div>
 </template>
-<script type="text/babel">
+<script>
 /**
  * VerifyPoints
  * @description 点选
@@ -106,8 +106,8 @@ export default {
             }
         }
     },
-    setup(props, context) {
-        const { mode, captchaType, vSpace, imgSize, barSize } = toRefs(props)
+    setup(props) {
+        const { mode, captchaType } = toRefs(props)
         const { proxy } = getCurrentInstance()
         const secretKey = ref(''), //后端返回的ase加密秘钥
             checkNum = ref(3), //默认需要点击的字数
diff --git a/admin/src/layout/default/components/sidebar/menu.vue b/admin/src/layout/default/components/sidebar/menu.vue
index a86871d..a5ed585 100644
--- a/admin/src/layout/default/components/sidebar/menu.vue
+++ b/admin/src/layout/default/components/sidebar/menu.vue
@@ -34,7 +34,7 @@ defineOptions({
 })
 const props = defineProps({
     routes: {
-        type: Object as PropType<RouteRecordRaw[]>
+        type: Array as PropType<RouteRecordRaw[]>
     },
     config: {
         type: Object
@@ -69,13 +69,14 @@ const themeClass = computed(() => `theme-${props.theme}`)
         .el-menu {
             :deep(.el-menu-item) {
                 &.is-active {
-                    @apply bg-primary border-primary;
+                    background-color: var(--el-color-primary);
+                    border-color: var(--el-color-primary);
                 }
             }
         }
         :deep(.el-menu--collapse) {
             .el-sub-menu.is-active .el-sub-menu__title {
-                @apply bg-primary #{!important};
+                background-color: var(--el-color-primary) !important;
             }
         }
     }
@@ -84,7 +85,9 @@ const themeClass = computed(() => `theme-${props.theme}`)
             .el-menu-item {
                 border-color: transparent;
                 &.is-active {
-                    @apply bg-primary-light-9 border-r-2 border-primary;
+                    background-color: var(--el-color-primary-light-9);
+                    border-right-width: 2px;
+                    border-color: var(--el-color-primary);
                 }
             }
             .el-menu-item:hover,
diff --git a/admin/src/layout/default/components/sidebar/side.vue b/admin/src/layout/default/components/sidebar/side.vue
index 4d76c7f..11729a5 100644
--- a/admin/src/layout/default/components/sidebar/side.vue
+++ b/admin/src/layout/default/components/sidebar/side.vue
@@ -14,6 +14,7 @@
 </template>
 
 <script setup lang="ts">
+import type { RouteRecordRaw } from 'vue-router'
 import useAppStore from '@/stores/modules/app'
 import useSettingStore from '@/stores/modules/setting'
 import useUserStore from '@/stores/modules/user'
@@ -35,7 +36,7 @@ const settingStore = useSettingStore()
 const sideTheme = computed(() => settingStore.sideTheme)
 const userStore = useUserStore()
 
-const routes = computed(() => userStore.routes)
+const routes = computed(() => userStore.routes as RouteRecordRaw[])
 
 const sideStyle = computed(() => {
     return sideTheme.value == 'dark'
@@ -62,7 +63,12 @@ const handleSelect = () => {
 .side {
     position: relative;
     z-index: 999;
-    @apply border-r border-br-light h-full flex flex-col;
+    border-right-width: 1px;
+    border-color: var(--el-border-color-light);
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
     background-color: var(--side-dark-color, var(--el-bg-color));
 }
 </style>
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index 0636d90..403e744 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -34,10 +34,10 @@ const useUserStore = defineStore('user', {
             this.userInfo = {}
             this.perms = []
         },
-        login(playload: any) {
+        login(info: any) {
             return new Promise((resolve, reject) => {
                 login({
-                    ...playload
+                    ...info
                 })
                     .then((data) => {
                         this.token = data.token
diff --git a/admin/src/views/flow/flow_apply/components/ViewForm.vue b/admin/src/views/flow/flow_apply/components/ViewForm.vue
index 722b9a4..1535453 100644
--- a/admin/src/views/flow/flow_apply/components/ViewForm.vue
+++ b/admin/src/views/flow/flow_apply/components/ViewForm.vue
@@ -44,7 +44,11 @@ const optionData = reactive({})
 const vFormRef = ref(null)
 
 const dialogVisible = ref(false)
-const applyDetail = ref({})
+const applyDetail = ref({
+    id: null,
+    status: null,
+    flowName: ''
+})
 
 const historyList = ref([])
 
@@ -73,7 +77,11 @@ async function getHistoryList(applyId) {
 }
 function closeFn() {
     dialogVisible.value = false
-    applyDetail.value = {}
+    applyDetail.value = {
+        id: null,
+        status: null,
+        flowName: ''
+    }
     formData.value = {}
     formJson.value = {}
     historyList.value = []
diff --git a/admin/src/views/flow/flow_apply/finish.vue b/admin/src/views/flow/flow_apply/finish.vue
index f32be26..1101919 100644
--- a/admin/src/views/flow/flow_apply/finish.vue
+++ b/admin/src/views/flow/flow_apply/finish.vue
@@ -115,17 +115,12 @@ import feedback from '@/utils/feedback'
 import ApplySubmit from './components/apply_submit.vue'
 import ViewForm from './components/ViewForm.vue'
 
-import useUserStore from '@/stores/modules/user'
-
-const userStore = useUserStore()
-
 defineOptions({
     name: 'flow_apply'
 })
 const viewFormRef = shallowRef<InstanceType<typeof ViewForm>>()
 const ApplySubmitRef = shallowRef<InstanceType<typeof ApplySubmit>>()
 
-const showEdit = ref(false)
 const queryParams = reactive({
     applyUserNickname: '',
     flowName: '',
diff --git a/admin/src/views/flow/flow_history/components/ViewForm.vue b/admin/src/views/flow/flow_history/components/ViewForm.vue
index 2d0e1ab..1b3a323 100644
--- a/admin/src/views/flow/flow_history/components/ViewForm.vue
+++ b/admin/src/views/flow/flow_history/components/ViewForm.vue
@@ -31,6 +31,7 @@
 <script setup>
 import { ref, reactive } from 'vue'
 import 'vform3-builds/dist/designer.style.css' //引入VForm3样式
+
 // import { flow_apply_detail } from '@/api/flow/flow_apply'
 
 const formJson = ref({})
@@ -39,8 +40,13 @@ const optionData = reactive({})
 const vFormRef = ref(null)
 
 const dialogVisible = ref(false)
-const applyDetail = ref({})
-const historyDetail = ref({})
+const applyDetail = ref({
+    flowName: ''
+})
+const historyDetail = ref({
+    id: null,
+    passStatus: null
+})
 
 const props = defineProps({
     save: {
@@ -68,10 +74,13 @@ function hideWidgets(widgetNames) {
 }
 function closeFn() {
     dialogVisible.value = false
-    applyDetail.value = {}
+    applyDetail.value = { flowName: '' }
     formData.value = {}
     formJson.value = {}
-    historyDetail.value = {}
+    historyDetail.value = {
+        id: null,
+        passStatus: null
+    }
 }
 function onBack() {
     emit('back', historyDetail.value)
diff --git a/admin/src/views/flow/flow_history/done.vue b/admin/src/views/flow/flow_history/done.vue
index e255c75..242ba66 100644
--- a/admin/src/views/flow/flow_history/done.vue
+++ b/admin/src/views/flow/flow_history/done.vue
@@ -75,7 +75,6 @@ import { flow_apply_detail } from '@/api/flow/flow_apply'
 import { flow_history_list } from '@/api/flow/flow_history'
 import { useDictData } from '@/hooks/useDictOptions'
 import { usePaging } from '@/hooks/usePaging'
-import feedback from '@/utils/feedback'
 import useUserStore from '@/stores/modules/user'
 // import ApplySubmit from '@/views/flow/flow_apply/components/apply_submit.vue'
 import ViewForm from './components/ViewForm.vue'
diff --git a/admin/src/views/monitor_project/edit.vue b/admin/src/views/monitor_project/edit.vue
index 956f28b..09f0d2d 100644
--- a/admin/src/views/monitor_project/edit.vue
+++ b/admin/src/views/monitor_project/edit.vue
@@ -10,9 +10,9 @@
             @close="handleClose"
         >
             <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
-                <el-form-item label="项目Key" prop="projectKey">
+                <!-- <el-form-item label="项目Key" prop="projectKey">
                     <el-input v-model="formData.projectKey" placeholder="请输入项目uuid" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="项目名称" prop="projectName">
                     <el-input v-model="formData.projectName" placeholder="请输入项目名称" />
                 </el-form-item>
@@ -62,7 +62,7 @@ const popupTitle = computed(() => {
 
 const formData = reactive({
     id: '',
-    projectKey: '',
+    // projectKey: '',
     projectName: '',
     projectType: ''
 })
@@ -75,13 +75,13 @@ const formRules = {
             trigger: ['blur']
         }
     ],
-    projectKey: [
-        {
-            required: true,
-            message: '请输入项目Key',
-            trigger: ['blur']
-        }
-    ],
+    // projectKey: [
+    //     {
+    //         required: true,
+    //         message: '请输入项目Key',
+    //         trigger: ['blur']
+    //     }
+    // ],
     projectName: [
         {
             required: true,
diff --git a/admin/src/views/monitor_project/index.vue b/admin/src/views/monitor_project/index.vue
index 1f012f1..4056c26 100644
--- a/admin/src/views/monitor_project/index.vue
+++ b/admin/src/views/monitor_project/index.vue
@@ -40,8 +40,8 @@
             </div>
             <el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
                 <el-table-column label="项目Key" prop="projectKey" min-width="130" />
-                <el-table-column label="项目名称" prop="projectName" min-width="130" />
-                <el-table-column label="项目类型" prop="projectType" min-width="100">
+                <el-table-column label="项目名称" prop="projectName" />
+                <el-table-column label="项目类型" prop="projectType">
                     <template #default="{ row }">
                         <dict-value :options="dictData.project_type" :value="row.projectType" />
                     </template>
diff --git a/admin/src/views/setting/permission/menu/edit.vue b/admin/src/views/setting/permission/menu/edit.vue
index 459c42b..5ed8f39 100644
--- a/admin/src/views/setting/permission/menu/edit.vue
+++ b/admin/src/views/setting/permission/menu/edit.vue
@@ -132,10 +132,9 @@
                             ></el-option>
                         </el-select>
 
-                        <div class="form-tips">
-                            <!-- 将作为server端API验权使用，请求路径`api/admin/system/admin/list`权限为`admin:system:admin:list` -->
-                            可以多个，但建议一个接口一个按钮
-                        </div>
+                        <!-- <div class="form-tips">
+                            请求路径`api/admin/system/admin/list`权限为`admin:system:admin:list`
+                        </div> -->
                     </div>
                 </el-form-item>
 
diff --git a/server/README.md b/server/README.md
index 991cccf..70741b6 100644
--- a/server/README.md
+++ b/server/README.md
@@ -25,3 +25,8 @@
 │   ├── main.go // 入口
 │   ├── .env // 配置文件，注意不提交git
 ```
+
+
+### Go应该注意的问题
+1. 循环依赖
+2. 零值更新，避免数据库默认值为0