mirror of
https://github.com/fofolee/uTools-quickcommand.git
synced 2025-06-09 06:54:11 +08:00
编排初步实现条件判断
This commit is contained in:
parent
b532630ab9
commit
e59b04ad5c
@ -41,6 +41,7 @@
|
|||||||
dense
|
dense
|
||||||
class="output-btn q-px-sm q-mr-sm"
|
class="output-btn q-px-sm q-mr-sm"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
v-if="showOutputBtn"
|
||||||
@click="handleToggleOutput"
|
@click="handleToggleOutput"
|
||||||
>
|
>
|
||||||
<q-tooltip>
|
<q-tooltip>
|
||||||
@ -67,6 +68,7 @@
|
|||||||
dense
|
dense
|
||||||
round
|
round
|
||||||
icon="play_arrow"
|
icon="play_arrow"
|
||||||
|
v-if="showRunBtn"
|
||||||
class="run-btn q-px-sm q-mr-sm"
|
class="run-btn q-px-sm q-mr-sm"
|
||||||
size="sm"
|
size="sm"
|
||||||
@click="runCommand"
|
@click="runCommand"
|
||||||
@ -113,30 +115,40 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { defineComponent, inject } from "vue";
|
import { defineComponent, inject, defineAsyncComponent } from "vue";
|
||||||
import KeyEditor from "components/composer/ui/KeyEditor.vue";
|
import { validateVariableName } from "js/common/variableValidator";
|
||||||
import UBrowserEditor from "components/composer/ubrowser/UBrowserEditor.vue";
|
|
||||||
import VariableInput from "components/composer/ui/VariableInput.vue";
|
import VariableInput from "components/composer/ui/VariableInput.vue";
|
||||||
import MultiParamInput from "components/composer/ui/MultiParamInput.vue";
|
import MultiParamInput from "components/composer/ui/MultiParamInput.vue";
|
||||||
import AxiosConfigEditor from "components/composer/http/AxiosConfigEditor.vue";
|
|
||||||
import SymmetricCryptoEditor from "components/composer/crypto/SymmetricCryptoEditor.vue";
|
|
||||||
import AsymmetricCryptoEditor from "components/composer/crypto/AsymmetricCryptoEditor.vue";
|
|
||||||
import FunctionSelector from "components/composer/ui/FunctionSelector.vue";
|
|
||||||
import RegexEditor from "components/composer/regex/RegexEditor.vue";
|
|
||||||
import { validateVariableName } from "js/common/variableValidator";
|
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: "ComposerCard",
|
name: "ComposerCard",
|
||||||
components: {
|
components: {
|
||||||
KeyEditor,
|
|
||||||
UBrowserEditor,
|
|
||||||
VariableInput,
|
VariableInput,
|
||||||
MultiParamInput,
|
MultiParamInput,
|
||||||
AxiosConfigEditor,
|
KeyEditor: defineAsyncComponent(() =>
|
||||||
SymmetricCryptoEditor,
|
import("components/composer/ui/KeyEditor.vue")
|
||||||
AsymmetricCryptoEditor,
|
),
|
||||||
FunctionSelector,
|
UBrowserEditor: defineAsyncComponent(() =>
|
||||||
RegexEditor,
|
import("components/composer/ubrowser/UBrowserEditor.vue")
|
||||||
|
),
|
||||||
|
AxiosConfigEditor: defineAsyncComponent(() =>
|
||||||
|
import("components/composer/http/AxiosConfigEditor.vue")
|
||||||
|
),
|
||||||
|
SymmetricCryptoEditor: defineAsyncComponent(() =>
|
||||||
|
import("components/composer/crypto/SymmetricCryptoEditor.vue")
|
||||||
|
),
|
||||||
|
AsymmetricCryptoEditor: defineAsyncComponent(() =>
|
||||||
|
import("components/composer/crypto/AsymmetricCryptoEditor.vue")
|
||||||
|
),
|
||||||
|
FunctionSelector: defineAsyncComponent(() =>
|
||||||
|
import("components/composer/ui/FunctionSelector.vue")
|
||||||
|
),
|
||||||
|
RegexEditor: defineAsyncComponent(() =>
|
||||||
|
import("components/composer/regex/RegexEditor.vue")
|
||||||
|
),
|
||||||
|
ConditionalJudgment: defineAsyncComponent(() =>
|
||||||
|
import("components/composer/control/ConditionalJudgment.vue")
|
||||||
|
),
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
command: {
|
command: {
|
||||||
@ -203,6 +215,12 @@ export default defineComponent({
|
|||||||
this.$emit("update:command", updatedCommand);
|
this.$emit("update:command", updatedCommand);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
showRunBtn() {
|
||||||
|
return !this.command.isControlFlow;
|
||||||
|
},
|
||||||
|
showOutputBtn() {
|
||||||
|
return !this.command.isControlFlow;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
setup() {
|
setup() {
|
||||||
const addVariable = inject("addVariable");
|
const addVariable = inject("addVariable");
|
||||||
|
235
src/components/composer/control/ConditionalJudgment.vue
Normal file
235
src/components/composer/control/ConditionalJudgment.vue
Normal file
@ -0,0 +1,235 @@
|
|||||||
|
<template>
|
||||||
|
<div class="row items-center no-wrap">
|
||||||
|
<!-- 下拉按钮 -->
|
||||||
|
<q-btn-dropdown
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
class="condition-type-btn"
|
||||||
|
:class="{ 'text-primary': type !== 'end' }"
|
||||||
|
>
|
||||||
|
<q-list>
|
||||||
|
<q-item
|
||||||
|
v-for="option in options"
|
||||||
|
:key="option.value"
|
||||||
|
clickable
|
||||||
|
v-close-popup
|
||||||
|
@click="handleTypeChange(option.value)"
|
||||||
|
:active="type === option.value"
|
||||||
|
>
|
||||||
|
<q-item-section>
|
||||||
|
<q-item-label>{{ option.label }}</q-item-label>
|
||||||
|
</q-item-section>
|
||||||
|
</q-item>
|
||||||
|
</q-list>
|
||||||
|
</q-btn-dropdown>
|
||||||
|
|
||||||
|
<!-- 显示选中的类型文本 -->
|
||||||
|
<div class="condition-type-text q-mx-sm">
|
||||||
|
{{ getTypeLabel }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 条件表达式输入框和按钮 -->
|
||||||
|
<template v-if="type !== 'end'">
|
||||||
|
<template v-if="type === 'else'">
|
||||||
|
<!-- 否则的条件按钮 -->
|
||||||
|
<q-btn
|
||||||
|
v-if="!showElseCondition"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
size="sm"
|
||||||
|
class="condition-add-btn"
|
||||||
|
icon="add"
|
||||||
|
@click="showElseCondition = true"
|
||||||
|
>
|
||||||
|
<q-tooltip>添加条件</q-tooltip>
|
||||||
|
</q-btn>
|
||||||
|
<!-- 否则的条件输入框 -->
|
||||||
|
<q-input
|
||||||
|
v-else
|
||||||
|
v-model="condition"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
class="col condition-input"
|
||||||
|
placeholder="请输入条件表达式"
|
||||||
|
@update:model-value="handleConditionChange"
|
||||||
|
>
|
||||||
|
<template v-slot:prepend>
|
||||||
|
<q-icon name="code" />
|
||||||
|
</template>
|
||||||
|
<template v-slot:append>
|
||||||
|
<q-btn dense flat round icon="close" @click="clearElseCondition" />
|
||||||
|
</template>
|
||||||
|
</q-input>
|
||||||
|
</template>
|
||||||
|
<!-- 如果的条件输入框 -->
|
||||||
|
<q-input
|
||||||
|
v-else
|
||||||
|
v-model="condition"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
class="col condition-input"
|
||||||
|
placeholder="请输入条件表达式"
|
||||||
|
@update:model-value="handleConditionChange"
|
||||||
|
>
|
||||||
|
<template v-slot:prepend>
|
||||||
|
<q-icon name="code" />
|
||||||
|
</template>
|
||||||
|
</q-input>
|
||||||
|
</template>
|
||||||
|
<!-- 结束如果时的占位 -->
|
||||||
|
<div v-else class="col"></div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
name: "ConditionalJudgment",
|
||||||
|
|
||||||
|
props: {
|
||||||
|
modelValue: {
|
||||||
|
type: String,
|
||||||
|
default: "",
|
||||||
|
},
|
||||||
|
command: {
|
||||||
|
type: Object,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
emits: ["update:modelValue"],
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
options: [
|
||||||
|
{ label: "如果", value: "if" },
|
||||||
|
{ label: "否则", value: "else" },
|
||||||
|
{ label: "结束判断", value: "end" },
|
||||||
|
],
|
||||||
|
type: "if",
|
||||||
|
condition: "",
|
||||||
|
showElseCondition: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
getTypeLabel() {
|
||||||
|
switch (this.type) {
|
||||||
|
case "if":
|
||||||
|
return "如果满足:";
|
||||||
|
case "else":
|
||||||
|
return this.showElseCondition ? "否则,满足:" : "否则:";
|
||||||
|
case "end":
|
||||||
|
return "结束条件判断";
|
||||||
|
default:
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
created() {
|
||||||
|
// 解析初始值
|
||||||
|
if (this.modelValue) {
|
||||||
|
const match = this.modelValue.match(
|
||||||
|
/^(if|else if|else|end)(?:\((.*)\))?$/
|
||||||
|
);
|
||||||
|
if (match) {
|
||||||
|
if (match[1] === "else if") {
|
||||||
|
this.type = "else";
|
||||||
|
this.condition = match[2] || "";
|
||||||
|
this.showElseCondition = true;
|
||||||
|
} else {
|
||||||
|
this.type = match[1];
|
||||||
|
this.condition = match[2] || "";
|
||||||
|
this.showElseCondition = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
generateCode() {
|
||||||
|
switch (this.type) {
|
||||||
|
case "if":
|
||||||
|
return `if (${this.condition}) {`;
|
||||||
|
case "else":
|
||||||
|
return this.condition
|
||||||
|
? `} else if (${this.condition}) {`
|
||||||
|
: "} else {";
|
||||||
|
case "end":
|
||||||
|
return "}";
|
||||||
|
default:
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
handleTypeChange(value) {
|
||||||
|
this.type = value;
|
||||||
|
if (this.type === "end") {
|
||||||
|
this.condition = "";
|
||||||
|
this.showElseCondition = false;
|
||||||
|
}
|
||||||
|
this.$emit("update:modelValue", this.generateCode());
|
||||||
|
},
|
||||||
|
|
||||||
|
handleConditionChange() {
|
||||||
|
this.$emit("update:modelValue", this.generateCode());
|
||||||
|
},
|
||||||
|
|
||||||
|
clearElseCondition() {
|
||||||
|
this.condition = "";
|
||||||
|
this.showElseCondition = false;
|
||||||
|
this.$emit("update:modelValue", this.generateCode());
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.condition-type-btn {
|
||||||
|
min-width: 32px;
|
||||||
|
width: 32px;
|
||||||
|
height: 36px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-type-btn :deep(.q-btn__content) {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-type-btn :deep(.q-icon) {
|
||||||
|
font-size: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-type-text {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--q-primary);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-add-btn {
|
||||||
|
margin-left: 4px;
|
||||||
|
opacity: 0.7;
|
||||||
|
height: 36px;
|
||||||
|
color: var(--q-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-add-btn:hover {
|
||||||
|
opacity: 1;
|
||||||
|
background: rgba(var(--q-primary-rgb), 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-input {
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition-input :deep(.q-field__control) {
|
||||||
|
padding-right: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 暗色模式适配 */
|
||||||
|
.body--dark .condition-type-text {
|
||||||
|
color: var(--q-primary);
|
||||||
|
}
|
||||||
|
</style>
|
@ -76,7 +76,9 @@
|
|||||||
<!-- 正则表达式构建工具 -->
|
<!-- 正则表达式构建工具 -->
|
||||||
<transition
|
<transition
|
||||||
name="builder"
|
name="builder"
|
||||||
@enter="el => el.scrollIntoView({ behavior: 'smooth', block: 'nearest' })"
|
@enter="
|
||||||
|
(el) => el.scrollIntoView({ behavior: 'smooth', block: 'nearest' })
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<div v-if="showBuilder" class="builder-container">
|
<div v-if="showBuilder" class="builder-container">
|
||||||
<RegexBuilder :selection="selection" @insert="insertPattern" />
|
<RegexBuilder :selection="selection" @insert="insertPattern" />
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<transition
|
<transition
|
||||||
name="tester"
|
name="tester"
|
||||||
@enter="el => el.scrollIntoView({ behavior: 'smooth', block: 'nearest' })"
|
@enter="(el) => el.scrollIntoView({ behavior: 'smooth', block: 'nearest' })"
|
||||||
>
|
>
|
||||||
<div class="regex-tester" v-if="shouldShowPreview">
|
<div class="regex-tester" v-if="shouldShowPreview">
|
||||||
<div class="matches">
|
<div class="matches">
|
||||||
|
12
src/js/composer/commands/controlCommands.js
Normal file
12
src/js/composer/commands/controlCommands.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
export const controlCommands = {
|
||||||
|
label: "流程控制",
|
||||||
|
icon: "call_split",
|
||||||
|
commands: [
|
||||||
|
{
|
||||||
|
value: "condition",
|
||||||
|
label: "条件判断",
|
||||||
|
component: "ConditionalJudgment",
|
||||||
|
isControlFlow: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
@ -5,6 +5,7 @@ import { notifyCommands } from "./notifyCommands";
|
|||||||
import { textProcessingCommands } from "./textProcessingCommands";
|
import { textProcessingCommands } from "./textProcessingCommands";
|
||||||
import { otherCommands } from "./otherCommands";
|
import { otherCommands } from "./otherCommands";
|
||||||
import { keyCommands } from "./keyCommands";
|
import { keyCommands } from "./keyCommands";
|
||||||
|
import { controlCommands } from "./controlCommands";
|
||||||
|
|
||||||
export const commandCategories = [
|
export const commandCategories = [
|
||||||
fileCommands,
|
fileCommands,
|
||||||
@ -12,6 +13,7 @@ export const commandCategories = [
|
|||||||
systemCommands,
|
systemCommands,
|
||||||
notifyCommands,
|
notifyCommands,
|
||||||
textProcessingCommands,
|
textProcessingCommands,
|
||||||
|
controlCommands,
|
||||||
otherCommands,
|
otherCommands,
|
||||||
keyCommands,
|
keyCommands,
|
||||||
];
|
];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user