vue2-client 1.15.13 → 1.15.15

package/src/base-client/components/layout/XPageView/XTab/XTab.vue

@@ -1,96 +1,96 @@
-<template>
-  <a-card :bordered="false" :body-style="bodyStyle">
-    <a-tabs
-      :tabBarGutter="tabBarGutter"
-      :activeKey="activeKey"
-      @change="tabPaneChange"
-      :hideAdd="true"
-      :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }"
-    >
-      <slot name="extraBeforeTabs"></slot>
-      <a-tab-pane
-        :forceRender="true"
-        v-for="(tab, index) in data"
-        :key="index"
-        :tab="tab.title"
-      >
-        <component
-          :is="resolveComponentType(tab.type)"
-          :key="`xTabPaneComp${index}`"
-          :ref="`tab_comp_${index}`"
-          v-bind="tab.props || {}"
-        />
-      </a-tab-pane>
-    </a-tabs>
-  </a-card>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import { resolveComponentType } from '../componentTypes'
-
-const props = defineProps({
-  // 标签页数据
-  data: {
-    type: Array,
-    required: true
-  },
-  // 是否显示标签栏
-  showTabBar: {
-    type: Boolean,
-    default: true
-  },
-  // 标签页切换时的回调函数
-  onChange: {
-    type: [String, Function],
-    default: null
-  },
-  // Tab间距
-  tabBarGutter: {
-    type: Number,
-    default: 10
-  },
-  // 卡片样式
-  bodyStyle: {
-    type: Object,
-    default: () => ({})
-  },
-  // 默认激活的标签页
-  defaultActiveKey: {
-    type: [String, Number],
-    default: 0
-  }
-})
-
-// 激活的标签页
-const activeKey = ref(0)
-
-// 切换标签页
-const tabPaneChange = (newKey) => {
-  if (activeKey.value === newKey) return
-
-  const oldKey = activeKey.value
-  activeKey.value = newKey
-
-  // 触发标签页切换事件
-  if (props.onChange) {
-    try {
-      if (props.onChange instanceof Function) {
-        props.onChange(oldKey, newKey, props.data[oldKey], props.data[newKey])
-      } else {
-        // 创建一个安全的函数执行环境
-        // eslint-disable-next-line no-new-func
-        const onChange = new Function('oldKey', 'newKey', 'oldTab', 'newTab', `return (${props.onChange})(oldKey, newKey, oldTab, newTab)`)
-        onChange(oldKey, newKey, props.data[oldKey], props.data[newKey])
-      }
-    } catch (error) {
-      console.error('执行标签页切换回调错误:', error)
-    }
-  }
-}
-
-// 生命周期
-onMounted(() => {
-  activeKey.value = props.defaultActiveKey
-})
-</script>
+<template>
+  <a-card :bordered="false" :body-style="bodyStyle">
+    <a-tabs
+      :tabBarGutter="tabBarGutter"
+      :activeKey="activeKey"
+      @change="tabPaneChange"
+      :hideAdd="true"
+      :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }"
+    >
+      <slot name="extraBeforeTabs"></slot>
+      <a-tab-pane
+        :forceRender="true"
+        v-for="(tab, index) in data"
+        :key="index"
+        :tab="tab.title"
+      >
+        <component
+          :is="resolveComponentType(tab.type)"
+          :key="`xTabPaneComp${index}`"
+          :ref="`tab_comp_${index}`"
+          v-bind="tab.props || {}"
+        />
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { resolveComponentType } from '../componentTypes'
+
+const props = defineProps({
+  // 标签页数据
+  data: {
+    type: Array,
+    required: true
+  },
+  // 是否显示标签栏
+  showTabBar: {
+    type: Boolean,
+    default: true
+  },
+  // 标签页切换时的回调函数
+  onChange: {
+    type: [String, Function],
+    default: null
+  },
+  // Tab间距
+  tabBarGutter: {
+    type: Number,
+    default: 10
+  },
+  // 卡片样式
+  bodyStyle: {
+    type: Object,
+    default: () => ({})
+  },
+  // 默认激活的标签页
+  defaultActiveKey: {
+    type: [String, Number],
+    default: 0
+  }
+})
+
+// 激活的标签页
+const activeKey = ref(0)
+
+// 切换标签页
+const tabPaneChange = (newKey) => {
+  if (activeKey.value === newKey) return
+
+  const oldKey = activeKey.value
+  activeKey.value = newKey
+
+  // 触发标签页切换事件
+  if (props.onChange) {
+    try {
+      if (props.onChange instanceof Function) {
+        props.onChange(oldKey, newKey, props.data[oldKey], props.data[newKey])
+      } else {
+        // 创建一个安全的函数执行环境
+        // eslint-disable-next-line no-new-func
+        const onChange = new Function('oldKey', 'newKey', 'oldTab', 'newTab', `return (${props.onChange})(oldKey, newKey, oldTab, newTab)`)
+        onChange(oldKey, newKey, props.data[oldKey], props.data[newKey])
+      }
+    } catch (error) {
+      console.error('执行标签页切换回调错误:', error)
+    }
+  }
+}
+
+// 生命周期
+onMounted(() => {
+  activeKey.value = props.defaultActiveKey
+})
+</script>

package/src/base-client/components/layout/XPageView/componentTypes.js

@@ -1,22 +1,22 @@
-// 支持的组件类型映射
-export const components = {
-  XTab: () => import('@vue2-client/base-client/components/layout/XPageView/XTab'),
-  XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable'),
-  XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm'),
-  XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
-  XErrorView: () => import('@vue2-client/base-client/components/layout/XPageView/XErrorView'),
-  // 全局组件不需要导入，直接返回null，让Vue使用全局注册的组件
-}
-
-// 组件类型解析函数
-export const resolveComponentType = (type) => {
-  if (!type) return components.XErrorView
-
-  // 如果是Ant Design Vue组件（以'a-'开头），直接返回原名称
-  if (type.startsWith('a-')) {
-    return type
-  }
-
-  // 否则从已注册的组件集合中查找
-  return components[type] || components.XErrorView
-}
+// 支持的组件类型映射
+export const components = {
+  XTab: () => import('@vue2-client/base-client/components/layout/XPageView/XTab'),
+  XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable'),
+  XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm'),
+  XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
+  XErrorView: () => import('@vue2-client/base-client/components/layout/XPageView/XErrorView'),
+  // 全局组件不需要导入，直接返回null，让Vue使用全局注册的组件
+}
+
+// 组件类型解析函数
+export const resolveComponentType = (type) => {
+  if (!type) return components.XErrorView
+
+  // 如果是Ant Design Vue组件（以'a-'开头），直接返回原名称
+  if (type.startsWith('a-')) {
+    return type
+  }
+
+  // 否则从已注册的组件集合中查找
+  return components[type] || components.XErrorView
+}

package/src/main.js

@@ -7,6 +7,8 @@ import { routerOptions, modules, i18n, message, bootstrap } from '../index'
 import findParentData from '@/plugins/FindParentsData'
 import { Modal } from 'ant-design-vue'
 
+import VueDraggableResizable from 'vue-draggable-resizable'
+
 Vue.use(Router)
 Vue.use(Vuex)
 // Vue.use(eventLogPlugin)
@@ -16,13 +18,10 @@ Vue.use(findParentData)
 const store = new Vuex.Store({ modules })
 const router = new Router(routerOptions)
 
-// 绑定原型，用于amis
-Vue.$store = store
-Vue.$router = router
-Vue.$i18n = i18n
 Vue.config.devtools = true
 // 绑定原型
 Vue.Modal = Modal
+Vue.component('VueDraggableResizable', VueDraggableResizable)
 
 bootstrap({ router, store, i18n, message }).then(() => {
   new Vue({

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -121,7 +121,8 @@ export default {
     },
     toDetail (record, id) {
       this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id
+        workflowId: record.ab_f_workflow_id,
+        stepId: record.ws_f_step_id
       })
     },
     handleFormItemEvent (func, data, value) {

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -43,6 +43,8 @@
                 :visible="visible"
                 :taskName="details.f_task_name"
                 :details="details"
+                :renderCurrentNode="renderCurrentNode"
+                :initStepId="initStepId"
                 @refresh="stepChanged"
                 @success="success"
                 @nextClick="nextClick"
@@ -123,6 +125,7 @@ export default {
     LeaveMessage,
     XUploadFilesView
   },
+  props: {},
   data () {
     return {
       // 页面宽度
@@ -142,7 +145,10 @@ export default {
       messageList: [],
       messageLoading: true,
       workflowId: '',
-      visible: false
+      initStepId: null,
+      visible: false,
+      // 控制流程是否可操作
+      renderCurrentNode: true
     }
   },
   expose: ['setFormValue'],
@@ -157,13 +163,13 @@ export default {
              this.steps !== undefined
     }
   },
-  props: {},
   mounted () {
     // this.init()
   },
   methods: {
     // 内部组件更新了当前步骤后的回调
     stepChanged () {
+      this.initStepId = null
       this.loading = true
       this.reload()
     },
@@ -190,6 +196,7 @@ export default {
       this.fixedQueryForm = {}
       this.steps = undefined
       this.messageList = []
+      this.currStepId = null
     },
     // 获取基础信息
     getBaseInfo () {
@@ -198,7 +205,12 @@ export default {
         workflowId: this.workflowId
       })
         .then(res => {
-          res.f_sub_state = this.steps.find(item => item.id === res.f_step_id)?.name
+          // 主动传入得优先级较高
+          if (this.currStepId) {
+            res.f_sub_state = this.steps.find(item => item.id === this.currStepId)?.name
+          } else {
+            res.f_sub_state = this.steps.find(item => item.id === res.f_step_id)?.name
+          }
           this.details = res
         }, err => {
           console.log(err)
@@ -220,9 +232,13 @@ export default {
       this.fixedAddForm.a_f_workflow_id = this.workflowId
     },
     // 初始化两张固定表
-    async init ({ workflowId, visible = true }) {
+    async init ({ workflowId, stepId, renderCurrentNode = true, visible = true }) {
       this.workflowId = workflowId
+      if (stepId) {
+        this.initStepId = stepId
+      }
       this.visible = visible
+      this.renderCurrentNode = renderCurrentNode
       await this.reload()
     },
     // 切换标签页