adtec-core-package 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "1.3.0",
+  "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/config/VxeTableConfig.ts

@@ -11,8 +11,10 @@ import {
 } from 'vxe-pc-ui'
 import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element'
 import '@vxe-ui/plugin-render-element/dist/style.css'
+import 'vxe-pc-ui/styles/cssvar.scss'
 // 导入主题变量，也可以重写主题变量
 import 'vxe-table/styles/cssvar.scss'
+import 'vxe-pc-ui/lib/style.css'
 import '../css/vxeTableUI/all.scss'
 // 导入默认的语言
 import zhCN from 'vxe-table/lib/locale/lang/zh-CN'
@@ -26,39 +28,37 @@ VxeUI.setConfig({
   // version: 1, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
   table: {
     showHeader: true,
-    keepSource:true,
+    keepSource: true,
     autoResize: true,
     height: '100%',
-    showOverflow: 'title',
-    showHeaderOverflow: 'title',
-    showFooterOverflow: 'title',
-    cellConfig:{
-    },
-    headerCellConfig:{
-      height:41
+    showOverflow: true,
+    showHeaderOverflow: true,
+    showFooterOverflow: true,
+    cellConfig: {},
+    headerCellConfig: {
+      height: 41
     },
     resizeConfig: {
       refreshDelay: 20
     },
     resizableConfig: {
       dragMode: 'auto',
-      showDragTip: true,
+      showDragTip: false,
       isSyncAutoHeight: true,
       isSyncAutoWidth: true,
       minHeight: 18
     },
     columnDragConfig: {
       showIcon: true,
-      showGuidesStatus: true,
-      showDragTip: true
+      showGuidesStatus: false,
+      showDragTip: false
     },
     checkboxConfig: {
+      showHeader:true,
       // trigger: 'default',
-      strict: true
-    },
-    tooltipConfig: {
-      theme: 'light',
-      enterable: true
+      strict: true,
+      highlight: true,
+      range: true,
     },
     validConfig: {
       showMessage: true,
@@ -69,9 +69,14 @@ VxeUI.setConfig({
       theme: 'beautify'
     },
     columnConfig: {
-      maxFixedSize: 4
+      maxFixedSize: 4,
+      resizable: true,
+    },
+    tooltipConfig: {
+      enterable: true,
+      theme: 'light'
     },
-    rowConfig:{
+    rowConfig: {
       isCurrent: true,
     },
     footerCellConfig: {
@@ -127,7 +132,7 @@ VxeUI.setConfig({
       childrenField: 'children',
       hasChildField: 'hasChild',
       mapChildrenField: '_X_ROW_CHILD',
-      indent: 20,
+      indent: 10,
       transform: true,
       iconOpen: 'vxe-icon-square-minus',
       iconClose: 'vxe-icon-square-plus',
@@ -160,8 +165,7 @@ VxeUI.setConfig({
         txt: 1
       }
     },
-    printConfig: {
-    },
+    printConfig: {},
     mouseConfig: {
       extension: true
     },
@@ -256,8 +260,9 @@ VxeUI.setConfig({
     // buttons: []
   }
 })
+
 // 可选组件
-function lazyVxeTable (app:import("vue").App) {
+function lazyVxeTable(app: import("vue").App) {
   app.use(VxeTooltip)
   app.use(VxeTable)
   app.use(VxeColumn)
@@ -265,8 +270,9 @@ function lazyVxeTable (app:import("vue").App) {
   app.use(VxeGrid)
   app.use(VxeToolbar)
 }
+
 export default {
-  install (app:import("vue").App) {
+  install(app: import("vue").App) {
     // 默认组件
     lazyVxeTable(app)
   }

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
 }