adtec-core-package 2.2.8 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.2.8",
+  "version": "2.3.0",
   "private": false,
   "type": "module",
   "scripts": {
@@ -18,6 +18,7 @@
     "@types/echarts": "^5.0.0",
     "@vueuse/components": "^13.0.0",
     "@vueuse/core": "^13.0.0",
+    "@vxe-ui/plugin-export-pdf": "4.2.4",
     "@vxe-ui/plugin-export-xlsx": "4.2.1",
     "@vxe-ui/plugin-render-element": "4.0.10",
     "aieditor": "^1.3.4",
@@ -27,6 +28,7 @@
     "element-plus": "2.8.7",
     "exceljs": "4.4.0",
     "jsencrypt": "^3.3.2",
+    "jspdf": "2.5.2",
     "linq-to-ts": "^1.3.0",
     "pinia": "^2.3.0",
     "pinia-plugin-store": "^2.2.9",

package/src/components/bpmntree/views/flowDesign/nodes/type.ts

@@ -127,6 +127,14 @@ export interface ApprovalNode extends AssigneeNode {
   backNodes: string[]
   // 审批人和提交人为同一人时
   sameUser: string
+  /**
+   * 是否允许撤回
+   */
+  withdraw: boolean
+  /**
+   * 撤回Api地址
+   */
+  withdrawApiUrl?:string
 }
 
 export interface TimerNode extends FlowNode {

package/src/components/bpmntree/views/flowDesign/panels/ApprovalPanel.vue

@@ -259,6 +259,34 @@ watchEffect(() => {
                     placeholder="请输入组件参数"
           />
         </el-form-item>
+        <el-form-item prop="activeData.withdraw" label="是否允许撤回">
+          <template #label>
+            <el-flex align="center">
+              <span style="margin-right: 3px">是否允许撤回</span>
+              <el-tooltip content="当前步骤是否允许撤回" placement="top">
+                <el-icons model-value="adtec-info"></el-icons>
+              </el-tooltip>
+            </el-flex>
+          </template>
+          <el-switch v-model="activeData.withdraw"></el-switch>
+        </el-form-item>
+        <el-form-item prop="activeData.withdrawApiUrl" v-if="activeData.withdraw" label="撤回Api地址">
+          <template #label>
+            <el-flex align="center">
+              <span style="margin-right: 3px">撤回Api地址</span>
+              <el-tooltip  placement="top">
+                <template #content>撤回操作的Api地址,请对撤回Api地址进行授权
+                  <br/>
+                  (如：”/api/tm/projectYearBudget/withdraw“，后台接口采用POST方式接收到的参数为WfTaskVo<br/>
+                  后端接口处理业务逻辑后调用WorkflowServiceFeignService.processWithdrawal对流程进行撤回，
+                  <br/>如果Api接口地址为空系统走默认撤回接口)</template>
+                <el-icons model-value="adtec-info"></el-icons>
+              </el-tooltip>
+            </el-flex>
+          </template>
+          <el-input style="width: 350px;" v-model="activeData.withdrawApiUrl" placeholder="请输入撤回Api地址"></el-input>
+        </el-form-item>
+
         <el-form-item prop="taskListeners" label="任务监听器：">
           <TaskListeners :node="activeData" />
         </el-form-item>

package/src/components/workflow/WorkflowTodoDialog.vue

@@ -7,6 +7,7 @@
     <template v-if="taskId" #workflow>
       <!--      @success="emit('workflowComplete')"-->
       <task-operation
+        v-if="taskOperationShow"
         :show-process-btn="true"
         :taskId="taskId"
         :params="compRef?.taskOption"
@@ -28,6 +29,7 @@ const compInst = ref()
 const compRef = ref()
 const showComp = ref(false)
 const taskId = ref('')
+const taskOperationShow=ref(true)
 onMounted(() => {
   //@ts-ignore
   window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
@@ -60,7 +62,9 @@ const initTodoDialog = async (params: IParameter[]) => {
       const comp = modules[linkModelPath]
       const d: any = await comp()
       compInst.value = d.default
+      taskOperationShow.value = false
       nextTick(() => {
+        taskOperationShow.value = true
         if (compRef.value?.initByWorkflow) {
           taskId.value = params?.find((x: IParameter) => x.code === 'taskId')?.value
           const wParam = {

package/src/config/VxeTableConfig.ts

@@ -1,5 +1,8 @@
 import { VxeGrid } from 'vxe-table'
-import { VxeUI } from 'vxe-pc-ui'
+//@ts-ignore
+import {
+  VxeUI,
+  VxeTooltip } from 'vxe-pc-ui'
 
 import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element'
 import '@vxe-ui/plugin-render-element/dist/style.css'
@@ -23,7 +26,7 @@ export function initVxeTableInPage(
   // 设置语言
   VxeUI.setI18n('zh-CN', zhCN)
   VxeUI.setLanguage('zh-CN')
-
+  VxeUI.component(VxeTooltip)
   // 局部注册插件
   enableElementPlus && VxeUI.use(VxeUIPluginRenderElement)
   enableExcel && VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })

package/src/interface/workflow/IWfTaskVo.ts

@@ -172,6 +172,7 @@ export interface IWfTaskVo {
    * task完成时设置的变量
    */
   variables?: any
+  taskTitle:string
 }
 
 // Comment interface 需根据实际需求定义

package/adtec-core-package/adtec-core-package.css

@@ -1 +0,0 @@
-.icon[data-v-0af0286e]{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}.icon-btn[data-v-2d77346e]{cursor:pointer;margin:0 0 0 8px;--el-button-hover-bg-color: var(--el-color-primary-light-3)}.icon-btn[data-v-2d77346e]:hover{color:var(--el-button-hover-bg-color)}.icon-btn--disabled[data-v-2d77346e]{color:var(--el-color-disabled-text-color);cursor:not-allowed!important}.icon-btn--size-large[data-v-2d77346e]{font-size:var(--el-font-size-large)}.icon-btn--size-default[data-v-2d77346e]{font-size:var(--el-font-size-base)}.icon-btn--size-small[data-v-2d77346e]{font-size:var(--el-font-size-small)}.icon-btn--primary[data-v-2d77346e]{--el-button-hover-bg-color: var(--el-color-primary-light-3);--el-button-disabled-bg-color: var(--el-color-primary-light-5);color:var(--el-color-primary)}.icon-btn--success[data-v-2d77346e]{--el-button-hover-bg-color: var(--el-color-success-light-3);--el-button-disabled-bg-color: var(--el-color-success-light-5);color:var(--el-color-success)}.icon-btn--warning[data-v-2d77346e]{--el-button-hover-bg-color: var(--el-color-warning-light-3);--el-button-disabled-bg-color: var(--el-color-warning-light-5);color:var(--el-color-warning)}.icon-btn--danger[data-v-2d77346e]{--el-button-hover-bg-color: var(--el-color-danger-light-3);--el-button-disabled-bg-color: var(--el-color-danger-light-5);color:var(--el-color-danger)}.icon-btn--info[data-v-2d77346e]{--el-button-hover-bg-color: var(--el-color-info-light-3);--el-button-disabled-bg-color: var(--el-color-info-light-5);color:var(--el-color-info)}.elementSelect[data-v-1cfe9fde]{border:2px dashed #1a67f8!important}.demo-form-inline .el-input[data-v-1cfe9fde]{--el-input-width: 220px}.demo-form-inline .el-select[data-v-1cfe9fde]{--el-select-width: 220px}.icon-btn[data-v-3d674f83]{margin-right:5px;cursor:pointer;--el-button-hover-bg-color: var(--el-color-primary-light-3)}.icon-btn[data-v-3d674f83]:hover{color:var(--el-button-hover-bg-color)}.icon-btn--disabled[data-v-3d674f83]{color:var(--el-color-disabled-text-color);cursor:not-allowed!important}.icon-btn--size-large[data-v-3d674f83]{font-size:var(--el-font-size-large)}.icon-btn--size-default[data-v-3d674f83]{font-size:var(--el-font-size-base)}.icon-btn--size-small[data-v-3d674f83]{font-size:var(--el-font-size-small)}.icon-btn--primary[data-v-3d674f83]{--el-button-hover-bg-color: var(--el-color-primary-light-3);--el-button-disabled-bg-color: var(--el-color-primary-light-5);color:var(--el-color-primary)}.icon-btn--success[data-v-3d674f83]{--el-button-hover-bg-color: var(--el-color-success-light-3);--el-button-disabled-bg-color: var(--el-color-success-light-5);color:var(--el-color-success)}.icon-btn--warning[data-v-3d674f83]{--el-button-hover-bg-color: var(--el-color-warning-light-3);--el-button-disabled-bg-color: var(--el-color-warning-light-5);color:var(--el-color-warning)}.icon-btn--danger[data-v-3d674f83]{--el-button-hover-bg-color: var(--el-color-danger-light-3);--el-button-disabled-bg-color: var(--el-color-danger-light-5);color:var(--el-color-danger)}.icon-btn--info[data-v-3d674f83]{--el-button-hover-bg-color: var(--el-color-info-light-3);--el-button-disabled-bg-color: var(--el-color-info-light-5);color:var(--el-color-info)}