@@ -86,9 +92,13 @@ const addType = (type) => {
data = {
name: '抄送人',
type: 2,
- ccSelfSelectFlag: 1,
- childNode: props.childNodeP,
- nodeUserList: []
+ error: true,
+ // 抄送节点配置
+ attributes : {
+ candidateStrategy: undefined,
+ candidateParam: undefined
+ },
+ childNode: props.childNodeP
}
}
emits('update:childNodeP', data)
diff --git a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue
index 089a6ac1..cbcec808 100644
--- a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue
+++ b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue
@@ -2,7 +2,6 @@
([]) // 角色列表
const postOptions = ref([]) // 岗位列表
const userOptions = ref([]) // 用户列表
@@ -183,7 +177,7 @@ const candidateConfig = ref({
})
let approverConfig = ref({})
let store = useWorkFlowStoreWithOut()
-let { setApprover, setUserTaskConfig } = store
+let { setApproverDrawer, setUserTaskConfig } = store
let approverConfig1 = computed(() => store.approverConfig1)
let approverDrawer = computed(() => store.approverDrawer)
const userTaskConfig = computed(() => store.userTaskConfig)
@@ -233,32 +227,16 @@ const saveConfig = () => {
// flag: true,
// id: approverConfig1.value.id
// })
- const showText = getApproverShowText()
setUserTaskConfig({
value: rawConfig.value,
flag: true,
id: userTaskConfig.value.id,
- showText
})
- console.log('after is userTaskConfig', userTaskConfig.value)
closeDrawer()
}
-const getApproverShowText = () => {
- let appoveMethodText = ''
- approveMethods.forEach((item) => {
- if (item.value == candidateConfig.value.approveMethod) {
- appoveMethodText = item.label
- }
- })
- const strategyText = getDictLabel(
- DICT_TYPE.BPM_TASK_CANDIDATE_STRATEGY,
- candidateConfig.value.candidateStrategy
- )
- return `审批方式：${appoveMethodText}
- 审批人规则类型：按${strategyText}`
-}
+
const closeDrawer = () => {
- setApprover(false)
+ setApproverDrawer(false)
}
const changecandidateStrategy = () => {
candidateConfig.value.candidateParam = []
diff --git a/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue b/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue
new file mode 100644
index 00000000..d8bd01b6
--- /dev/null
+++ b/src/components/SimpleProcessDesigner/src/drawer/copyerDrawer.vue
@@ -0,0 +1,246 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesigner/src/nodeWrap.vue b/src/components/SimpleProcessDesigner/src/nodeWrap.vue
index 034d534b..56112e71 100644
--- a/src/components/SimpleProcessDesigner/src/nodeWrap.vue
+++ b/src/components/SimpleProcessDesigner/src/nodeWrap.vue
@@ -22,12 +22,13 @@
v-if="isInput"
type="text"
class="ant-input editable-title-input"
- @blur="blurEvent()"
- @focus="$event.currentTarget.select()"
+ @blur="blurEvent(-1)"
+ @focus="$event.currentTarget?.select()"
+ v-mountedFoucs
v-model="nodeConfig.name"
:placeholder="defaultText"
/>
- {{ nodeConfig.name }}
+ {{ nodeConfig.name }}
@@ -60,7 +61,8 @@
type="text"
class="ant-input editable-title-input"
@blur="blurEvent(index)"
- @focus="$event.currentTarget.select()"
+ @focus="$event.currentTarget?.select()"
+ v-mountedFoucs
v-model="item.name"
/>