Merge branch 'main' into base-sard-ui

.vscode/settings.json

@@ -56,25 +56,25 @@
     "eslint.config.mjs": "tsconfig.json,.commitlintrc.*,.prettier*,.editorconfig,.commitlint.cjs,.eslint*"
   },
 
-  // 保存的时候自动格式化
-  "prettier.enable": true,
-  "editor.formatOnSave": true,
-  // 开启自动修复
-  "editor.codeActionsOnSave": {
-    "source.fixAll": "explicit",
-    "source.fixAll.eslint": "explicit",
-    "source.fixAll.stylelint": "explicit"
-  },
+  // // 保存的时候自动格式化
+  // "prettier.enable": true,
+  // "editor.formatOnSave": true,
+  // // 开启自动修复
+  // "editor.codeActionsOnSave": {
+  //   "source.fixAll": "explicit",
+  //   "source.fixAll.eslint": "explicit",
+  //   "source.fixAll.stylelint": "explicit"
+  // },
 
   // Disable the default formatter, use eslint instead
-  // "prettier.enable": false,
-  // "editor.formatOnSave": false,
+  "prettier.enable": false,
+  "editor.formatOnSave": false,
 
   // Auto fix
-  // "editor.codeActionsOnSave": {
-  //   "source.fixAll.eslint": "explicit",
-  //   "source.organizeImports": "never"
-  // },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
+  },
 
   // Silent the stylistic rules in you IDE, but still auto fix them
   "eslint.rules.customizations": [

.vscode/vue3.code-snippets

@@ -27,12 +27,12 @@
       "  },",
       "}",
       "</route>\n",
-      "<template>",
-      "  <view class=\"\">$2</view>",
-      "</template>\n",
       "<script lang=\"ts\" setup>",
       "//$3",
       "</script>\n",
+      "<template>",
+      "  <view class=\"\">$2</view>",
+      "</template>\n",
       "<style lang=\"scss\" scoped>",
       "//$4",
       "</style>\n",
@@ -41,16 +41,28 @@
   "Print unibest style": {
     "scope": "vue",
     "prefix": "st",
-    "body": ["<style lang=\"scss\" scoped>", "//", "</style>\n"],
+    "body": [
+      "<style lang=\"scss\" scoped>",
+      "//",
+      "</style>\n"
+    ],
   },
   "Print unibest script": {
     "scope": "vue",
     "prefix": "sc",
-    "body": ["<script lang=\"ts\" setup>", "//$3", "</script>\n"],
+    "body": [
+      "<script lang=\"ts\" setup>",
+      "//$3",
+      "</script>\n"
+    ],
   },
   "Print unibest template": {
     "scope": "vue",
     "prefix": "te",
-    "body": ["<template>", "  <view class=\"\">$1</view>", "</template>\n"],
+    "body": [
+      "<template>",
+      "  <view class=\"\">$1</view>",
+      "</template>\n"
+    ],
   },
-}
+}