diff --git a/src/components/common/dynamic-input.vue b/src/components/common/dynamic-input.vue
index 06560ef..c46151a 100644
--- a/src/components/common/dynamic-input.vue
+++ b/src/components/common/dynamic-input.vue
@@ -19,8 +19,8 @@ const onCreate = () => {
const dynamicInputRule = [
{
trigger: ['input', 'blur'],
- validator(_: unknown, value: string) {
- if (!value) return new Error('不能为空');
+ validator(_: unknown, value: string | number) {
+ if (!value && value !== 0) return new Error('不能为空');
return true;
}
}
@@ -44,11 +44,11 @@ const typeOptions = [
const boolenOptions = [
{
label: 'true',
- value: 0
+ value: 1
},
{
label: 'false',
- value: 1
+ value: 0
}
];
@@ -58,7 +58,7 @@ const handleUpdateType = (index: number) => {
}
if (content.value[index].type === 'boolean') {
- content.value[index].value = 1;
+ content.value[index].value = 0;
}
if (content.value[index].type === 'number') {
@@ -69,21 +69,21 @@ const handleUpdateType = (index: number) => {
-
-
+
-
-
=
-
+ =
+
@@ -96,35 +96,32 @@ const handleUpdateType = (index: number) => {
-
-
(
-
+
+
+ (
-
-
)
-
+ )
+
+
diff --git a/src/components/workflow/modules/detail/branch-desc.vue b/src/components/workflow/modules/detail/branch-desc.vue
index f4983ca..3120516 100644
--- a/src/components/workflow/modules/detail/branch-desc.vue
+++ b/src/components/workflow/modules/detail/branch-desc.vue
@@ -3,7 +3,7 @@ import { nextTick, onMounted, ref } from 'vue';
import CodeMirror from 'vue-codemirror6';
import { oneDark } from '@codemirror/theme-one-dark';
import { javascript } from '@codemirror/lang-javascript';
-import { expressionRecord, logicalConditionRecord } from '@/constants/business';
+import { expressionRecord } from '@/constants/business';
defineOptions({
name: 'BranchDesc'
@@ -66,9 +66,6 @@ onMounted(() => {
{{ modelValue.nodeName }}
-
- {{ logicalConditionRecord[modelValue.decision?.logicalCondition!] }}
-
{{ expressionRecord[modelValue.decision?.expressionType!] }}
diff --git a/src/components/workflow/modules/drawer/branch-drawer.vue b/src/components/workflow/modules/drawer/branch-drawer.vue
index 5150f8b..98aa087 100644
--- a/src/components/workflow/modules/drawer/branch-drawer.vue
+++ b/src/components/workflow/modules/drawer/branch-drawer.vue
@@ -89,7 +89,6 @@ const checkNodeExpression = async () => {
const rules: FormRules = {
decision: {
- logicalCondition: [{ required: true, message: '请选择判定逻辑', trigger: 'change', type: 'number' }],
expressionType: [{ required: true, message: '请选择表达式类型', trigger: 'change', type: 'number' }],
nodeExpression: [{ required: true, validator: checkNodeExpression, trigger: 'blur' }]
}
diff --git a/src/components/workflow/modules/nodes/branch-node.vue b/src/components/workflow/modules/nodes/branch-node.vue
index 35fb60c..c6a5cb9 100644
--- a/src/components/workflow/modules/nodes/branch-node.vue
+++ b/src/components/workflow/modules/nodes/branch-node.vue
@@ -2,7 +2,7 @@
import { nextTick, ref, watch } from 'vue';
import { $t } from '@/locales';
import { useWorkflowStore } from '@/store/modules/workflow';
-import { expressionRecord, logicalConditionRecord, taskBatchStatusEnum } from '@/constants/business';
+import { expressionRecord, taskBatchStatusEnum } from '@/constants/business';
import BranchDrawer from '../drawer/branch-drawer.vue';
import BranchDetail from '../detail/branch-detail.vue';
import DetailCard from '../common/detail-card.vue';
@@ -92,12 +92,10 @@ const arrTransfer = (index: number, type: number = 1) => {
const toText = (node: Workflow.NodeModelType, currentIndex: number) => {
const { nodeName, decision } = node.conditionNodes![currentIndex];
- const { logicalCondition, expressionType, nodeExpression } = decision!;
+ const { expressionType, nodeExpression } = decision!;
if (nodeExpression) {
if (nodeName !== $t('workflow.node.condition.conditionNodes.otherNodeName')) {
- const text = `${$t('workflow.node.condition.conditionNodes.logicalCondition')}: ${
- logicalConditionRecord[logicalCondition!]
- }\n${$t('workflow.node.condition.conditionNodes.expressionType')}: ${
+ const text = `${$t('workflow.node.condition.conditionNodes.expressionType')}: ${
expressionRecord[expressionType!]
}\n${$t('workflow.node.condition.conditionNodes.nodeExpression')}: ${nodeExpression}`;
return text;
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 85710cb..9029fa3 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -169,7 +169,7 @@ export function parseContent(value?: { key: string; value: string | number | boo
}
if (item.type === 'boolean') {
- obj[item.key] = item.value === 0;
+ obj[item.key] = item.value === 1;
}
if (item.type === 'number') {