OutPutEditor添加键入建议变量名功能，并加入重名检测

2025-06-07 05:25:39 +08:00 · 2025-01-26 17:25:58 +08:00 · 2025-01-26 17:25:58 +08:00 · 73684865ae
commit 73684865ae
parent baf5217132
8 changed files with 124 additions and 48 deletions
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@ -146,12 +146,10 @@ export default defineComponent({
    },
  },
  setup(props) {
-    const getCurrentExistingVar = inject("getCurrentExistingVar");
    // 创建响应式的commandIndex
    const commandIndex = computed(() => props.commandIndex);
    // 主要用于VariableInput组件的变量选择下拉框，获取当前命令的索引
    provide("commandIndex", commandIndex);
-    return { getCurrentExistingVar };
  },
  methods: {
    handleOutputVariableUpdate(result) {
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@ -90,10 +90,6 @@ export default defineComponent({
      default: true,
    },
  },
-  setup() {
-    const getCurrentExistingVar = inject("getCurrentExistingVar");
-    return { getCurrentExistingVar };
-  },
  emits: ["update:modelValue", "add-command", "action"],
  data() {
    return {
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@ -151,7 +151,7 @@ export default defineComponent({
    const getOutputVariables = (flow = getCurrentFlow()) => {
      const variables = [];
      for (const [index, cmd] of flow.commands.entries()) {
-        if (cmd.outputVariable) {
+        if (cmd.outputVariable && cmd.asyncMode !== "then") {
          const { name, details = {} } = cmd.outputVariable;
          variables.push(
            ...[name, ...Object.values(details)].map((variable) => ({
@ -199,12 +199,6 @@ export default defineComponent({

    provide("getCurrentVariables", getCurrentVariables);

-    const getCurrentExistingVar = () => {
-      return [...getCurrentVariables(), ...getCurrentFunctions()];
-    };
-
-    provide("getCurrentExistingVar", getCurrentExistingVar);
-
    return {
      flows,
      mainFlow,
@ -352,6 +346,7 @@ export default defineComponent({
            "placeholder",
            "summary",
            "type",
+            "defaultOutputVariable",
          ];
          uselessProps.forEach((prop) => delete cmdCopy[prop]);
          return cmdCopy;
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@ -3,7 +3,7 @@
    <OperationCard
      v-if="hasSubCommands"
      :model-value="funcName"
-      @update:model-value="funcName = $event"
+      @update:model-value="updateFuncName"
      :options="localCommand.subCommands"
    />
    <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
@ -204,6 +204,15 @@ export default defineComponent({
        width: `calc(${columnWidth}% - var(--grid-gap))`,
      };
    },
+    updateFuncName(value) {
+      this.funcName = value;
+      // 如果切换了子命令，更新输出变量
+      const selectSubCommand = this.getSelectSubCommand(value);
+      if (!selectSubCommand) return;
+      const newModelValue = { ...this.modelValue, value: value };
+      delete newModelValue.outputVariable;
+      this.$emit("update:modelValue", newModelValue);
+    },
  },
  mounted() {
    const argvs = this.modelValue.argvs || this.defaultArgvs;
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@ -10,6 +10,7 @@
        <OutputField
          v-model="simpleOutputVar"
          :label="currentOutputs?.label || '输出变量名'"
+          :suggest-name="currentOutputs?.suggestName"
          autofocus
          :show-variable-list="true"
          class="q-px-sm"
@ -131,6 +132,12 @@ export default defineComponent({
        (cmd) => cmd.value === this.command.value
      );
    },
+    defaultOutputVariable() {
+      return (
+        this.currentSubCommand?.defaultOutputVariable ||
+        this.command.defaultOutputVariable
+      );
+    },
    commandName() {
      return this.currentSubCommand.label || this.command.label;
    },
@ -158,35 +165,36 @@ export default defineComponent({
  },
  watch: {
    "command.outputVariable": {
-      immediate: true,
-      deep: true,
-      handler(newValue) {
-        this.initOutputVars(newValue);
+      handler(value) {
+        this.initOutputVars(value);
      },
+      immediate: true,
    },
    "command.asyncMode": {
-      immediate: true,
-      handler(newValue) {
-        this.asyncMode = newValue;
+      handler(value) {
+        this.asyncMode = value;
      },
+      immediate: true,
    },
    "command.callbackFunc": {
-      immediate: true,
-      handler(newValue) {
-        this.callbackFunc = newValue;
+      handler(value) {
+        this.callbackFunc = value;
      },
+      immediate: true,
    },
  },
  methods: {
-    initOutputVars(outputVariable) {
+    initOutputVars(value) {
+      const outputVariable = value || this.defaultOutputVariable;
      // 初始化完整输出变量名
-      if (!outputVariable) return;
-      this.simpleOutputVar = outputVariable.name || "";
-
-      if (this.currentOutputs) {
-        // 初始化详细输出变量，直接使用扁平化的结构
-        this.outputVars = outputVariable?.details || {};
+      if (!outputVariable) {
+        this.simpleOutputVar = "";
+        this.outputVars = {};
+        return;
      }
+
+      this.simpleOutputVar = outputVariable.name;
+      this.outputVars = outputVariable.details;
    },
    handleConfirm() {
      const outputVariable = {};
--- a/src/components/composer/card/output/OutputField.vue
+++ b/src/components/composer/card/output/OutputField.vue
@ -13,6 +13,21 @@
      <div class="variable-label">{{ label }}</div>
    </template>
    <template v-slot:append>
+      <q-btn
+        v-if="suggestName"
+        flat
+        dense
+        @click="updateSuggestName(suggestName)"
+      >
+        <q-icon
+          name="emoji_objects"
+          size="14px"
+          :style="{
+            opacity: 0.8,
+          }"
+        />
+        <q-tooltip> 取名困难症？点我！ </q-tooltip>
+      </q-btn>
      <VariableList
        :show-variable-list="showVariableList"
        :show-function-list="showFunctionList"
@ -35,7 +50,7 @@
 </template>

 <script>
-import { defineComponent } from "vue";
+import { defineComponent, inject } from "vue";
 import VariableList from "components/composer/common/varinput/VariableList.vue";

 export default defineComponent({
@ -55,6 +70,10 @@ export default defineComponent({
      type: String,
      default: "",
    },
+    suggestName: {
+      type: String,
+      default: "",
+    },
    autofocus: {
      type: Boolean,
      default: false,
@ -77,6 +96,31 @@ export default defineComponent({
    updateValBySelect(_type, val) {
      this.$emit("update:modelValue", val);
    },
+    updateSuggestName(val) {
+      const existingNames = this.getExistingFuncAndParams();
+      // 重名检测，主要检测函数名和参数名
+      if (existingNames.includes(val)) {
+        quickcommand.showMessageBox(
+          "和已有函数名和参数名重复，已自动添加下划线前缀",
+          "warning"
+        );
+        val = "_" + val;
+      }
+      this.$emit("update:modelValue", val);
+    },
+  },
+  setup() {
+    const getCurrentFunctions = inject("getCurrentFunctions");
+    const getCurrentVariables = inject("getCurrentVariables");
+    const getExistingFuncAndParams = () => {
+      return [
+        ...getCurrentFunctions(),
+        ...getCurrentVariables().filter((v) => v.type === "param"),
+      ].map((v) => v.name);
+    };
+    return {
+      getExistingFuncAndParams,
+    };
  },
 });
 </script>
@ -118,7 +162,7 @@ export default defineComponent({
 }

 .variable-list-btn {
-  padding: 0 12px;
+  padding: 0 12px 0 3px;
 }

 /* 去掉下拉按钮的焦点效果 */
--- a/src/components/composer/card/output/OutputStructure.vue
+++ b/src/components/composer/card/output/OutputStructure.vue
@ -11,6 +11,7 @@
                @update:model-value="updateField(subKey, $event)"
                :label="subOutput.label"
                :placeholder="subOutput.placeholder"
+                :suggest-name="subOutput.suggestName"
                autofocus
              />
            </div>
@ -25,6 +26,7 @@
        @update:model-value="updateField('', $event)"
        :label="output.label"
        :placeholder="output.placeholder"
+        :suggest-name="output.suggestName"
        autofocus
      />
    </div>
@ -78,18 +80,23 @@ export default defineComponent({
      default: () => ({}),
    },
  },
+  data() {
+    return {
+      fixedFields: ["label", "placeholder", "suggestName"],
+    };
+  },
  emits: ["update:modelValue"],
  computed: {
    hasNestedFields() {
      if (!this.output) return false;
      return Object.keys(this.output).some(
-        (key) => key !== "label" && key !== "placeholder"
+        (key) => !this.fixedFields.includes(key)
      );
    },
    getNestedFields() {
      const fields = {};
      Object.entries(this.output).forEach(([key, value]) => {
-        if (key !== "label" && key !== "placeholder") {
+        if (!this.fixedFields.includes(key)) {
          fields[key] = value;
        }
      });
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@ -15,31 +15,46 @@ export const macosCommands = {
          icon: "front_hand",
          outputs: {
            label: "前台应用信息",
+            suggestName: "frontmostApp",
            structure: {
-              name: { label: "应用名称" },
-              displayedName: { label: "应用显示名称" },
-              path: { label: "应用路径" },
-              version: { label: "应用版本" },
-              pid: { label: "应用进程ID" },
-              backgroundOnly: { label: "是否后台运行" },
-              visible: { label: "是否可见" },
-              frontmost: { label: "是否前台运行" },
+              name: { label: "应用名称", suggestName: "appName" },
+              displayedName: {
+                label: "应用显示名称",
+                suggestName: "appDisplayName",
+              },
+              path: { label: "应用路径", suggestName: "appPath" },
+              version: { label: "应用版本", suggestName: "appVersion" },
+              pid: { label: "应用进程ID", suggestName: "appPid" },
+              backgroundOnly: {
+                label: "是否后台运行",
+                suggestName: "appBackgroundOnly",
+              },
+              visible: { label: "是否可见", suggestName: "appVisible" },
+              frontmost: { label: "是否前台运行", suggestName: "appFrontmost" },
              window: {
                label: "窗口信息",
-                name: { label: "窗口名称" },
-                title: { label: "窗口标题" },
-                index: { label: "窗口索引" },
+                name: { label: "窗口名称", suggestName: "windowName" },
+                title: { label: "窗口标题", suggestName: "windowTitle" },
+                index: { label: "窗口索引", suggestName: "windowIndex" },
                position: {
                  label: "窗口位置",
                  placeholder:
                    "数组， 第一个元素是 x 坐标，第二个元素是 y 坐标",
+                  suggestName: "windowPosition",
                },
                size: {
                  label: "窗口大小",
                  placeholder: "数组， 第一个元素是宽度，第二个元素是高度",
+                  suggestName: "windowSize",
+                },
+                minimized: {
+                  label: "是否最小化",
+                  suggestName: "windowMinimized",
+                },
+                fullscreen: {
+                  label: "是否全屏",
+                  suggestName: "windowFullscreen",
                },
-                minimized: { label: "是否最小化" },
-                fullscreen: { label: "是否全屏" },
              },
            },
          },
@ -48,6 +63,10 @@ export const macosCommands = {
          value: "quickcomposer.macos.app.getRunningApps",
          label: "获取活动应用",
          icon: "list",
+          outputs: {
+            label: "活动应用列表（数组）",
+            suggestName: "runningApps",
+          },
        },
        {
          value: "quickcomposer.macos.app.launch",