eoss-ui 0.5.11 → 0.5.12

package/packages/data-table/src/main.vue

@@ -451,8 +451,8 @@ export default {
     },
     theads: {
       get() {
-        if (typeof this.thead === 'string') {
-          this.theadData.length && this.setMinWidth(this.theadData);
+        if (this.theadData.length) {
+          this.setMinWidth(this.theadData);
           return this.theadData;
         }
         this.setMinWidth(this.thead);

package/packages/data-table/src/sizer.vue

@@ -95,7 +95,7 @@ export default {
       this.visible = true;
     },
     getThead(res, data) {
-      res.forEach(item => {
+      res.forEach((item) => {
         if (
           item.type !== 'index' &&
           item.type !== 'selection' &&

package/packages/flow/src/main.vue

@@ -307,6 +307,7 @@
                   :multiple="true"
                   :selectUserList="selectReadUserList"
                   :options="userOptions"
+                  title="分阅用户"
                   :mix="true"
                   :types="types"
                   @change="changeSelectReadUser($event, 'nextReadUserId')"
@@ -327,6 +328,7 @@
                   :options="presetOptions"
                   :radioList="presetReadUserId"
                   :presetEdit="1"
+                  title="分阅用户"
                   :mix="true"
                   :types="types"
                   @change="changeSelectReadUser($event, 'presetReadUserId')"

package/packages/flow/src/processForm.vue

@@ -145,6 +145,7 @@
             :multiple="true"
             :selectUserList="selectReadUserList"
             :options="userOptions"
+            title="分阅用户"
             :mix="true"
             :types="types"
             @change="changeSelectReadUser($event, 'nextReadUserId')"
@@ -163,6 +164,7 @@
             :multiple="true"
             :selectUserList="selectPresetUserList"
             :options="presetOptions"
+            title="分阅用户"
             :radioList="presetReadUserId"
             :presetEdit="1"
             :mix="true"
@@ -181,10 +183,7 @@
             v-model="nextNode.handleExplain"
           />
         </el-form-item>
-        <el-form-item
-          prop="noticeType"
-          label="通知方式"
-        >
+        <el-form-item prop="noticeType" label="通知方式">
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox
               v-for="item of nextNode.noticeList"
@@ -331,11 +330,17 @@ export default {
       tabs: {
         employee: {
           param: {
-            filid: sessionStorage.getItem('orgId'),
+            filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel
+              .orgId,
             name: '本单位用户'
           }
         },
-        department: { param: { filid: sessionStorage.getItem('orgId') } }
+        department: {
+          param: {
+            filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel
+              .orgId
+          }
+        }
       },
       nextUserTabs: {},
       selectPresetUserList: [],
@@ -383,7 +388,6 @@ export default {
   mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
-
   },
   methods: {
     getIsShowNextUser(val) {
@@ -401,7 +405,12 @@ export default {
         if (val == 7 || val == 8) {
           this.nextUserTypes = ['department'];
           this.nextUserTabs = {
-            department: { param: { filid: sessionStorage.getItem('orgId') } }
+            department: {
+              param: {
+                filid: JSON.parse(sessionStorage.getItem('mainConfig'))
+                  .userModel.orgId
+              }
+            }
           };
           this.multiple = true;
         } else if (val == 9 || val == 10) {
@@ -412,7 +421,12 @@ export default {
           this.nextUserTypes = ['department', 'enterprise'];
           this.nextUserTabs = {
             enterprise: { param: { filid: 'other' } },
-            department: { param: { filid: sessionStorage.getItem('orgId') } }
+            department: {
+              param: {
+                filid: JSON.parse(sessionStorage.getItem('mainConfig'))
+                  .userModel.orgId
+              }
+            }
           };
           this.multiple = true;
         }

package/packages/flow-list/src/main.vue

@@ -8,7 +8,7 @@
         (item.type == 'splitReading' &&
           splitReadingData &&
           splitReadingData.length > 0) ||
-        (item.type == 'preset' && presetData && presetData.length > 0) ||
+        (item.type == 'preset' && presetData && presetData.length > 0 && currentUserHasPresetInfoAuth) ||
         (item.type != 'splitReading' && item.type != 'preset')
       "
     >
@@ -128,6 +128,7 @@ export default {
       pressTableList: [],
       currentPage: 1,
       pageSize: 20,
+      currentUserHasPresetInfoAuth:false,
       pressThead: [
         {
           title: '催办节点',
@@ -320,6 +321,7 @@ export default {
             label: '经办部门',
             field: 'deptid',
             align: 'center',
+            key:'jbbm',
             showOverflowTooltip: true,
             width: 150
           },
@@ -327,6 +329,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
+            key:'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -334,6 +337,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
+            key:'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -342,11 +346,13 @@ export default {
             field: 'deptName',
             align: 'center',
             showOverflowTooltip: true,
+            key:'blrbm',
             width: 110
           },
           {
             label: '状态',
             field: 'pendstate',
+            key:'zt',
             align: 'center',
             showOverflowTooltip: true,
             width: 80,
@@ -369,6 +375,7 @@ export default {
             field: 'doresult',
             align: 'center',
             showOverflowTooltip: true,
+            key:'blyj',
             render: (h, params) => {
               return h(
                 'span',
@@ -381,6 +388,7 @@ export default {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
+            key:'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -393,6 +401,7 @@ export default {
           },
           {
             label: '附件',
+            key:'fj',
             field: 'hasAdjunct',
             align: 'center',
             showOverflowTooltip: true,
@@ -414,6 +423,7 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
+            key:'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -428,6 +438,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
+            key:'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -436,6 +447,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
+            key:'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -472,6 +484,7 @@ export default {
           {
             label: '经办部门',
             field: 'deptid',
+            key:'jbbm',
             align: 'center',
             showOverflowTooltip: true,
             width: 150
@@ -480,6 +493,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
+            key:'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -487,6 +501,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
+            key:'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -494,6 +509,7 @@ export default {
             label: '状态',
             field: 'pendstate',
             align: 'center',
+            key:'zt',
             showOverflowTooltip: true,
             width: 80,
             render: (h, params) => {
@@ -514,6 +530,7 @@ export default {
             label: '办理意见',
             field: 'doresult',
             align: 'center',
+            key:'blyj',
             showOverflowTooltip: true,
             render: (h, params) => {
               return h(
@@ -527,6 +544,7 @@ export default {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
+            key:'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -541,6 +559,7 @@ export default {
             label: '附件',
             field: 'hasAdjunct',
             align: 'center',
+            key:'fj',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -560,6 +579,7 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
+            key:'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -574,6 +594,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
+            key:'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -582,6 +603,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
+            key:'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -1084,12 +1106,13 @@ export default {
           const {
             status,
             message,
-            data: { presetInfoList, presetInfoListHiddenColumns, canDelete }
+            data: { presetInfoList, presetInfoListHiddenColumns, canDelete,currentUserHasPresetInfoAuth }
           } = res;
           this.loading.close();
           if (status == 'success') {
             presetInfoList && (this.presetData = presetInfoList);
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
+            this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth
             this.canDelete = canDelete;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');

package/packages/main/src/main.vue

@@ -254,6 +254,8 @@ import notice from './notice.vue';
 import AsyncComponent from './async-component/index.vue';
 import {
   //authCenter,
+  wss,
+  topic,
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
@@ -540,8 +542,6 @@ export default {
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      close: null,
-      connect: 0,
       wjName: 'singlespa',
       menus: '',
       //头部导航
@@ -618,7 +618,8 @@ export default {
       navIds: null,
       timer: null,
       pid: null,
-      showPage: false
+      showPage: false,
+      webSocket: null
     };
   },
   created() {
@@ -1874,11 +1875,11 @@ export default {
     },
     //开启weosocket
     initWebSocket() {
-      util
-        .socket()
-        .then((res, close) => {
-          this.close = close;
-          let data = res.data;
+      this.webSocket = util.socket({
+        url: wss,
+        take: topic,
+        success: (res) => {
+          let data = res.data || {};
           for (let i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
@@ -1910,10 +1911,8 @@ export default {
           if (util.win.eventBus) {
             util.win.eventBus.$emit('websocket', data);
           }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+        }
+      });
     },
     handleOpened(res) {
       if (res === undefined) {
@@ -2048,8 +2047,8 @@ export default {
   },
   beforeDestroy() {
     this.timer = null;
-    if (this.close) {
-      this.close();
+    if (this.webSocket) {
+      this.webSocket.destroy();
     }
   }
 };

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.11',
+  version: '0.5.12',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -7,12 +7,11 @@
 
 /* eslint-disable indent */
 const sm2 = require('sm-crypto').sm2;
-import { authCenter, wss, topic } from '../config/api';
+import { authCenter } from '../config/api';
 import axios from 'axios';
 import qs from 'qs';
 import JSONbig from 'json-bigint';
-import SockJS from 'sockjs-client';
-import Stomp from 'stompjs';
+import WebSocket from './webSocket';
 
 const win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
 
@@ -1997,29 +1996,29 @@ const isLogined = function ({
       }).catch(e => { });
     } else
       if (
-      token ||
-      to.path === '/' ||
-      to.path === '/404' ||
-      exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 ||
-      to.path === '/login' ||
-      (token && to.path === '/main')
-    ) {
-      if (redirect && (to.path === '/main' || to.path === '/login')) {
-        window.location.replace(urlJoinParams({ url: `.${to.path}.html`, param: to.query }));
-      } else {
-        next();
-      }
-    } else {
-      if (loginPage) {
-        win.top.location.replace(loginPage);
-      } else if (document.referrer) {
-        win.top.location.replace(document.referrer);
-      } else if (win.top.location.href.indexOf('main.html') > -1) {
-        win.top.location.href = './login.html';
+        token ||
+        to.path === '/' ||
+        to.path === '/404' ||
+        exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 ||
+        to.path === '/login' ||
+        (token && to.path === '/main')
+      ) {
+        if (redirect && (to.path === '/main' || to.path === '/login')) {
+          window.location.replace(urlJoinParams({ url: `.${to.path}.html`, param: to.query }));
+        } else {
+          next();
+        }
       } else {
-        next('/login');
+        if (loginPage) {
+          win.top.location.replace(loginPage);
+        } else if (document.referrer) {
+          win.top.location.replace(document.referrer);
+        } else if (win.top.location.href.indexOf('main.html') > -1) {
+          win.top.location.href = './login.html';
+        } else {
+          next('/login');
+        }
       }
-    }
   }
 };
 const isLogged = function (res) {
@@ -2472,67 +2471,25 @@ const setStorage = function ({ type, key, value }) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
+ * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
- **/
-function socket(options) {
-  let nextDate = 0;
-  let connect = 1;
-  return new Promise((resolve, reject) => {
-    let wshost = getStorage('wshost') || '';
-    let option = {
-      url: wshost + wss,
-      take: topic,
-      debug: true,
-      interval: 20
-    };
-    let websocket = win.websocket || {};
-    if (options && isObject(options)) {
-      option = { ...option, ...options };
-    }
-    let key = window.btoa(option.url);
-    if (!websocket[key]) {
-      websocket[key] = { socket: new SockJS(option.url) };
-      win.websocket = websocket;
-    }
-
-    let client = websocket[key] ? websocket[key].client : null;
-    if (!client) {
-      client = websocket[key].client = Stomp.over(websocket[key].socket);
-      !option.debug && (client.debug = null);
+ * @param {Function} [success] - 调试
+ * @param {Function} [error] - 重连间隔时间
+ **/
+function socket(option, vm) {
+  let options = {};
+  for (let i in option) {
+    if (i === 'send') {
+      options['isSend'] = option[i];
+    } else {
+      options[i] = option[i];
     }
-    client.connect(
-      {},
-      () => {
-        client.subscribe(option.take, (response) => {
-          let res = JSON.parse(response.body);
-          resolve(res, () => {
-            client.disconnect();
-            win.top.websocket && win.top.websocket[key] && delete win.top.websocket[key];
-          }, client, websocket[key]);
-        });
-      },
-      (error) => {
-        let diffSecond = parseInt((new Date() - nextDate) / 1000, 10);
-        if (connect > 5 && diffSecond < option.interval) {
-          client.disconnect();
-          if (win.top.websocket) {
-            if (Object.keys(win.top.websocket).length > 1) {
-              delete win.top.websocket[key];
-            } else {
-              delete win.top.websocket;
-            }
-          }
-        } else {
-          win.top.websocket && win.top.websocket[key] && setTimeout(() => {
-            socket(options);
-          }, 5000);
-        }
-        reject(error);
-      }
-    );
-  });
+  }
+  const socket = new WebSocket();
+  socket.init(options, vm);
+  return socket;
 }
 /**
  * sum

package/src/utils/webSocket.js

@@ -0,0 +1,103 @@
+import SockJS from 'sockjs-client';
+import Stomp from 'stompjs';
+class WebSocket {
+  // 构造函数
+  constructor() {
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.isSend = false;
+  }
+
+  /** socket连接 */
+  connect() {
+    if (!this.client) {
+    // 连接SockJS
+      let socket = new SockJS(this.host + this.url);
+      // 获取STOMP子协议的客户端对象
+      this.client = Stomp.over(socket);
+
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      console.log(111);
+      this.client.debug = () => {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, () => {
+      this.recon = true;
+      // tryTimes定义重置
+      this.connects = 1;
+      // 订阅消息
+      // if (!this.isSend) {
+      this.subscribe();
+      // }
+    }, (error) => {
+      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
+      if (this.connects > 5 && diffSecond < this.interval) {
+        this.client.disconnect();
+        this.error && this.error(error);
+      } else {
+        this.reconTimeout = setTimeout(() => {
+          this.connect();
+          this.connects++;
+        }, 5000);
+      }
+    });
+  }
+  /** 订阅服务端 */
+  subscribe() {
+    // 订阅服务端提供的某个topic
+    this.client.subscribe(this.take, (response) => {
+      if (response && (this.callback || this.success)) {
+        let callback = this.callback || this.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  }
+
+  /** 赋值、初始化socket */
+  init(option, vm) {
+    for (let i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  }
+
+  /** 发送消息 */
+  send(data) {
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(() => {
+        this.send(data);
+      }, 1000);
+    }
+  }
+
+  /** 销毁 */
+  destroy() {
+    // 断开连接,清除定时器
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  }
+}
+
+export default WebSocket;