Merge branch 'anncwb:main' into main

package.json

@@ -37,7 +37,7 @@
     "@iconify/iconify": "^2.0.4",
     "@logicflow/core": "^0.6.16",
     "@logicflow/extension": "^0.6.16",
-    "@vueuse/core": "^6.4.1",
+    "@vueuse/core": "^6.5.3",
     "@zxcvbn-ts/core": "^1.0.0-beta.0",
     "ant-design-vue": "2.2.8",
     "axios": "^0.21.4",
@@ -58,7 +58,7 @@
     "sortablejs": "^1.14.0",
     "tinymce": "^5.9.2",
     "vditor": "^3.8.7",
-    "vue": "^3.2.16",
+    "vue": "^3.2.19",
     "vue-i18n": "^9.1.7",
     "vue-json-pretty": "^2.0.4",
     "vue-router": "^4.0.11",
@@ -68,7 +68,7 @@
   "devDependencies": {
     "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^13.1.0",
-    "@iconify/json": "^1.1.405",
+    "@iconify/json": "^1.1.407",
     "@purge-icons/generated": "^0.7.0",
     "@types/codemirror": "^5.60.3",
     "@types/crypto-js": "^4.0.2",
@@ -78,7 +78,7 @@
     "@types/jest": "^27.0.2",
     "@types/lodash-es": "^4.17.5",
     "@types/mockjs": "^1.0.4",
-    "@types/node": "^16.9.6",
+    "@types/node": "^16.10.1",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.4.1",
     "@types/qs": "^6.9.7",
@@ -87,11 +87,11 @@
     "@typescript-eslint/eslint-plugin": "^4.31.2",
     "@typescript-eslint/parser": "^4.31.2",
     "@vitejs/plugin-legacy": "^1.5.3",
-    "@vitejs/plugin-vue": "^1.9.1",
+    "@vitejs/plugin-vue": "^1.9.2",
     "@vitejs/plugin-vue-jsx": "^1.1.8",
-    "@vue/compiler-sfc": "3.2.16",
+    "@vue/compiler-sfc": "3.2.19",
     "@vue/test-utils": "^2.0.0-rc.15",
-    "autoprefixer": "^10.3.5",
+    "autoprefixer": "^10.3.6",
     "commitizen": "^4.2.4",
     "conventional-changelog-cli": "^2.1.1",
     "cross-env": "^7.0.3",
@@ -102,17 +102,17 @@
     "eslint-plugin-jest": "^24.4.2",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^7.18.0",
-    "esno": "^0.9.1",
+    "esno": "^0.10.0",
     "fs-extra": "^10.0.0",
     "http-server": "^13.0.2",
     "husky": "^7.0.2",
     "inquirer": "^8.1.5",
     "is-ci": "^3.0.0",
-    "jest": "^27.2.1",
+    "jest": "^27.2.2",
     "less": "^4.1.1",
     "lint-staged": "^11.1.2",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.3.7",
+    "postcss": "^8.3.8",
     "prettier": "^2.4.1",
     "pretty-quick": "^3.1.1",
     "rimraf": "^3.0.2",
@@ -126,16 +126,16 @@
     "typescript": "^4.4.3",
     "vite": "^2.5.10",
     "vite-plugin-compression": "^0.3.5",
-    "vite-plugin-html": "^2.1.0",
+    "vite-plugin-html": "^2.1.1",
     "vite-plugin-imagemin": "^0.4.5",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-purge-icons": "^0.7.0",
     "vite-plugin-pwa": "^0.11.2",
     "vite-plugin-style-import": "^1.2.1",
-    "vite-plugin-svg-icons": "^1.0.4",
+    "vite-plugin-svg-icons": "^1.0.5",
     "vite-plugin-theme": "^0.8.1",
     "vite-plugin-vue-setup-extend": "^0.1.0",
-    "vite-plugin-windicss": "^1.4.5",
+    "vite-plugin-windicss": "^1.4.7",
     "vue-eslint-parser": "^7.11.0",
     "vue-tsc": "^0.3.0"
   },

src/components/Form/src/components/ApiSelect.vue

@@ -77,9 +77,9 @@
           if (next) {
             const value = next[valueField];
             prev.push({
+              ...omit(next, [labelField, valueField]),
               label: next[labelField],
               value: numberToString ? `${value}` : value,
-              ...omit(next, [labelField, valueField]),
             });
           }
           return prev;

src/components/Menu/src/BasicMenu.vue

@@ -134,7 +134,9 @@
           isClickGo.value = false;
           return;
         }
-        const path = (route || unref(currentRoute)).path;
+        const path =
+          (route || unref(currentRoute)).meta?.currentActiveMenu ||
+          (route || unref(currentRoute)).path;
         setOpenKeys(path);
         if (unref(currentActiveMenu)) return;
         if (props.isHorizontal && unref(getSplit)) {

src/components/Modal/src/components/Modal.tsx

@@ -9,6 +9,7 @@ export default defineComponent({
   name: 'Modal',
   inheritAttrs: false,
   props: basicProps,
+  emits: ['cancel'],
   setup(props, { slots }) {
     const { visible, draggable, destroyOnClose } = toRefs(props);
     const attrs = useAttrs();

src/components/Modal/src/components/ModalHeader.vue

@@ -17,5 +17,6 @@
       },
       title: { type: String },
     },
+    emits: ['dblclick'],
   });
 </script>

tests/server/package.json

@@ -24,13 +24,13 @@
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^5.0.2",
     "@types/koa-router": "^7.4.4",
-    "@types/node": "^16.9.6",
+    "@types/node": "^16.10.1",
     "nodemon": "^2.0.13",
-    "pm2": "^5.1.1",
+    "pm2": "^5.1.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.2.1",
     "tsconfig-paths": "^3.11.0",
-    "tsup": "^5.1.0",
+    "tsup": "^5.2.1",
     "typescript": "^4.4.3"
   }
 }