vue2-client 1.15.17 → 1.15.19

package/package.json

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

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

@@ -10,7 +10,7 @@
             <!--            <a-button v-if="eventState.customSave" type="primary" @click="custom('customSave')">-->
             <!--              <a-icon type="save"/>保存-->
             <!--            </a-button>-->
-            <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            <slot name="leftButton" v-if="buttonState.extra !== false" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             <a-button v-if="buttonState.add && buttonRendering('add')" type="primary" @click="add">
               <a-icon type="plus"/>新增
             </a-button>
@@ -80,17 +80,20 @@
               </a-menu>
               <a-button>打印 <a-icon type="printer" :style="iconStyle"/> </a-button>
             </a-dropdown>
-            <!-- 遍历按钮配置数组，动态生成按钮 -->
-            <a-button
-              v-for="(button, index) in editButtonStateData"
-              :key="index"
-              :type="button.type || 'dashed'"
-              @click="editButtonStateDataClick(index)"
-              class="btn-success"
-            >
-              <a-icon type="dashed" :style="iconStyle"/>
-              {{ button.buttonName }}
-            </a-button>
+            <template
+              v-if="buttonState.extra !== false">
+              <!-- 遍历按钮配置数组，动态生成按钮 -->
+              <a-button
+                v-for="(button, index) in editButtonStateData"
+                :key="index"
+                :type="button.type || 'dashed'"
+                @click="editButtonStateDataClick(index)"
+                class="btn-success"
+              >
+                <a-icon type="dashed" :style="iconStyle"/>
+                {{ button.buttonName }}
+              </a-button>
+            </template>
             <a-button
               v-if="allowedCardMode && !simpleMode"
               @click="changeViewMode"
@@ -121,9 +124,8 @@
               :show-save-button="false"
               :dont-format="true"/>
 
-            <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            <slot name="button" v-if="buttonState.extra !== false" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
           </a-space>
-
         </span>
       </a-col>
       <a-col v-show="showRightTools && !simpleMode">

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -312,7 +312,7 @@ export default {
               const k = col.dataIndex || col.key
               return k === key
             })
-            if (!col || !col.width) {
+            if (!col || !col.width || col.slotType === 'action') {
               return h('th', { ...restProps }, [...children])
             }
 
@@ -558,7 +558,7 @@ export default {
   top: 50%;
   height: 20px;
   width: 1px;
-  background-color: #d9d9d9;
+  background-color: #ebebeb;
   transition: background-color 0.2s;
   transform: translateY(-50%);
   right: 9px;

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -37,7 +37,7 @@
             <!--   当前步骤历史记录   -->
             <template v-if="showTab">
               <x-tab
-                :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }, disableAction: true }"
+                :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false, extra: false }, disableAction: true }"
                 :local-config="tabDesigner"
                 :body-style="{ padding: 0 }"
                 :tabBarGutter="24"
@@ -770,6 +770,8 @@ export default {
             this.$message.success('退回成功')
             this.loading = true
             this.loadingHistory = true
+            this.currentStepId = this.preBtnTo
+            this.activeStepId = this.preBtnTo
             this.$emit('refresh')
             this.onClose()
             this.init()
@@ -920,6 +922,19 @@ export default {
     },
     // 根据当前节点，判断之后流程，以及按钮的显示
     workflowControl () {
+      // 重置所有控制数据为默认值，避免之前状态的影响
+      this.showNextBtn = false
+      this.nextBtnTo = undefined
+      this.nextBtnTitle = ''
+      this.showStepNextBtn = false
+      this.stepNextBtnTo = undefined
+      this.stepNextBtnTitle = ''
+      this.stepNextBtnText = []
+      this.showPrevBtn = false
+      this.preBtnTo = undefined
+      this.preBtnTitle = ''
+      this.preBtnText = []
+
       // 分类收集不同类型的actions
       const submitActions = this.currentDirections.filter(item => item.type === 'submit')
       const conditionalActions = this.currentDirections.filter(item => item.type === 'conditionalBranch')