移除平台svg图标的引用，改用font

src/assets/quasar-logo-vertical.svg

@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 356 360">
-	<path
-		d="M43.4 303.4c0 3.8-2.3 6.3-7.1 6.3h-15v-22h14.4c4.3 0 6.2 2.2 6.2 5.2 0 2.6-1.5 4.4-3.4 5 2.8.4 4.9 2.5 4.9 5.5zm-8-13H24.1v6.9H35c2.1 0 4-1.3 4-3.8 0-2.2-1.3-3.1-3.7-3.1zm5.1 12.6c0-2.3-1.8-3.7-4-3.7H24.2v7.7h11.7c3.4 0 4.6-1.8 4.6-4zm36.3 4v2.7H56v-22h20.6v2.7H58.9v6.8h14.6v2.3H58.9v7.5h17.9zm23-5.8v8.5H97v-8.5l-11-13.4h3.4l8.9 11 8.8-11h3.4l-10.8 13.4zm19.1-1.8V298c0-7.9 5.2-10.7 12.7-10.7 7.5 0 13 2.8 13 10.7v1.4c0 7.9-5.5 10.8-13 10.8s-12.7-3-12.7-10.8zm22.7 0V298c0-5.7-3.9-8-10-8-6 0-9.8 2.3-9.8 8v1.4c0 5.8 3.8 8.1 9.8 8.1 6 0 10-2.3 10-8.1zm37.2-11.6v21.9h-2.9l-15.8-17.9v17.9h-2.8v-22h3l15.6 18v-18h2.9zm37.9 10.2v1.3c0 7.8-5.2 10.4-12.4 10.4H193v-22h11.2c7.2 0 12.4 2.8 12.4 10.3zm-3 0c0-5.3-3.3-7.6-9.4-7.6h-8.4V307h8.4c6 0 9.5-2 9.5-7.7V298zm50.8-7.6h-9.7v19.3h-3v-19.3h-9.7v-2.6h22.4v2.6zm34.4-2.6v21.9h-3v-10.1h-16.8v10h-2.8v-21.8h2.8v9.2H296v-9.2h2.9zm34.9 19.2v2.7h-20.7v-22h20.6v2.7H316v6.8h14.5v2.3H316v7.5h17.8zM24 340.2v7.3h13.9v2.4h-14v9.6H21v-22h20v2.7H24zm41.5 11.4h-9.8v7.9H53v-22h13.3c5.1 0 8 1.9 8 6.8 0 3.7-2 6.3-5.6 7l6 8.2h-3.3l-5.8-8zm-9.8-2.6H66c3.1 0 5.3-1.5 5.3-4.7 0-3.3-2.2-4.1-5.3-4.1H55.7v8.8zm47.9 6.2H89l-2 4.3h-3.2l10.7-22.2H98l10.7 22.2h-3.2l-2-4.3zm-1-2.3l-6.3-13-6 13h12.2zm46.3-15.3v21.9H146v-17.2L135.7 358h-2.1l-10.2-15.6v17h-2.8v-21.8h3l11 16.9 11.3-17h3zm35 19.3v2.6h-20.7v-22h20.6v2.7H166v6.8h14.5v2.3H166v7.6h17.8zm47-19.3l-8.3 22h-3l-7.1-18.6-7 18.6h-3l-8.2-22h3.3L204 356l6.8-18.5h3.4L221 356l6.6-18.5h3.3zm10 11.6v-1.4c0-7.8 5.2-10.7 12.7-10.7 7.6 0 13 2.9 13 10.7v1.4c0 7.9-5.4 10.8-13 10.8-7.5 0-12.7-3-12.7-10.8zm22.8 0v-1.4c0-5.7-4-8-10-8s-9.9 2.3-9.9 8v1.4c0 5.8 3.8 8.2 9.8 8.2 6.1 0 10-2.4 10-8.2zm28.3 2.4h-9.8v7.9h-2.8v-22h13.2c5.2 0 8 1.9 8 6.8 0 3.7-2 6.3-5.6 7l6 8.2h-3.3l-5.8-8zm-9.8-2.6h10.2c3 0 5.2-1.5 5.2-4.7 0-3.3-2.1-4.1-5.2-4.1h-10.2v8.8zm40.3-1.5l-6.8 5.6v6.4h-2.9v-22h2.9v12.3l15.2-12.2h3.7l-9.9 8.1 10.3 13.8h-3.6l-8.9-12z" />
-	<path fill="#050A14"
-		d="M188.4 71.7a10.4 10.4 0 01-20.8 0 10.4 10.4 0 1120.8 0zM224.2 45c-2.2-3.9-5-7.5-8.2-10.7l-12 7c-3.7-3.2-8-5.7-12.6-7.3a49.4 49.4 0 00-9.7 13.9 59 59 0 0140.1 14l7.6-4.4a57 57 0 00-5.2-12.5zM178 125.1c4.5 0 9-.6 13.4-1.7v-14a40 40 0 0012.5-7.2 47.7 47.7 0 00-7.1-15.3 59 59 0 01-32.2 27.7v8.7c4.4 1.2 8.9 1.8 13.4 1.8zM131.8 45c-2.3 4-4 8.1-5.2 12.5l12 7a40 40 0 000 14.4c5.7 1.5 11.3 2 16.9 1.5a59 59 0 01-8-41.7l-7.5-4.3c-3.2 3.2-6 6.7-8.2 10.6z" />
-	<path fill="#00B4FF"
-		d="M224.2 98.4c2.3-3.9 4-8 5.2-12.4l-12-7a40 40 0 000-14.5c-5.7-1.5-11.3-2-16.9-1.5a59 59 0 018 41.7l7.5 4.4c3.2-3.2 6-6.8 8.2-10.7zm-92.4 0c2.2 4 5 7.5 8.2 10.7l12-7a40 40 0 0012.6 7.3c4-4.1 7.3-8.8 9.7-13.8a59 59 0 01-40-14l-7.7 4.4c1.2 4.3 3 8.5 5.2 12.4zm46.2-80c-4.5 0-9 .5-13.4 1.7V34a40 40 0 00-12.5 7.2c1.5 5.7 4 10.8 7.1 15.4a59 59 0 0132.2-27.7V20a53.3 53.3 0 00-13.4-1.8z" />
-	<path fill="#00B4FF"
-		d="M178 9.2a62.6 62.6 0 11-.1 125.2A62.6 62.6 0 01178 9.2m0-9.2a71.7 71.7 0 100 143.5A71.7 71.7 0 00178 0z" />
-	<path fill="#050A14"
-		d="M96.6 212v4.3c-9.2-.8-15.4-5.8-15.4-17.8V180h4.6v18.4c0 8.6 4 12.6 10.8 13.5zm16-31.9v18.4c0 8.9-4.3 12.8-10.9 13.5v4.4c9.2-.7 15.5-5.6 15.5-18v-18.3h-4.7zM62.2 199v-2.2c0-12.7-8.8-17.4-21-17.4-12.1 0-20.7 4.7-20.7 17.4v2.2c0 12.8 8.6 17.6 20.7 17.6 1.5 0 3-.1 4.4-.3l11.8 6.2 2-3.3-8.2-4-6.4-3.1a32 32 0 01-3.6.2c-9.8 0-16-3.9-16-13.3v-2.2c0-9.3 6.2-13.1 16-13.1 9.9 0 16.3 3.8 16.3 13.1v2.2c0 5.3-2.1 8.7-5.6 10.8l4.8 2.4c3.4-2.8 5.5-7 5.5-13.2zM168 215.6h5.1L156 179.7h-4.8l17 36zM143 205l7.4-15.7-2.4-5-15.1 31.4h5.1l3.3-7h18.3l-1.8-3.7H143zm133.7 10.7h5.2l-17.3-35.9h-4.8l17 36zm-25-10.7l7.4-15.7-2.4-5-15.1 31.4h5.1l3.3-7h18.3l-1.7-3.7h-14.8zm73.8-2.5c6-1.2 9-5.4 9-11.4 0-8-4.5-10.9-12.9-10.9h-21.4v35.5h4.6v-31.3h16.5c5 0 8.5 1.4 8.5 6.7 0 5.2-3.5 7.7-8.5 7.7h-11.4v4.1h10.7l9.3 12.8h5.5l-9.9-13.2zm-117.4 9.9c-9.7 0-14.7-2.5-18.6-6.3l-2.2 3.8c5.1 5 11 6.7 21 6.7 1.6 0 3.1-.1 4.6-.3l-1.9-4h-3zm18.4-7c0-6.4-4.7-8.6-13.8-9.4l-10.1-1c-6.7-.7-9.3-2.2-9.3-5.6 0-2.5 1.4-4 4.6-5l-1.8-3.8c-4.7 1.4-7.5 4.2-7.5 8.9 0 5.2 3.4 8.7 13 9.6l11.3 1.2c6.4.6 8.9 2 8.9 5.4 0 2.7-2.1 4.7-6 5.8l1.8 3.9c5.3-1.6 8.9-4.7 8.9-10zm-20.3-21.9c7.9 0 13.3 1.8 18.1 5.7l1.8-3.9a30 30 0 00-19.6-5.9c-2 0-4 .1-5.7.3l1.9 4 3.5-.2z" />
-	<path fill="#00B4FF"
-		d="M.5 251.9c29.6-.5 59.2-.8 88.8-1l88.7-.3 88.7.3 44.4.4 44.4.6-44.4.6-44.4.4-88.7.3-88.7-.3a7981 7981 0 01-88.8-1z" />
-	<path fill="none" d="M-565.2 324H-252v15.8h-313.2z" />
-</svg>

src/components/CommandCard.vue

@@ -77,9 +77,9 @@
       <q-card
         @click="handleCardClick"
         v-ripple
+        :class="{ [`text-${disabledColor}`]: !isCommandActivated }"
         :style="{
-          color: isCommandActivated ? 'unset' : 'grey',
-          background: $q.dark.isActive ? '#ffffff08' : '#00000008',
+          background: cardBgColor,
         }"
       >
         <q-card-section>
@@ -183,20 +183,17 @@
             class="row justify-end items-center q-gutter-xs"
             v-show="cardStyleVars.showLanguages"
           >
-            <span :style="'color:' + allProgrammings[commandInfo.program].color"
-              >●</span
-            >
+            <span :class="`text-${programColor}`">●</span>
             <span class="text-subtitle2">{{ commandInfo.program }}</span>
             <!-- mini 和 small 模式下不显示适配系统 -->
             <!-- 适配系统 -->
-            <div class="flex" v-show="cardStyleVars.showPlatforms">
-              |&nbsp;
-              <img
-                width="16"
+            <div class="q-gutter-xs" v-show="cardStyleVars.showPlatforms">
+              <span
                 v-for="platform in commandInfo.features.platform"
                 :key="platform"
-                :src="'/img/' + platform + '.svg'"
-              />
+                :class="`iconfont icon-${platformTypes[platform].icon} text-${programColor}`"
+                style="font-size: 12px"
+              ></span>
             </div>
           </div>
         </q-card-section>
@@ -207,6 +204,7 @@
 
 <script>
 import commandTypes from "../js/options/commandTypes.js";
+import platformTypes from "../js/options/platformTypes.js";
 
 export default {
   data() {
@@ -214,6 +212,7 @@ export default {
       allProgrammings: this.$programmings,
       maxCmdStingLen: 8,
       commandTypes: commandTypes,
+      platformTypes: platformTypes,
     };
   },
   computed: {
@@ -250,11 +249,22 @@ export default {
     // 匹配类型的颜色
     matchTypeColor() {
       return (cmdType = "key") => {
-        if (!this.isCommandActivated)
-          return this.$q.dark.isActive ? "grey-9" : "grey-5";
-        return this.commandTypes[cmdType].color;
+        return this.isCommandActivated
+          ? this.commandTypes[cmdType].color
+          : this.disabledColor;
       };
     },
+    programColor() {
+      return this.isCommandActivated
+        ? this.allProgrammings[this.commandInfo.program].color
+        : this.disabledColor;
+    },
+    disabledColor() {
+      return this.$q.dark.isActive ? "grey-9" : "grey-5";
+    },
+    cardBgColor() {
+      return this.$q.dark.isActive ? "#ffffff08" : "#00000008";
+    },
   },
   props: {
     commandInfo: Object,

src/components/CommandEditor.vue

@@ -214,11 +214,11 @@ export default {
           ? this.$utools.getDB(this.$utools.DBPRE.CFG + "preferences")
               ?.codeHistory[this.action.type]
           : this.action.data;
-      _.merge(this.quickcommandInfo, quickCommandInfo);
+      Object.assign(this.quickcommandInfo, _.cloneDeep(quickCommandInfo));
       // monaco 相关
       this.$refs.editor.setEditorValue(this.quickcommandInfo.cmd);
       this.setLanguage(this.quickcommandInfo.program);
-      this.$refs.editor.setCursorPosition(this.quickcommandInfo.cursorPosition)
+      this.$refs.editor.setCursorPosition(this.quickcommandInfo.cursorPosition);
       // 默认命令不可编辑
       if (this.quickcommandInfo.tags?.includes("默认") && !utools.isDev()) {
         this.canCommandSave = false;

src/components/CommandSideBar.vue

@@ -218,7 +218,7 @@
             transition-hide="jump-up"
             borderless
             square
-            :options="['win32', 'linux', 'darwin']"
+            :options="Object.keys(platformTypes)"
             use-chips
             @blur="platformVerify()"
             v-model="currentCommand.features.platform"
@@ -228,6 +228,28 @@
             <template v-slot:prepend>
               <q-icon color="primary" name="window" />
             </template>
+            <template v-slot:selected-item="scope">
+              <q-chip
+                removable
+                dense
+                @remove="scope.removeAtIndex(scope.index)"
+                :tabindex="scope.tabindex"
+              >
+                {{ platformTypes[scope.opt].label }}
+              </q-chip>
+            </template>
+            <template v-slot:option="scope">
+              <q-item v-bind="scope.itemProps">
+                <q-item-section avatar>
+                  <span
+                    :class="`iconfont icon-${platformTypes[scope.opt].icon}`"
+                  ></span>
+                </q-item-section>
+                <q-item-section>
+                  <q-item-label v-html="platformTypes[scope.opt].label" />
+                </q-item-section>
+              </q-item>
+            </template>
           </q-select>
         </div>
       </div>
@@ -244,6 +266,7 @@
 import commandTypes from "../js/options/commandTypes.js";
 import outputTypes from "../js/options/outputTypes.js";
 import specialVars from "../js/options/specialVars.js";
+import platformTypes from "../js/options/platformTypes.js";
 import iconPicker from "components/IconPicker.vue";
 let commandTypesOptions = Object.values(commandTypes);
 
@@ -261,6 +284,7 @@ export default {
         },
       },
       commandTypes: commandTypes,
+      platformTypes: platformTypes,
       commandTypesOptions: commandTypesOptions,
       currentMatchType: "关键字",
       cmdType: commandTypesOptions[0],
@@ -293,9 +317,9 @@ export default {
       let currentQuickCommandCmds = this.getCommandType();
       this.cmdType = this.commandTypes[currentQuickCommandCmds.type];
       this.cmdMatch = currentQuickCommandCmds.match;
-      _.merge(
+      Object.assign(
         this.currentCommand,
-        _.pick(this.quickcommandInfo, "tags", "output", "features")
+        _.cloneDeep(_.pick(this.quickcommandInfo, "tags", "output", "features"))
       );
       this.setIcon(this.quickcommandInfo.program);
       this.platformVerify();
@@ -326,7 +350,7 @@ export default {
     // 平台为空自动补充
     platformVerify() {
       this.currentCommand.features.platform?.length > 0 ||
-        this.currentCommand.features.platform.push(window.processPlatform);
+        (this.currentCommand.features.platform = [window.processPlatform]);
     },
     // 正则不和规则自动加斜杠
     regexVerify() {

src/css/app.css

@@ -1 +1,27 @@
 /* app global css */
+@font-face {
+  font-family: "iconfont";
+  src: url("../fonts/iconfont.woff2?t=1649900426635") format("woff2"),
+    url("../fonts/iconfont.woff?t=1649900426635") format("woff"),
+    url("../fonts/iconfont.ttf?t=1649900426635") format("truetype");
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-linux:before {
+  content: "\e6c1";
+}
+
+.icon-macos1:before {
+  content: "\e6b2";
+}
+
+.icon-windows1:before {
+  content: "\e6bb";
+}

src/js/options/platformTypes.js

@@ -0,0 +1,19 @@
+const platformTypes = {
+    win32: {
+        name: "win32",
+        label: "Windows",
+        icon: "windows1"
+    },
+    darwin: {
+        name: "darwin",
+        label: "MacOS",
+        icon: "macos1"
+    },
+    linux: {
+        name: "linux",
+        label: "Linux",
+        icon: "linux"
+    }
+}
+
+export default platformTypes

src/js/options/programs.js

@@ -1,107 +1,107 @@
 /**
  * 所有支持的编程语言
-*/
+ */
 
 const programs = {
-  quickcommand: {
-    name: "quickcommand",
-    highlight: "javascript",
-    bin: "",
-    argv: "",
-    ext: "",
-    color: "#006e54",
-  },
-  shell: {
-    name: "shell",
-    bin: "bash",
-    argv: "",
-    ext: "sh",
-    color: "#89e051",
-  },
-  applescript: {
-    name: "applescript",
-    bin: "osascript",
-    argv: "",
-    ext: "scpt",
-    color: "#101F1F",
-  },
-  cmd: {
-    name: "cmd",
-    highlight: "bat",
-    bin: "",
-    argv: "",
-    ext: "bat",
-    color: "#C1F12E",
-  },
-  powershell: {
-    name: "powershell",
-    bin: "powershell",
-    argv: "-NoProfile -File",
-    ext: "ps1",
-    color: "#012456",
-  },
-  python: {
-    name: "python",
-    bin: "python",
-    argv: "-u",
-    ext: "py",
-    color: "#3572A5",
-  },
-  javascript: {
-    name: "javascript",
-    bin: "node",
-    argv: "",
-    ext: "js",
-    color: "#f1e05a",
-  },
-  ruby: {
-    name: "ruby",
-    bin: "ruby",
-    argv: "",
-    ext: "rb",
-    color: "#701516",
-  },
-  php: {
-    name: "php",
-    bin: "php",
-    argv: "",
-    ext: "php",
-    color: "#4F5D95",
-  },
-  c: {
-    name: "c",
-    bin: "gcc",
-    argv: "-o",
-    ext: "c",
-    color: "#555555",
-  },
-  csharp: {
-    name: "csharp",
-    bin: "C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\csc.exe",
-    argv: "/Nologo",
-    ext: "cs",
-    color: "#178600",
-  },
-  lua: {
-    name: "lua",
-    bin: "lua",
-    argv: "",
-    ext: "lua",
-    color: "#000080",
-  },
-  perl: {
-    name: "perl",
-    bin: "perl",
-    argv: "",
-    ext: "pl",
-    color: "#0298c3",
-  },
-  custom: {
-    name: "custom",
-    bin: "",
-    argv: "",
-    ext: "",
-    color: "#438eff",
-  },
+    quickcommand: {
+        name: "quickcommand",
+        highlight: "javascript",
+        bin: "",
+        argv: "",
+        ext: "",
+        color: "primary",
+    },
+    shell: {
+        name: "shell",
+        bin: "bash",
+        argv: "",
+        ext: "sh",
+        color: "green-6",
+    },
+    applescript: {
+        name: "applescript",
+        bin: "osascript",
+        argv: "",
+        ext: "scpt",
+        color: "cyan-10",
+    },
+    cmd: {
+        name: "cmd",
+        highlight: "bat",
+        bin: "",
+        argv: "",
+        ext: "bat",
+        color: "orange-10",
+    },
+    powershell: {
+        name: "powershell",
+        bin: "powershell",
+        argv: "-NoProfile -File",
+        ext: "ps1",
+        color: "amber-14",
+    },
+    python: {
+        name: "python",
+        bin: "python",
+        argv: "-u",
+        ext: "py",
+        color: "light-blue-10",
+    },
+    javascript: {
+        name: "javascript",
+        bin: "node",
+        argv: "",
+        ext: "js",
+        color: "teal",
+    },
+    ruby: {
+        name: "ruby",
+        bin: "ruby",
+        argv: "",
+        ext: "rb",
+        color: "red-10",
+    },
+    php: {
+        name: "php",
+        bin: "php",
+        argv: "",
+        ext: "php",
+        color: "deep-purple",
+    },
+    c: {
+        name: "c",
+        bin: "gcc",
+        argv: "-o",
+        ext: "c",
+        color: "blue-7",
+    },
+    csharp: {
+        name: "csharp",
+        bin: "C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\csc.exe",
+        argv: "/Nologo",
+        ext: "cs",
+        color: "light-blue-13",
+    },
+    lua: {
+        name: "lua",
+        bin: "lua",
+        argv: "",
+        ext: "lua",
+        color: "light-green-8",
+    },
+    perl: {
+        name: "perl",
+        bin: "perl",
+        argv: "",
+        ext: "pl",
+        color: "purple",
+    },
+    custom: {
+        name: "custom",
+        bin: "",
+        argv: "",
+        ext: "",
+        color: "indigo-6",
+    },
 };
 export default programs