fix(schema-form): componentProps merge logic

close #157
buqiyuan · Mar 6, 2024 · 69ce11c · 69ce11c
1 parent 4333bf5
commit 69ce11c
Show file tree

Hide file tree

Showing 22 changed files with 263 additions and 161 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,13 +1,13 @@
 {
   "recommendations": [
     "Vue.volar",
-    "Vue.vscode-typescript-vue-plugin",
     "dbaeumer.vscode-eslint",
     "stylelint.vscode-stylelint",
     "esbenp.prettier-vscode",
     "mrmlnc.vscode-less",
     "lokalise.i18n-ally",
     "antfu.iconify",
+    "antfu.unocss",
     "mikestead.dotenv"
   ]
 }
diff --git a/package.json b/package.json
@@ -75,8 +75,8 @@
     "@iconify/json": "^2.2.180",
     "@types/lodash-es": "~4.17.12",
     "@types/node": "~20.11.16",
-    "@typescript-eslint/eslint-plugin": "~7.1.0",
-    "@typescript-eslint/parser": "~7.1.0",
+    "@typescript-eslint/eslint-plugin": "~7.1.1",
+    "@typescript-eslint/parser": "~7.1.1",
     "@umijs/openapi": "^1.10.1",
     "@vitejs/plugin-vue": "~5.0.4",
     "@vitejs/plugin-vue-jsx": "~3.1.0",
@@ -110,7 +110,7 @@
     "stylelint-config-standard": "~36.0.0",
     "stylelint-order": "~6.0.4",
     "stylelint-prettier": "^5.0.0",
-    "terser": "~5.28.1",
+    "terser": "~5.29.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.3.3",
     "unocss": "^0.58.5",