vue2-client 1.14.81 → 1.14.83

package/src/components/FileImageItem/FileItem.vue

@@ -8,7 +8,7 @@
           </div>
           <div class="file-content">
             <div class="file-header">
-              <span class="file-name">{{ file.name }}</span>
+              <span class="file-name">{{ file.real_name ? file.real_name : file.name }}</span>
               <span class="file-type">{{ getFileType(file.name) }}</span>
             </div>
             <div class="file-footer">

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: '11'
+      workflowId: '58'
     })
   },
   methods: {

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

@@ -35,64 +35,24 @@
       <a-tabs default-active-key="1" @change="note = ''" type="card">
         <template v-if="beforeStepActive || workflowState">
           <a-tab-pane key="0" tab="步骤详情">
-            <a-card :bordered="false" :loading="loadingHistory">
+            <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
               <!--   当前步骤历史记录   -->
-              <template v-if="formCompletedDataPreview">
-                <a-descriptions
-                  v-show="formCompletedDataPreview.data"
-                  :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }"
-                  bordered
-                  class="descriptionPreviewItem"
-                >
-                  <p slot="title" class="descriptionTitle">
-                    填写历史
-                  </p>
-                  <a-descriptions-item
-                    v-for="(value,key) in formCompletedDataPreview.data"
-                    :key="key"
-                    v-show="key !== '附件上传'"
+              <template v-if="showTab">
+                <x-tab :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }}" :local-config="tabDesigner" :body-style="{ padding: 0 }" :tabBarGutter="24" default-active-key="workFlowTab">
+                  <a-tab-pane
+                    :forceRender="true"
+                    v-if="formCompletedDataPreview"
+                    slot="extraBeforeTabs"
+                    key="workFlowTab"
+                    tab="表单"
                   >
-                    <span slot="label" style="color: #000">{{ key }}</span>
-                    <div style="white-space: pre-wrap">{{ value }}</div>
-                  </a-descriptions-item>
-                </a-descriptions>
-                <a-descriptions
-                  v-show="formCompletedDataPreview.note"
-                  bordered
-                  class="descriptionPreviewItem"
-                >
-                  <p slot="title" class="descriptionTitle">
-                    备注
-                  </p>
-                  <a-descriptions-item>
-                    <span slot="label" style="color: #000">备注信息</span>
-                    <p style="white-space: pre-wrap">{{ formCompletedDataPreview.note }}</p>
-                  </a-descriptions-item>
-                </a-descriptions>
-                <a-descriptions
-                  v-show="formCompletedDataPreview.images.length"
-                  class="descriptionPreviewItem allWidth"
-                >
-                  <p slot="title" class="descriptionTitle">
-                    图片
-                  </p>
-                  <a-descriptions-item>
-                    <image-item :images="formCompletedDataPreview.images" />
-                  </a-descriptions-item>
-                </a-descriptions>
-                <a-descriptions
-                  v-show="formCompletedDataPreview.files.length"
-                  class="descriptionPreviewItem allWidth"
-                >
-                  <p slot="title" class="descriptionTitle">
-                    附件
-                  </p>
-                  <a-descriptions-item>
-                    <file-item :files="formCompletedDataPreview.files" />
-                  </a-descriptions-item>
-                </a-descriptions>
+                    <work-flow-preview :form-completed-data-preview="formCompletedDataPreview" />
+                  </a-tab-pane>
+                </x-tab>
+              </template>
+              <template v-else-if="formCompletedDataPreview">
+                <work-flow-preview :form-completed-data-preview="formCompletedDataPreview" />
               </template>
-              <!--   当前步骤无记录   -->
               <template v-else>
                 <a-result status="404" title="暂无数据" sub-title="该步骤暂无数据。">
                 </a-result>
@@ -276,6 +236,7 @@ import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import * as util from '@vue2-client/utils/util'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
+import WorkFlowPreview from './WorkFlowPreview'
 
 export default {
   name: 'WorkFlowHandle',
@@ -288,7 +249,8 @@ export default {
     XAddForm,
     FilePreview,
     FileItem,
-    ImageItem
+    ImageItem,
+    WorkFlowPreview
   },
   computed: {
     ...mapState('account', { currUser: 'user' }),
@@ -834,6 +796,14 @@ export default {
           formCompletedDataPreview = null
         }
         this.formCompletedDataPreview = formCompletedDataPreview
+        // 渲染已完成步骤的Tab
+        const properties = this.stepsDefine[stepId - 1].properties
+        this.tabDesigner = properties.tabDesigner
+        if (this.tabDesigner) {
+          this.showTab = true
+        } else {
+          this.showTab = false
+        }
         // 完成
         this.loadingHistory = false
         this.beforeStepActive = this.activeStepName !== this.currentStep.state

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

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <a-descriptions
+      v-show="formCompletedDataPreview.data"
+      :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }"
+      bordered
+      class="descriptionPreviewItem"
+    >
+      <p slot="title" class="descriptionTitle">
+        填写历史
+      </p>
+      <a-descriptions-item
+        v-for="(value, key) in formCompletedDataPreview.data"
+        :key="key"
+        v-show="key !== '附件上传'"
+      >
+        <span slot="label" style="color: #000">{{ key }}</span>
+        <div style="white-space: pre-wrap">{{ value }}</div>
+      </a-descriptions-item>
+    </a-descriptions>
+    <a-descriptions
+      v-show="formCompletedDataPreview.note"
+      bordered
+      class="descriptionPreviewItem"
+    >
+      <p slot="title" class="descriptionTitle">
+        备注
+      </p>
+      <a-descriptions-item>
+        <span slot="label" style="color: #000">备注信息</span>
+        <p style="white-space: pre-wrap">{{ formCompletedDataPreview.note }}</p>
+      </a-descriptions-item>
+    </a-descriptions>
+    <a-descriptions
+      v-show="formCompletedDataPreview.images.length"
+      class="descriptionPreviewItem allWidth"
+    >
+      <p slot="title" class="descriptionTitle">
+        图片
+      </p>
+      <a-descriptions-item>
+        <image-item :images="formCompletedDataPreview.images" />
+      </a-descriptions-item>
+    </a-descriptions>
+    <a-descriptions
+      v-show="formCompletedDataPreview.files.length"
+      class="descriptionPreviewItem allWidth"
+    >
+      <p slot="title" class="descriptionTitle">
+        附件
+      </p>
+      <a-descriptions-item>
+        <file-item :files="formCompletedDataPreview.files" />
+      </a-descriptions-item>
+    </a-descriptions>
+  </div>
+</template>
+
+<script>
+import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
+export default {
+  name: 'WorkFlowPreview',
+  components: {
+    FileItem,
+    ImageItem
+  },
+  props: {
+    formCompletedDataPreview: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.descriptionPreviewItem {
+  margin-bottom: 22px;
+}
+.allWidth >>> .ant-descriptions-item-content {
+  width: 100%;
+}
+.descriptionTitle {
+  position: relative;
+  padding-left: 12px;
+}
+.descriptionTitle::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 4px;
+  height: 16px;
+  background-color: #1890ff;
+  border-radius: 2px;
+}
+</style>

package/src/router/async/router.map.js

@@ -66,7 +66,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/his/XShiftSchedule/dome.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),

package/src/utils/axios-interceptors.js

@@ -48,6 +48,24 @@ const resp403 = {
   }
 }
 
+const resp413 = {
+  onFulfilled (response, options) {
+    const { message } = options
+    if (response.code === 413) {
+      message.error('上传文件过大')
+    }
+    return response
+  },
+  onRejected (error, options) {
+    const { message } = options
+    const { response } = error
+    if (response.status === 413) {
+      message.error('上传文件过大')
+    }
+    return Promise.reject(error)
+  }
+}
+
 const reqCommon = {
   /**
    * 发送请求之前做些什么
@@ -78,5 +96,5 @@ const reqCommon = {
 
 export default {
   request: [reqCommon], // 请求拦截
-  response: [resp401, resp403] // 响应拦截
+  response: [resp401, resp403, resp413] // 响应拦截
 }

package/src/utils/request.js

@@ -334,6 +334,11 @@ const errorHandler = (error) => {
         message: '系统警告',
         description: data
       })
+    } else if (error.response.status === 413 || (data && data.code === 413)) {
+      notification.warn({
+        message: '上传的文件过大',
+        description: '请检查文件内容'
+      })
     } else {
       notification.error({
         message: '网络异常',