eoss-ui 0.5.99 → 0.6.10

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 71);
+/******/ 	return __webpack_require__(__webpack_require__.s = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3768,150 +3768,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 7:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-
-
-
-var WebSocket = function () {
-  // 构造函数
-  function WebSocket() {
-    _classCallCheck(this, WebSocket);
-
-    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.socket = null;
-    this.subscription = null;
-  }
-
-  /** socket连接 */
-
-
-  WebSocket.prototype.connect = function connect() {
-    var _this = this;
-
-    if (!this.client) {
-      // 连接SockJS
-      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
-      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      this.client.debug = function () {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, function () {
-      _this.recon = true;
-      // tryTimes定义重置
-      _this.connects = 1;
-      // 订阅消息
-      _this.subscribe();
-    }, function (error) {
-      _this.unsubscribe();
-      _this.client = null;
-      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
-      if (_this.connects > 5 && diffSecond < _this.interval) {
-        _this.error && _this.error(error);
-      } else {
-        _this.reconTimeout = setTimeout(function () {
-          _this.connect();
-          _this.connects++;
-        }, 5000);
-      }
-    });
-  }; // 清除订阅
-
-
-  WebSocket.prototype.unsubscribe = function unsubscribe() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-      this.subscription = null;
-    }
-  };
-  /** 订阅服务端 */
-
-
-  WebSocket.prototype.subscribe = function subscribe() {
-    var _this2 = this;
-
-    // 订阅服务端提供的某个topic
-    this.subscription = this.client.subscribe(this.take, function (response) {
-      if (response && (_this2.callback || _this2.success)) {
-        var callback = _this2.callback || _this2.success;
-        callback(JSON.parse(response.body));
-      }
-    });
-  };
-
-  /** 赋值、初始化socket */
-
-
-  WebSocket.prototype.init = function init(option, vm) {
-    for (var i in option) {
-      this[i] = option[i];
-    }
-    this.vm = vm;
-    // 初始化连接
-    this.connect();
-  };
-
-  /** 发送消息 */
-
-
-  WebSocket.prototype.send = function send(data) {
-    var _this3 = this;
-
-    if (this.recon) {
-      clearTimeout(this.sendTimeout);
-      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
-    } else {
-      this.sendTimeout = setTimeout(function () {
-        _this3.send(data);
-      }, 1000);
-    }
-  };
-
-  /** 销毁 */
-
-
-  WebSocket.prototype.destroy = function destroy() {
-    // 断开连接,清除定时器
-    this.unsubscribe();
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  };
-
-  return WebSocket;
-}();
-
-/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
-
-/***/ }),
-
-/***/ 71:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4116,6 +3973,149 @@ main.install = function (Vue) {
 
 /***/ }),
 
+/***/ 7:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    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.socket = null;
+    this.subscription = null;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      _this.subscribe();
+    }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.subscription = this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    this.unsubscribe();
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
+
+/***/ }),
+
 /***/ 8:
 /***/ (function(module, exports) {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.99",
+  "version": "0.6.10",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.27",
+    "eoss-element": "^0.3.30",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/checkbox-group/src/main.vue

@@ -58,7 +58,6 @@ import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
 import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
-import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsCheckboxGroup',
   inheritAttrs: false,
@@ -281,10 +280,12 @@ export default {
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
             if (sysCode || this.dataKey) {
-              bus.$emit(
-                sysCode || this.dataKey,
-                JSON.parse(JSON.stringify(this.options))
-              );
+              const bus = this.bus || this.$root.Bus;
+              bus &&
+                bus.$emit(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           } else {
@@ -317,10 +318,12 @@ export default {
       this.options = val;
     },
     bindEventBus() {
-      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+      const bus = this.bus || this.$root.Bus;
+      bus && bus.$on(this.sysCode || this.dataKey, this.setOptions);
     },
     unbindEventBus() {
-      bus.$off(this.sysCode || this.dataKey, this.setOptions);
+      const bus = this.bus || this.$root.Bus;
+      bus && bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
   },
   beforeDestroy() {

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

@@ -217,7 +217,6 @@ import { debounce } from 'throttle-debounce';
 import children from './children.vue';
 import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
-import bus from 'eoss-ui/src/utils/bus';
 import qs from 'qs';
 const systemMode = util.win.top.systemMode || util.win.systemMode || 'default';
 const pageView = util.getParams('pageView');
@@ -974,10 +973,12 @@ export default {
                       [JSON.parse(JSON.stringify(res.results))]
                     );
                     if (item.sysCode) {
-                      bus.$emit(
-                        item.sysCode,
-                        JSON.parse(JSON.stringify(this.options[item.sysCode]))
-                      );
+                      const bus = this.bus || this.$root.Bus;
+                      bus &&
+                        bus.$emit(
+                          item.sysCode,
+                          JSON.parse(JSON.stringify(this.options[item.sysCode]))
+                        );
                     }
                   } else {
                     this.$set(
@@ -986,10 +987,12 @@ export default {
                       JSON.parse(JSON.stringify(res.results))
                     );
                     if (item.sysCode) {
-                      bus.$emit(
-                        item.sysCode,
-                        JSON.parse(JSON.stringify(res.results))
-                      );
+                      const bus = this.bus || this.$root.Bus;
+                      bus &&
+                        bus.$emit(
+                          item.sysCode,
+                          JSON.parse(JSON.stringify(res.results))
+                        );
                     }
                   }
                   this.requests.push(key);
@@ -1485,7 +1488,8 @@ export default {
           }
           this.injector && this.injector.handleChangeData(changes);
           if (handle.busEvent) {
-            bus.$emit(handle.busEvent, changes);
+            const bus = this.bus || this.$root.Bus;
+            bus && bus.$emit(handle.busEvent, changes);
           }
         }
       } else if (handle.changeData) {
@@ -1531,7 +1535,8 @@ export default {
         }
         this.injector && this.injector.handleChangeData(changeData);
         if (handle.busEvent) {
-          bus.$emit(handle.busEvent, changes);
+          const bus = this.bus || this.$root.Bus;
+          bus && bus.$emit(handle.busEvent, changes);
         }
       } else {
         if (handle.exportXls) {
@@ -1768,14 +1773,17 @@ export default {
     },
     bindEventBus() {
       this.sysCodes.forEach((item) => {
-        bus.$on(item, (val) => {
-          this.setOptions(val, item);
-        });
+        const bus = this.bus || this.$root.Bus;
+        bus &&
+          bus.$on(item, (val) => {
+            this.setOptions(val, item);
+          });
       });
     },
     unbindEventBus() {
       this.sysCodes.forEach((item) => {
-        bus.$off(item, this.setOptions);
+        const bus = this.bus || this.$root.Bus;
+        bus && bus.$off(item, this.setOptions);
       });
     },
     reset() {

package/packages/dialog/src/main.vue

@@ -266,8 +266,6 @@
 <script>
 import WujieVue from 'wujie-vue2';
 import util from 'eoss-ui/src/utils/util';
-import mbus from 'eoss-ui/src/utils/bus';
-const { bus } = WujieVue;
 let availWidth = 0;
 let availHeight = 0;
 availWidth = util.win.top.document.body.offsetWidth - 260;
@@ -397,15 +395,17 @@ export default {
   },
   created() {
     if (this.busEvent) {
-      mbus.$on(this.busEvent, async (res) => {
-        this.titles = res.title;
-        this.handler && (await this.handler(res, this));
-        this.handleShow();
-      });
+      const bus = this.bus || this.$root.Bus;
+      bus &&
+        bus.$on(this.busEvent, async (res) => {
+          this.titles = res.title;
+          this.handler && (await this.handler(res, this));
+          this.handleShow();
+        });
     }
   },
   mounted() {
-    bus.$on('dialogClose', (res, dialog) => {
+    WujieVue.bus.$on('dialogClose', (res, dialog) => {
       let _dialog = this.$refs[dialog._dialogId];
       if (_dialog) {
         _dialog.hide();
@@ -473,6 +473,11 @@ export default {
     getDialog() {
       return this.$refs[this.wujieName].$refs['dialog'];
     }
+  },
+  beforeDestroy() {
+    WujieVue.bus.$off('dialogClose');
+    const bus = this.bus || this.$root.Bus;
+    this.busEvent && bus && Bus.$off(this.busEvent);
   }
 };
 </script>

package/packages/flow/src/component/SendMsg.vue

@@ -21,6 +21,7 @@
             v-for="item of notificationList"
             :key="item.cciValue"
             :label="item.cciValue"
+            :disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
           >
             {{ item.shortName }}
           </el-checkbox>
@@ -31,6 +32,7 @@
           type="textarea"
           :rows="2"
           v-model="sendInfo.notificationMsg"
+          :readonly="notificationMessageReadOnly"
         />
       </el-form-item>
       <el-table
@@ -98,6 +100,8 @@ export default {
         notificationMsg: ''
       },
       appId: '',
+      notificationMessageReadOnly: true,
+      readOnlyNotificationType: '',
       loading: false,
       pendHistoryIds: '',
       notificationList: [],
@@ -195,11 +199,13 @@ export default {
           const {
             status,
             message,
-            data: { title, wfHistoryList, appId }
+            data: { title, wfHistoryList, appId,notificationMessageReadOnly, readOnlyNotificationType}
           } = res;
           this.loading = false;
           if (status === 'success') {
             this.sendInfo.title = title;
+            this.readOnlyNotificationType =readOnlyNotificationType;
+            this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
             this.appId = appId;
             this.sendTable = wfHistoryList;
             this.checkList();

package/packages/flow/src/component/taskUnionExamine.vue

@@ -80,6 +80,7 @@
             v-for="item of infoList.noticeList"
             :key="item.cciValue"
             :label="item.cciValue"
+            :disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
           >
             {{ item.shortName }}
           </el-checkbox>
@@ -90,7 +91,18 @@
         prop="noticeInfo"
         label="通知消息"
       >
-        <span>{{ infoList.noticeInfo }}</span>
+      <es-input
+            style="
+              border-color: #ccc;
+              padding: 5px;
+              border-radius: 5px;
+              font-size: 13px;
+            "
+            type="textarea"
+            v-model="infoList.noticeInfo"
+            :readonly="notificationMessageReadOnly"
+          />
+        <!-- <span>{{ infoList.noticeInfo }}</span> -->
       </el-form-item>
       <el-form-item>
         <div style="text-align: right">
@@ -142,6 +154,8 @@ export default {
   data() {
     return {
       opinion: '', //办理意见
+      readOnlyNotificationType:'',
+      notificationMessageReadOnly:false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -287,6 +301,8 @@ export default {
                 choiceOrgId,
                 taskExamine,
                 unionDispatchOrgName,
+                readOnlyNotificationType,
+                notificationMessageReadOnly,
                 unionDispatchOrgId,
                 orgNames,
                 nodeInfoMap: {
@@ -299,6 +315,8 @@ export default {
                 }
               }
             } = res;
+            this.readOnlyNotificationType = readOnlyNotificationType
+            this.notificationMessageReadOnly = notificationMessageReadOnly == 'true'
             this.isSinglePage = taskExamine.isSinglePage;
             this.isSubFlow = taskExamine.isSubFlow;
             this.opinion = taskExamine.opinion;