eoss-ui 0.4.65 → 0.4.67

package/lib/wujie.js

@@ -2275,16 +2275,19 @@ var uuid = function uuid(len) {
  **/
 var watermark = function watermark(option) {
   // 默认设置
+  var _width = parseInt(option.width || 480, 10);
+  var _height = parseInt(option.width || 180, 10);
+  var _rows = Math.round(document.body.clientHeight / _height);
+  var _cols = Math.round(document.body.clientWidth / _width);
   var config = {
-    rows: 5, // 水印行数
-    cols: 5,
+    rows: _rows, // 水印行数
+    cols: _cols,
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,11 +2329,18 @@ var watermark = function watermark(option) {
   for (var i = 0; i < num; i++) {
     var item = document.createElement('div');
     item.innerHTML = html;
-    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + (width ? parseInt(width, 10) + 'px' : 100 / cols + '%') + ';min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
+    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
+  var _timeout = void 0;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 /* harmony default export */ __webpack_exports__["a"] = ({

package/lib/wxlogin.js

@@ -2275,16 +2275,19 @@ var uuid = function uuid(len) {
  **/
 var watermark = function watermark(option) {
   // 默认设置
+  var _width = parseInt(option.width || 480, 10);
+  var _height = parseInt(option.width || 180, 10);
+  var _rows = Math.round(document.body.clientHeight / _height);
+  var _cols = Math.round(document.body.clientWidth / _width);
   var config = {
-    rows: 5, // 水印行数
-    cols: 5,
+    rows: _rows, // 水印行数
+    cols: _cols,
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,11 +2329,18 @@ var watermark = function watermark(option) {
   for (var i = 0; i < num; i++) {
     var item = document.createElement('div');
     item.innerHTML = html;
-    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + (width ? parseInt(width, 10) + 'px' : 100 / cols + '%') + ';min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
+    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
+  var _timeout = void 0;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 /* harmony default export */ __webpack_exports__["a"] = ({

package/package.json

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

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

@@ -60,6 +60,14 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsCheckboxGroup',
   inheritAttrs: false,
+  inject: {
+    esForm: {
+      default: ''
+    },
+    sysCodes: {
+      default: ''
+    }
+  },
   props: {
     method: {
       type: String,
@@ -121,11 +129,13 @@ export default {
     isNoParamRequest: {
       type: Boolean,
       default: true
-    }
+    },
+    dataKey: String
   },
   data() {
     return {
-      options: ''
+      options: '',
+      canceled: false
     };
   },
   computed: {
@@ -216,6 +226,27 @@ export default {
       handler() {
         this.url && this.getData(this.url);
       }
+    },
+    sysCodes: {
+      deep: true,
+      handler(val) {
+        if (
+          this.canceled &&
+          val &&
+          ((this.sysCode && val[this.sysCode]) ||
+            (this.dataKey && val[this.dataKey]))
+        ) {
+          if (this.parseData) {
+            this.options = this.parseData(
+              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
+            );
+          } else {
+            this.options = JSON.parse(
+              JSON.stringify(val[this.sysCode || this.dataKey])
+            );
+          }
+        }
+      }
     }
   },
   created() {},
@@ -248,9 +279,15 @@ export default {
         })
         .then((res) => {
           this.loading = false;
+          this.canceled = false;
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
-            if (sysCode) {
+            if (sysCode || this.dataKey) {
+              this.esForm &&
+                this.esForm.setSysCodes(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           } else {
@@ -260,8 +297,13 @@ export default {
         })
         .catch((err) => {
           this.loading = false;
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
+          if (err.message) {
+            if (err.message !== 'canceled') {
+              this.$message.error(err.message);
+            }
+            if (err.message === 'canceled' && sysCode) {
+              this.canceled = true;
+            }
           }
         });
     },

package/packages/flow/src/main.vue

@@ -1011,7 +1011,7 @@ export default {
       }
     },
     setShrink() {
-      this.shrink = !this.shrink
+      this.shrink = !this.shrink;
       this.$emit('shrink', this.shrink);
     },
     customLoading(type) {
@@ -1708,13 +1708,14 @@ export default {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
-        this.operationList.map((item) => {
+        this.operationList.forEach((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
               this.nodeInfos = [];
             } else {
               this.nodeInfos = item.taskNodeList;
             }
+            return;
           }
         });
         if (this.defaultNextNode) {
@@ -1865,8 +1866,8 @@ export default {
               }
             } = res;
             this.$emit('startTaskRead', res);
-            this.currentOrgName = currentOrgName
-            this.otherOrgName = otherOrgName
+            this.currentOrgName = currentOrgName;
+            this.otherOrgName = otherOrgName;
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
             this.endFlowInfo.pendingId = this.pendingId;
@@ -1874,7 +1875,7 @@ export default {
             this.endFlowInfo.pOrgId = pOrgId;
             this.canPresetRead = canPresetRead;
             this.isCdjxjTaskHandle = isCdjxjTaskHandle;
-            this.operationList = taskOperations;
+            this.operationList = taskOperations || [];
             this.customPresetHintMessage = customPresetHintMessage;
             if (canPresetRead) {
               let ids =