adtec-core-package 1.3.1 → 1.3.2

package/package.json

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

package/src/components/Table/ElTableColumnEdit.vue

@@ -5,14 +5,14 @@
 <template>
   <div
     @click.stop.prevent="displayClick"
-    style="width: 100%; min-height: 35px"
+    style="width: 100%; min-height: 35px;cursor: pointer;display: flex;align-items: center;"
     ref="ref_divView"
     :id="guid"
-    :class="getClass"
-    tabindex="0">
-    <FocusLock v-if="display" :no-focus-guards="false" class="foucs-lock">
-      <slot name="edit" v-if="display" tabindex="9"></slot>
-    </FocusLock>
+    :class="getClass" >
+    <!--    <FocusLock v-if="display" :no-focus-guards="false" class="foucs-lock">-->
+    <!--      <slot name="edit" v-if="display" tabindex="9"></slot>-->
+    <!--    </FocusLock>-->
+    <slot name="edit" v-if="display" tabindex="9"></slot>
     <slot v-else name="view"></slot>
   </div>
   <div class="box" v-if="required" v-show="getRequiredComp"></div>
@@ -20,7 +20,7 @@
 <script setup lang="ts">
 import { computed, getCurrentInstance, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useActiveElement, useEventBus, useFocus, watchPausable } from '@vueuse/core'
-import FocusLock from 'vue-focus-lock'
+// import FocusLock from 'vue-focus-lock'
 const ref_divView = ref()
 import { v4 as uuidv4 } from 'uuid'
 // const { focused } = useFocusWithin(ref_divView)
@@ -203,13 +203,12 @@ function listener() {
 const displayClick = () => {
   if (props.isEdit) {
     bus.emit()
-    console.log(guid)
     bus.on(listener)
     bus1.on(listener)
     resume()
     display.value = true
-    nextTick(() => {
-      display.value = true
+    nextTick(()=>{
+      ref_divView.value.querySelector('input')?.focus()
     })
   }
 }

package/src/components/workflow/components/CheckDialog.vue

@@ -252,6 +252,7 @@ const handleComplete = async () => {
         userId: userInfoStore().getUserInfo.id,
         comment: task.value.comment,
         targetKey: selectActivity.value,
+        isFirstActivity: returnData.value.find(x => x.taskKey === selectActivity.value)?.isFirstActivity
       }
       if (taskOperate.value?.backFunction) {
         await taskOperate.value.backFunction(askVo)

package/src/hooks/useFileView.ts

@@ -1,31 +1,8 @@
-import { ref, onMounted, onUnmounted, createApp } from 'vue'
-import FileView from '../components/upload/FileViewComponents.vue'
-
+import WujieVue from 'wujie-vue3'
 const useFileView = () => {
-  const ref_fileView = ref(null)
-
   const fileView = (id: string) => {
-    if (ref_fileView.value) {
-      //@ts-ignore
-      ref_fileView.value?.viewFile(id)
-    }
+    WujieVue.bus.$emit('viewFile', id)
   }
-
-  onMounted(() => {
-    const container = document.createElement('div')
-    document.body.appendChild(container)
-    //@ts-ignore
-    ref_fileView.value = createApp(FileView).mount(container)
-    onUnmounted(() => {
-      try {
-        //@ts-ignore
-        ref_fileView?.value.$destroy()
-      } catch {
-        /* empty */
-      }
-      document.body.removeChild(container)
-    })
-  })
   return {
     fileView,
   }

package/src/interface/workflow/IWfReturnNodeVo.ts

@@ -12,4 +12,5 @@ export interface IWfReturnNodeVo {
   users?: ISysUserInfo[]
   startTime?: string
   endTime?: string
+  isFirstActivity?: string
 }

package/src/interface/workflow/IWfTaskAskVo.ts

@@ -58,4 +58,8 @@ export interface IWfTaskAskVo {
    * 中止流程
    */
   stopWorkflow?: boolean
+  /**
+   * 是否是第一个节点
+   */
+  isFirstActivity?: string
 }