adtec-core-package 2.6.8 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.6.8",
+  "version": "2.7.0",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -18,7 +18,12 @@
 import { AiEditor } from 'aieditor'
 import 'aieditor/dist/style.css'
 import { onMounted, onUnmounted, ref, watch, nextTick } from 'vue'
+import type { WatchStopHandle } from 'vue'
 import { ElMessage } from 'element-plus'
+enum WatchType {
+  initWatch = 'initWatch',
+}
+const watchHandlers = ref<Partial<Record<WatchType, WatchStopHandle>>>({});
 
 const divRef = ref()
 let aiEditor: AiEditor | null
@@ -322,29 +327,18 @@ function customStringReplacement(
   return result
 }
 
-watch(
-  () => props.isEdit,
-  (val) => {
-    if (aiEditor) {
-      aiEditor.setEditable(val)
-      //头尾显隐
-      const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
-      if (footer) {
-        footer.style.display = val ? '' : 'none'
-      }
-      const header = divRef.value?.querySelector('aie-header') as HTMLElement
-      if (header) {
-        header.style.display = val ? '' : 'none'
-      }
-    }
-  },
-  { immediate: true },
-)
+
 function initHtml(html: string) {
   html = customStringReplacement(html, '<img', '>', 'height="[0-9]+"', 'height="auto"')
   return convertPtToPx(html)
 }
-
+const stopWatchByType = (type: WatchType) => {
+  const stopHandle = watchHandlers.value[type]
+  if (stopHandle) {
+    stopHandle()
+    delete watchHandlers.value[type]
+  }
+}
 onMounted(() => {
   const config = {
     element: divRef.value as Element,
@@ -363,7 +357,27 @@ onMounted(() => {
         { name: 'Times New Roman', value: 'Times New Roman' },
       ],
     },
-    onCreated: (editor: AiEditor) => {},
+    onCreated: (editor: AiEditor) => {
+      stopWatchByType(WatchType.initWatch)
+      watchHandlers.value[WatchType.initWatch] =watch(
+        () => props.isEdit,
+        (val) => {
+          if (aiEditor) {
+            aiEditor.setEditable(val)
+            //头尾显隐
+            const footer = divRef.value?.querySelector('aie-footer') as HTMLElement
+            if (footer) {
+              footer.style.display = val ? '' : 'none'
+            }
+            const header = divRef.value?.querySelector('aie-header') as HTMLElement
+            if (header) {
+              header.style.display = val ? '' : 'none'
+            }
+          }
+        },
+        { immediate: true },
+      )
+    },
   }
   // 隐藏工具栏
   if (!props.showToolbar) {

package/src/components/workflow/TaskOperation.vue

@@ -10,8 +10,21 @@
         :loading="butLoading || taskLoading"
         v-if="params?.cancelBtnText !== ''"
         @click="params?.cancelFunction"
-        >{{ params?.cancelBtnText ?? '取消' }}
+      >{{ params?.cancelBtnText ?? '取消' }}
       </el-button>
+      <template v-if="!isAssignee && task?.taskId && showCurWorkBth && !showOperationsBtn">
+        <el-button
+          :loading="butLoading || taskLoading"
+          type="warning"
+          :disabled="
+          task?.taskId &&
+          (!task?.operations ||
+            userInfo.getUserInfo.id !== task?.assigneeId)
+        "
+          @click="handle"
+        >{{ task.taskName }}
+        </el-button>
+      </template>
       <el-button
         v-if="showProcessBtn && task?.procInsId"
         type="info"
@@ -25,7 +38,7 @@
           type="primary"
           :loading="butLoading || taskLoading"
           @click="openDialog('assignee')"
-          >指定执行人
+        >指定执行人
         </el-button>
       </template>
       <template v-if="!isAssignee && task?.taskId && task?.operations && showOperationsBtn">
@@ -34,49 +47,49 @@
           v-if="params?.saveBtnText"
           type="primary"
           @click="params?.saveFunction"
-          >{{ params?.saveBtnText }}
+        >{{ params?.saveBtnText }}
         </el-button>
         <el-button
           v-if="task?.operations.indexOf('addMulti') > -1"
           type="warning"
           :loading="butLoading || taskLoading"
           @click="openDialog('addMulti')"
-          >加签
+        >加签
         </el-button>
         <el-button
           v-if="task?.operations.indexOf('minusMulti') > -1"
           type="danger"
           :loading="butLoading || taskLoading"
           @click="openDialog('minusMulti')"
-          >减签
+        >减签
         </el-button>
         <el-button
           :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('refuse') > -1 && params?.refuseBtnText !== ''"
           type="danger"
           @click="openDialog('refuse')"
-          >{{ params?.refuseBtnText ?? '终止' }}
+        >{{ params?.refuseBtnText ?? '终止' }}
         </el-button>
         <el-button
           :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('transfer') > -1 && params?.transferBtnText !== ''"
           type="warning"
           @click="openDialog('transfer')"
-          >{{ params?.transferBtnText ?? '转办' }}
+        >{{ params?.transferBtnText ?? '转办' }}
         </el-button>
         <el-button
           :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('back') > -1 && params?.backBtnText !== ''"
           type="danger"
           @click="openDialog('back')"
-          >{{ params?.backBtnText ?? '退回' }}
+        >{{ params?.backBtnText ?? '退回' }}
         </el-button>
         <el-button
           :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('complete') > -1 && params?.completeBtnText !== ''"
           type="primary"
           @click="openDialog('complete')"
-          >{{ params?.completeBtnText ?? '同意' }}
+        >{{ params?.completeBtnText ?? '同意' }}
         </el-button>
       </template>
       <slot name="right"></slot>
@@ -111,7 +124,8 @@ import type { ITaskOperate } from '../../hooks/userWorkflowHooks'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore.ts'
 import WujieVue from 'wujie-vue3'
-
+import { showTodoDialog } from '../../hooks/workflowTodo2'
+const userInfo = userInfoStore()
 const processShow = ref(false)
 const taskFlexRef = ref<HTMLElement | null>(null)
 const $props = defineProps({
@@ -122,6 +136,7 @@ const $props = defineProps({
   params: { type: Object as PropType<ITaskOperate>, required: false },
   taskInfo: { type: Object as PropType<IWfTaskVo>, required: false },
   showOperationsBtn: { type: Boolean, required: false, default: true },
+  showCurWorkBth: { type: Boolean, required: false, default: true },
 })
 
 const emit = defineEmits(['success'])
@@ -135,6 +150,11 @@ const isAssignee = computed(() => {
   return task.value?.operations === 'assignee' ? true : false
 })
 const dialogType = ref('')
+const compParam = ref([{ source: 'edit' }])
+const handle = async () => {
+  debugger
+  await showTodoDialog(ref(task.value as IWfTaskVo), compParam)
+}
 const openDialog = async (type: string) => {
   if (type) dialogType.value = type
   if (!task.value) return

package/src/hooks/userWorkflowHooks.ts

@@ -86,6 +86,8 @@ export interface ITaskOperate {
    * @param args
    */
   backFunction?: (vo: IWfTaskAskVo) => Promise<any>
+
+  handleCurWorkFunction?: (vo: IWfTaskAskVo) => Promise<any>
   /**
    * 流程“转办”按钮文本
    */