Merge branch 'feature-StyleRenderForm' into 'master'

Style: 新建表单工作时，渲染参数接口调整

See merge request !3

template/config/http.config.js

@@ -6,7 +6,7 @@ const serviceUrl = process.env.VUE_APP_SERVICE_APP;
 
 if (typeof window !== 'undefined') window.baseUrl = baseUrl;
 
-export { 
+export {
   baseUrl,
   serviceUrl
 };

template/form/api/index.js

@@ -23,11 +23,12 @@ const Api = {
    * @param {*} linkId
    * @param {*} linkKey
    */
-  getBusinessStartForm(businessDefinitionId) {
+  getBusinessStartForm(businessDefinitionId, taskId) {
     return config.doGetPromise(
       baseUrl + '/v1.1.0/workflow/workflowForm/getBusinessStartForm',
       {
-        businessDefinitionId
+        businessDefinitionId,
+        taskId
       }
     );
   },

template/form/views/common/submitTask.vue

@@ -73,7 +73,7 @@
             </el-tree>
           </div>
         </div>
-            
+
         <div class="submit-reason">
           <span>提交原因：</span>
           <div>
@@ -82,7 +82,7 @@
         </div>
       </div>
     </div>
-    
+
     <div slot="footer" class="submit-dialog__footer">
       <el-checkbox v-model="isUrgent" style="margin-right: 15px;">紧急</el-checkbox>
       <el-button type="primary" :disabled="checkedLink.length === 0" :loading="isSubmiting" @click="saveTask">保存</el-button>
@@ -169,7 +169,7 @@ export default {
       this.currentLink.masterMen.forEach(user => {
         this.$set(user, 'checked', true);
         // 如果提交所有人，禁止状态，不能改变选中
-        if (val.completingToAll) this.$set(user, 'disabled', true) ; 
+        if (val.completingToAll) this.$set(user, 'disabled', true);
         this.mainCheckedKeys.push(user.organInfo.rid);
       });
       this.currentLink.normalMen.forEach(user => {

template/form/views/form.vue

@@ -42,7 +42,7 @@
       ref="submitTask"
       :nextLinks="submitData.subTask"
       :nextLinkUsers="submitData.userInfos"
-      @closed="submitTaskDialogVisible = false"
+      @closed="handleSubmitTaskClose"
       @save="handleSubmitTaskSave"
     ></submit-task>
     <!-- 转办 -->
@@ -125,7 +125,8 @@ export default {
       submitTaskDialogVisible: false, // 提交dialog
       submitData: {},
       transformDialogVisible: false, // 转办dialog
-      returnTaskVisible: false // 退回dialog
+      returnTaskVisible: false, // 退回dialog
+      createTaskId: '' // 新建工作后保存时的taskId
     };
   },
 
@@ -145,8 +146,8 @@ export default {
     },
 
     // 刷新
-    refresh() {
-      this.fetch();
+    refresh(taskId) {
+      this.fetch(taskId);
     },
 
     handleResultHtml(data, key) {
@@ -158,10 +159,12 @@ export default {
         return {};
       }
     },
-
-    fetch() {
+    /**
+     * 新建工作时，保存的时候后端返回tId
+     */
+    fetch(tId) {
       let taskId = getTaskId() || this.childrenData.taskId;
-      const linkId = getLinkId() || this.childrenData.linkId;
+      const linkId = tId ? tId : getLinkId() || this.childrenData.linkId;
       const linkKey = getLinkKey() || this.childrenData.linkKey;
       // console.log(taskId, linkId, linkKey)
       let apiFn = 'renderFormByTaskId';
@@ -177,9 +180,7 @@ export default {
         taskId = getFinishForm();
         apiFn = 'renderFinishForm';
       }
-
       this.isLoading = true;
-
       Api[apiFn](taskId, linkId, linkKey)
         .then(res => {
           this.isLoading = false;
@@ -420,7 +421,9 @@ export default {
           // console.log(res)
           if (res.status === 0) {
             notification('success', '保存成功！');
-            this.refresh();
+            if (!res.data.taskId) return false;
+            this.createTaskId = res.data.taskId;
+            this.refresh(res.data.taskId);
           } else {
             notification('warning', res.message || '保存失败，请重试！');
           }
@@ -480,7 +483,7 @@ export default {
           if (this.$refs['submitTask']) {
             this.$refs['submitTask'].$data.isSubmiting = false;
           }
-            
+
           if (res.status === 0) {
             this.submitTaskDialogVisible = false;
             // 关闭标签
@@ -501,7 +504,7 @@ export default {
           if (this.$refs['submitTask']) {
             this.$refs['submitTask'].$data.isSubmiting = false;
           }
-            
+
           notification('error', err.message || '提交错误');
         });
     },
@@ -777,6 +780,12 @@ export default {
         /* eslint-disable no-eval */
         eval(item.operation);
       }
+    },
+
+    // 关闭提交后的对话框事件
+    handleSubmitTaskClose() {
+      this.submitTaskDialogVisible = false;
+      this.refresh(this.createTaskId);
     }
   }
 };

template/form/views/page.vue

@@ -62,7 +62,7 @@ export default {
         this.loadError = true;
       });
     },
-    
+
     // 获取模块权限，赋值到pageInfo
     getAuthories() {
       const systemInfo = window.$ ? window.$.system.getSystemInfo() : null;

template/src/api/config.js

@@ -104,7 +104,7 @@ const config = {
       });
     });
   },
-  
+
   /**
    * FormData数据上传，文件上传必用
    * @param {String} url
@@ -182,7 +182,7 @@ const config = {
   }
 };
 
-// 切换页面强行中断请求 router.beforeEach中用到 
+// 切换页面强行中断请求 router.beforeEach中用到
 Vue.prototype.$cancelAjax = function(msg) {
   if (cancel) {
     cancel(msg || '手动中断请求');

template/src/api/loginInterceptor.js

@@ -16,12 +16,12 @@ const handleFilter = (key) => {
 /**
  * 登录判断失效
  * 在所有经过axios请求中，拦截到登录失效
- * 
+ *
  * @param {Object} response
  */
 let isOtherLogin = false;
 function loginInterceptor(response) {
-  // 9: 此账号在其他地方登陆 
+  // 9: 此账号在其他地方登陆
   // 8: 账号登录已经失效
   if (response.data && response.data.status === 8) {
     if (!isOtherLogin) {
@@ -53,7 +53,7 @@ function loginInterceptor(response) {
       });
     }
     return response;
-  } else {  
+  } else {
     return response;
   }
 }

template/src/components/tabs/src/tab-nav.vue

@@ -201,7 +201,7 @@ export default {
       const navSize = this.$refs.nav[`offset${ firstUpperCase(this.sizeName) }`];
       const containerSize = this.$refs.navScroll[`offset${ firstUpperCase(this.sizeName) }`];
       const currentOffset = this.navOffset;
-      
+
       let newOffset = 0;
 
       if (delta < 0) {
@@ -215,7 +215,7 @@ export default {
           ? currentOffset - containerSize
           : 0;
       }
-      
+
       this.navOffset = newOffset;
     },
 
@@ -251,7 +251,7 @@ export default {
         const node = document.createElement('ul');
         node.className = 's-tabs__contextmenu';
         node.id = 'sTabsContextmenu';
-        
+
         const list = ['关闭该标签页', '关闭其他标签页', '关闭全部'];
         list.forEach(item => {
           const liNode = document.createElement('li');

template/src/plugins/routes/businessConfig.js

 import { cb } from '../extend';
 
-export default { 
+export default {
   businessConfiguration: () => import('@/views/businessConfig/businessConfiguration').then(cb)
 };

template/src/store/index.js

 import Vue from 'vue';
 import Vuex from 'vuex';
-const packageConfig = require('../../../package.json');
+const packageConfig = require('./../../package.json');
 
 Vue.use(Vuex);
 

template/src/utils/expression/modules/menu.js

@@ -71,9 +71,9 @@ export default {
    * @param {Boolean|String} only 布尔值为true时，是固定使用externalLinkTab---1打开页面，当是string字符串时，自定义打开固定标签页
    */
   openExternalLinkTab(name, url, only) {
-    const id = (typeof only === 'boolean' && only) 
-      ? 'externalLinkTab---1' 
-      : (typeof only === 'string' && only) 
+    const id = (typeof only === 'boolean' && only)
+      ? 'externalLinkTab---1'
+      : (typeof only === 'string' && only)
         ? only : '';
     this.openTab({
       id,
@@ -90,7 +90,7 @@ export default {
   },
   /**
  * 刷新标签页
- * @param {String} id tab标签的唯一标识 
+ * @param {String} id tab标签的唯一标识
  */
   refreshTab(id) {
     store.state.navigationList.forEach(item => {

template/src/utils/expression/modules/system.js

@@ -14,21 +14,21 @@ export default {
     return store.state.userInfo || null;
   },
   /**
-   * 获取用户身份 
+   * 获取用户身份
    * @returns {String}
    */
   getUserName() {
     return store.state.userInfo ? store.state.userInfo.RealName : '';
   },
   /**
-   * 获取系统信息 
-   * @returns {Object} 
+   * 获取系统信息
+   * @returns {Object}
    */
   getSystemInfo() {
     return store.state.platformInfo || null;
   },
   /**
-   * 获取用户身份 
+   * 获取用户身份
    * @returns {String} admin | none
    */
   getUserIdentity() {
@@ -45,13 +45,13 @@ export default {
       position = 'bottom-right',
       ...opts
     } = options;
-  
+
     const _opts = {
       customClass,
       position,
       ...opts
     };
-  
+
     Notification(_opts);
   }
 };

template/src/utils/global.js

@@ -43,11 +43,11 @@ export function getSystemInfo(sysCode) {
   return new Promise((resolve, reject) => {
     Api.getSystemInfo(sysCode).then(res => {
       removeLoading();
-  
+
       if (res.status === 0) {
         store.state.platformInfo.systemId = res.data.systemId;
         store.state.platformInfo.name = res.data.sysMainTitle;
-  
+
         resolve();
       } else {
         reject(res);
@@ -88,7 +88,7 @@ export const removeTab = $.menu.removeTab;
 
 /**
  * 刷新tab页
- * @param {String} id tab标签的唯一标识 
+ * @param {String} id tab标签的唯一标识
  */
 export const refreshTab = $.menu.refreshTab;
 

template/src/utils/index.js

@@ -19,14 +19,14 @@ const utils = {
 
   /**
    * 深拷贝
-   * @param {Object|Array} p 
+   * @param {Object|Array} p
    * @param {Object|Array} c [] or {}
    */
   deepCopy(p, c) {
     c = c || {};
     for (const i in p) {
       if (typeof p[i] === 'object') {
-        c[i] = p[i] 
+        c[i] = p[i]
           ? (p[i] && p[i].constructor === Array) ? [] : {}
           : p[i];
         this.deepCopy(p[i], c[i]);
@@ -39,7 +39,7 @@ const utils = {
 
   /**
    * 随机生成唯一 ID
-   * @param {Number} 
+   * @param {Number}
    */
   generateId(len = 4) {
     return Number(Math.random().toString().substr(3, len) + Date.now()).toString(36);
@@ -47,7 +47,7 @@ const utils = {
 
   /**
    * 优化遍历，数组去重
-   * @param {Array} array 
+   * @param {Array} array
    */
   uniq(array, key) {
     const temp = [];

template/src/utils/mixins/permissionMixin.js

@@ -64,7 +64,7 @@ export default {
        * 一些模块的控件过滤
        * 例如：没有存在的菜单的项的路由组件，不作权限控件
        */
-      if (this.$SMTab && 
+      if (this.$SMTab &&
         [].indexOf(this.$SMTab.componentName) >= 0
       ) {
         return;

template/src/views/Main.vue

@@ -106,7 +106,7 @@ export default {
         }
 
         if (!flag) return;
-        
+
         let index = 0;
         this.tabsData.forEach((tab, idx) => {
           if (!Utils.isEmptyData(oldVal) && oldVal.id === tab.id) {
@@ -119,20 +119,14 @@ export default {
         } else {
           this.tabsData.splice(index + 1, 0, newVal);
         }
-        
+
         this.currentTab = newVal.id;
-        
+
         // 新打开tab
         this.$Progress.start();
       }
     },
 
-    navigationList(newVal) {
-      if (newVal.length > 0) {
-        
-      }
-    },
-
     currentTab() {
       const len = this.tabsData.length;
       for (let i = 0; i < len; i++) {
@@ -181,7 +175,7 @@ export default {
           }
         }
       }
-      
+
       this.currentTab = activeName;
       this.tabsData = tabs.filter(tab => tab.id !== targetName);
       this.$store.dispatch('removeNavigation', targetName);
@@ -198,7 +192,7 @@ export default {
         this.visiableDialog = true;
       }
     },
-    
+
     // 修改密码框显示事件
     handlePasswordDialogEvent(visiable) {
       this.visiableDialog = !!visiable;

template/src/views/common/ConfigurePage.vue

@@ -10,7 +10,7 @@
 
 export default {
   name: 'ConfigurePage',
-  
+
   data() {
     return {
       url: ''

template/src/views/common/Header.vue

@@ -17,11 +17,11 @@
             <span>表单设计器</span>
           </a>
         </div>
-        
-        <el-badge :value="unreadMessage" 
-          :hidden="unreadMessage === 0 || unreadMessage === '0'" 
-          style="margin-right: 10px;cursor: pointer;" 
-          :max="99" 
+
+        <el-badge :value="unreadMessage"
+          :hidden="unreadMessage === 0 || unreadMessage === '0'"
+          style="margin-right: 10px;cursor: pointer;"
+          :max="99"
           @click.native="handleMessage">
           <i class="iconfont icon-tongzhi"></i>
         </el-badge>

template/src/views/common/Logo.vue

@@ -20,11 +20,11 @@ export default {
       if (this.theme.format === 'top-bottom') return { fontSize: '22px' };
 
       let fontSize = '20px';
-      
-      const getStrLen = (str) => {  
-        if (str == null) return 0;  
-        if (typeof str !== 'string') {  
-          str += '';  
+
+      const getStrLen = (str) => {
+        if (str == null) return 0;
+        if (typeof str !== 'string') {
+          str += '';
         }
         /* eslint-disable */
         return str.replace(/[^\x00-\xff]/g, '01').length

template/src/views/common/PasswordDialog.vue

@@ -33,14 +33,14 @@ import Api from '@/api';
 import { getUser } from '@/utils/global';
 export default {
   name: 'PasswordDialog',
-  
+
   props: {
     visiableDialog: {
       type: Boolean,
-      default: false  
+      default: false
     }
   },
-  
+
   computed: {
     dialogVisiable() {
       return this.visiableDialog;
@@ -137,7 +137,6 @@ export default {
             });
             this.passSubmiting = false;
           }, 3000);
-        
         } else {
           this.$message({
             type: 'warning',

template/src/views/common/message.vue

 <template>
-  <sw-message 
+  <sw-message
     :user-info="userInfo"
     @unread-message-change="handleUnreadMessageChange">
   </sw-message>

template/src/views/login/Login.vue

@@ -7,7 +7,7 @@
     <login-form @submit="handleSubmited"></login-form>
   </div>
 </template>
- 
+
 <script>
 import LoginForm from './LoginForm.vue';
 

template/src/views/login/LoginForm.vue

@@ -5,32 +5,32 @@
         <span style="line-height: 36px;font-size:20px;">登录</span>
         <span v-if="showClose" class="login-form__close" @click.stop="handleClose"><i class="el-icon-close"></i></span>
       </div>
-      <el-form 
-        ref="loginForm" 
-        :model="loginForm" 
-        :rules="rules" 
+      <el-form
+        ref="loginForm"
+        :model="loginForm"
+        :rules="rules"
         label-width="100px"
         @submit.native.prevent>
         <el-form-item label="账户：" prop="name">
           <el-input v-model="loginForm.name" placeholder="输入登录用户名" autofocus @change="handleInputChange"></el-input>
         </el-form-item>
         <el-form-item label="密码：" prop="password">
-          <el-input type="password" 
-          v-model="loginForm.password" 
-          placeholder="请输入密码" 
+          <el-input type="password"
+          v-model="loginForm.password"
+          placeholder="请输入密码"
           @keyup.native.enter="onSubmit('loginForm')"
           @change="handleInputChange"></el-input>
         </el-form-item>
-        
+
         <el-form-item>
           <el-checkbox label="记住账户" v-model="loginForm.remember"></el-checkbox>
         </el-form-item>
         <el-form-item class="buttons">
-          <el-button 
-            type="primary" 
-            size="large" 
-            class="submitBtn" 
-            :loading="loginForm.loading" 
+          <el-button
+            type="primary"
+            size="large"
+            class="submitBtn"
+            :loading="loginForm.loading"
             @click="onSubmit()" >
             {{ loginForm.submitText }}
           </el-button>
@@ -131,7 +131,7 @@ export default {
                 message: message,
                 type: 'success'
               });
-              
+
               this.$emit('submit', userState);
               this.$router.replace({
                 path: '/',

template/src/views/mapConfig/catalogManagement.vue

 <template>
-  <sw-catalog-management></sw-catalog-management> 
+  <sw-catalog-management></sw-catalog-management>
 </template>
 
 <script>

template/src/views/myWork/checkProcess.vue

 <template>
-  <sw-check-process 
+  <sw-check-process
     :user-authority="userAuthories"
     :process-instance-id="processInstanceId">
   </sw-check-process>

template/src/views/myWork/createWork.vue

 <template>
-  <sw-create-work 
+  <sw-create-work
     ref="createWork"
     :user-authority="userAuthories"
     @open-work="handleOpenWork"

template/src/views/personalConfig/interface.vue

 <template>
-  <sw-interface 
+  <sw-interface
     :theme="theme"
     @theme-change="handleThemeChange"></sw-interface>
 </template>