vue2-client 1.15.31 → 1.15.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.31",
+  "version": "1.15.33",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XTab/XTab.vue

@@ -3,7 +3,7 @@
     <a-tabs
       :tabBarGutter="tabBarGutter"
       :activeKey="activeKey"
-      @change="tabPaneChange"
+      @change="(activeKey) => tabPaneChange(activeKey, false)"
       :hideAdd="true"
       :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }"
     >
@@ -68,7 +68,7 @@ export default {
   },
   mounted () {
     this.activeKey = this.defaultActiveKey
-    this.tabPaneChange('initTabLoading')
+    this.tabPaneChange('initTabLoading', true)
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删
@@ -80,7 +80,7 @@ export default {
     getRealKeyData,
     getConfigByName,
     getConfigByNameAsync,
-    tabPaneChange (newKey) {
+    tabPaneChange (newKey, initStatus = false) {
       let result = {}
       if (this.activeKey === newKey) {
         return
@@ -161,6 +161,9 @@ export default {
       } else {
         this.activeKey = newKey
       }
+      if (initStatus) {
+        this.activeKey = this.defaultActiveKey
+      }
     },
     initConfig () {
       if (this.configName) {

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue

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

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -95,6 +95,19 @@
                 <file-item-group @search="getWorkFlowFiles"/>
               </template>
             </a-tab-pane>
+
+            <!--子流程tab-->
+            <a-tab-pane key="6" tab="子流程">
+              <a-card :bordered="false">
+                <x-form-table
+                  title="子流程"
+                  ref="xFormTable"
+                  :queryParamsName="queryParamsNameTab"
+                  :fixed-query-form="fixedQueryFormTab"
+                >
+                </x-form-table>
+              </a-card>
+            </a-tab-pane>
           </a-tabs>
         </a-card>
       </div>
@@ -148,7 +161,10 @@ export default {
       initStepId: null,
       visible: false,
       // 控制流程是否可操作
-      renderCurrentNode: true
+      renderCurrentNode: true,
+      // 子流程
+      queryParamsNameTab: '',
+      fixedQueryFormTab: {},
     }
   },
   expose: ['setFormValue'],
@@ -230,10 +246,14 @@ export default {
       await this.getBaseInfo()
       this.fixedQueryForm.a_f_workflow_id = this.workflowId
       this.fixedAddForm.a_f_workflow_id = this.workflowId
+      this.fixedQueryFormTab.w_f_workflow_parentid = this.workflowId
     },
     // 初始化两张固定表
-    async init ({ workflowId, stepId, renderCurrentNode = true, visible = true }) {
+    async init ({ workflowId, queryParamsNameTab, stepId, renderCurrentNode = true, visible = true }) {
       this.workflowId = workflowId
+      if (queryParamsNameTab) {
+        this.queryParamsNameTab = queryParamsNameTab
+      }
       if (stepId) {
         this.initStepId = stepId
       }