ecinc-cloud-yoabase 9.5.100 → 9.5.102

package/lib/ecyoabase.common.js

@@ -2555,7 +2555,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".view-body-article[data-v-08dd89f2]{ma
 
 /***/ }),
 
-/***/ 4196:
+/***/ 5063:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2569,7 +2569,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".water[data-v-f1cc1e30]{position:absolute;top:0;pointer-events:none}.waterList[data-v-f1cc1e30]{position:relative;width:100vw;height:100vh}.Watermark[data-v-f1cc1e30],.waterList[data-v-f1cc1e30]{pointer-events:none;overflow:hidden}.Watermark[data-v-f1cc1e30]{position:absolute;color:#666;white-space:nowrap;z-index:99999;line-height:40px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".water[data-v-40206146]{position:absolute;top:0;pointer-events:none}.waterList[data-v-40206146]{position:relative;width:100vw;height:100vh}.Watermark[data-v-40206146],.waterList[data-v-40206146]{pointer-events:none;overflow:hidden}.Watermark[data-v-40206146]{position:absolute;color:#666;white-space:nowrap;z-index:99999;line-height:40px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -78573,19 +78573,19 @@ var update = add("d270124a", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 9498:
+/***/ 5785:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(4196);
+var content = __webpack_require__(5063);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("6828a912", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("53663b92", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -232401,8 +232401,8 @@ var ViewBodyArticle_component = normalizeComponent(
 )
 
 /* harmony default export */ var ViewBodyArticle = (ViewBodyArticle_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=template&id=f1cc1e30&scoped=true
-var Watermarkvue_type_template_id_f1cc1e30_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=template&id=40206146&scoped=true
+var Watermarkvue_type_template_id_40206146_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.show ? _c('div', {
@@ -232414,7 +232414,10 @@ var Watermarkvue_type_template_id_f1cc1e30_scoped_true_render = function render(
     staticClass: "waterList"
   }, _vm._l(_vm.countY, function (index) {
     return _c('div', {
-      key: index
+      key: index,
+      attrs: {
+        "id": index
+      }
     }, _vm._l(_vm.countX, function (idx) {
       return _c('div', {
         key: idx,
@@ -232425,12 +232428,15 @@ var Watermarkvue_type_template_id_f1cc1e30_scoped_true_render = function render(
           left: _vm.content.xSpace * (idx - 1) + 40 + 'px',
           opacity: _vm.content.pellucidity,
           'font-size': _vm.content.showSize + 'pt'
+        },
+        attrs: {
+          "id": "idx"
         }
       }, [_vm._v(_vm._s(_vm.content.showContent))]);
     }), 0);
   }), 0)]) : _vm._e();
 };
-var Watermarkvue_type_template_id_f1cc1e30_scoped_true_staticRenderFns = [];
+var Watermarkvue_type_template_id_40206146_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=script&lang=js
 function Watermarkvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return Watermarkvue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, Watermarkvue_type_script_lang_js_typeof(o); }
@@ -232493,12 +232499,27 @@ function Watermarkvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != Wa
         contentType: 'application/x-www-form-urlencoded',
         url: '/base/watermarkConfig/getWaterMarkConfig'
       }).then(function (res) {
-        if (res.body.vo) {
+        if (res.body.vo && res.body.vo.showContent) {
           var vo = res.body.vo;
           vo.pellucidity = Number(vo.pellucidity) / 100;
-          vo.space = Number(vo.space);
-          _this2.countX = Math.ceil(Number(document.getElementById('wapp').clientWidth) / vo.xSpace);
-          _this2.countY = Math.ceil(Number(document.getElementById('wapp').clientHeight) / vo.ySpace);
+          vo.xSpace = Number(vo.xSpace);
+          vo.ySpace = Number(vo.ySpace);
+          if (vo.xSpace < 20) {
+            _this2.countX = vo.xSpace;
+          } else {
+            if (vo.xSpace < 200) {
+              vo.xSpace += 200;
+            }
+            _this2.countX = Math.ceil(Number(document.getElementById('wapp').clientWidth) / vo.xSpace);
+          }
+          if (vo.ySpace < 30) {
+            _this2.countY = vo.ySpace;
+          } else {
+            if (vo.ySpace < 300) {
+              vo.ySpace += 300;
+            }
+            _this2.countY = Math.ceil(Number(document.getElementById('wapp').clientHeight) / vo.ySpace);
+          }
           _this2.content = vo;
           if (_this2.loginUser && _this2.loginUser.orgCode) {
             _this2.show = true;
@@ -232514,9 +232535,9 @@ function Watermarkvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != Wa
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_Watermarkvue_type_script_lang_js = (Watermarkvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=f1cc1e30&prod&scoped=true&lang=scss
-var Watermarkvue_type_style_index_0_id_f1cc1e30_prod_scoped_true_lang_scss = __webpack_require__(9498);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=f1cc1e30&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=40206146&prod&scoped=true&lang=scss
+var Watermarkvue_type_style_index_0_id_40206146_prod_scoped_true_lang_scss = __webpack_require__(5785);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=40206146&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue
 
@@ -232529,11 +232550,11 @@ var Watermarkvue_type_style_index_0_id_f1cc1e30_prod_scoped_true_lang_scss = __w
 
 var Watermark_component = normalizeComponent(
   components_Watermarkvue_type_script_lang_js,
-  Watermarkvue_type_template_id_f1cc1e30_scoped_true_render,
-  Watermarkvue_type_template_id_f1cc1e30_scoped_true_staticRenderFns,
+  Watermarkvue_type_template_id_40206146_scoped_true_render,
+  Watermarkvue_type_template_id_40206146_scoped_true_staticRenderFns,
   false,
   null,
-  "f1cc1e30",
+  "40206146",
   null
   
 )

package/lib/ecyoabase.umd.js

@@ -2565,7 +2565,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".view-body-article[data-v-08dd89f2]{ma
 
 /***/ }),
 
-/***/ 7716:
+/***/ 8583:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2579,7 +2579,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".water[data-v-f1cc1e30]{position:absolute;top:0;pointer-events:none}.waterList[data-v-f1cc1e30]{position:relative;width:100vw;height:100vh}.Watermark[data-v-f1cc1e30],.waterList[data-v-f1cc1e30]{pointer-events:none;overflow:hidden}.Watermark[data-v-f1cc1e30]{position:absolute;color:#666;white-space:nowrap;z-index:99999;line-height:40px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".water[data-v-40206146]{position:absolute;top:0;pointer-events:none}.waterList[data-v-40206146]{position:relative;width:100vw;height:100vh}.Watermark[data-v-40206146],.waterList[data-v-40206146]{pointer-events:none;overflow:hidden}.Watermark[data-v-40206146]{position:absolute;color:#666;white-space:nowrap;z-index:99999;line-height:40px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -47990,7 +47990,7 @@ return jQuery;
 
 /***/ }),
 
-/***/ 4451:
+/***/ 480:
 /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
 
 //! moment.js locale configuration
@@ -55464,8 +55464,8 @@ var map = {
 	"./kk.js": 7088,
 	"./km": 6870,
 	"./km.js": 6870,
-	"./kn": 4451,
-	"./kn.js": 4451,
+	"./kn": 480,
+	"./kn.js": 480,
 	"./ko": 783,
 	"./ko.js": 783,
 	"./ku": 8174,
@@ -78583,19 +78583,19 @@ var update = add("ddbbce4a", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 8416:
+/***/ 7923:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(7716);
+var content = __webpack_require__(8583);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("d5f16512", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("1c81dd92", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -232411,8 +232411,8 @@ var ViewBodyArticle_component = normalizeComponent(
 )
 
 /* harmony default export */ var ViewBodyArticle = (ViewBodyArticle_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=template&id=f1cc1e30&scoped=true
-var Watermarkvue_type_template_id_f1cc1e30_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=template&id=40206146&scoped=true
+var Watermarkvue_type_template_id_40206146_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.show ? _c('div', {
@@ -232424,7 +232424,10 @@ var Watermarkvue_type_template_id_f1cc1e30_scoped_true_render = function render(
     staticClass: "waterList"
   }, _vm._l(_vm.countY, function (index) {
     return _c('div', {
-      key: index
+      key: index,
+      attrs: {
+        "id": index
+      }
     }, _vm._l(_vm.countX, function (idx) {
       return _c('div', {
         key: idx,
@@ -232435,12 +232438,15 @@ var Watermarkvue_type_template_id_f1cc1e30_scoped_true_render = function render(
           left: _vm.content.xSpace * (idx - 1) + 40 + 'px',
           opacity: _vm.content.pellucidity,
           'font-size': _vm.content.showSize + 'pt'
+        },
+        attrs: {
+          "id": "idx"
         }
       }, [_vm._v(_vm._s(_vm.content.showContent))]);
     }), 0);
   }), 0)]) : _vm._e();
 };
-var Watermarkvue_type_template_id_f1cc1e30_scoped_true_staticRenderFns = [];
+var Watermarkvue_type_template_id_40206146_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=script&lang=js
 function Watermarkvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return Watermarkvue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, Watermarkvue_type_script_lang_js_typeof(o); }
@@ -232503,12 +232509,27 @@ function Watermarkvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != Wa
         contentType: 'application/x-www-form-urlencoded',
         url: '/base/watermarkConfig/getWaterMarkConfig'
       }).then(function (res) {
-        if (res.body.vo) {
+        if (res.body.vo && res.body.vo.showContent) {
           var vo = res.body.vo;
           vo.pellucidity = Number(vo.pellucidity) / 100;
-          vo.space = Number(vo.space);
-          _this2.countX = Math.ceil(Number(document.getElementById('wapp').clientWidth) / vo.xSpace);
-          _this2.countY = Math.ceil(Number(document.getElementById('wapp').clientHeight) / vo.ySpace);
+          vo.xSpace = Number(vo.xSpace);
+          vo.ySpace = Number(vo.ySpace);
+          if (vo.xSpace < 20) {
+            _this2.countX = vo.xSpace;
+          } else {
+            if (vo.xSpace < 200) {
+              vo.xSpace += 200;
+            }
+            _this2.countX = Math.ceil(Number(document.getElementById('wapp').clientWidth) / vo.xSpace);
+          }
+          if (vo.ySpace < 30) {
+            _this2.countY = vo.ySpace;
+          } else {
+            if (vo.ySpace < 300) {
+              vo.ySpace += 300;
+            }
+            _this2.countY = Math.ceil(Number(document.getElementById('wapp').clientHeight) / vo.ySpace);
+          }
           _this2.content = vo;
           if (_this2.loginUser && _this2.loginUser.orgCode) {
             _this2.show = true;
@@ -232524,9 +232545,9 @@ function Watermarkvue_type_script_lang_js_toPrimitive(t, r) { if ("object" != Wa
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_Watermarkvue_type_script_lang_js = (Watermarkvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=f1cc1e30&prod&scoped=true&lang=scss
-var Watermarkvue_type_style_index_0_id_f1cc1e30_prod_scoped_true_lang_scss = __webpack_require__(8416);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=f1cc1e30&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=40206146&prod&scoped=true&lang=scss
+var Watermarkvue_type_style_index_0_id_40206146_prod_scoped_true_lang_scss = __webpack_require__(7923);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue?vue&type=style&index=0&id=40206146&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Watermark/index.vue
 
@@ -232539,11 +232560,11 @@ var Watermarkvue_type_style_index_0_id_f1cc1e30_prod_scoped_true_lang_scss = __w
 
 var Watermark_component = normalizeComponent(
   components_Watermarkvue_type_script_lang_js,
-  Watermarkvue_type_template_id_f1cc1e30_scoped_true_render,
-  Watermarkvue_type_template_id_f1cc1e30_scoped_true_staticRenderFns,
+  Watermarkvue_type_template_id_40206146_scoped_true_render,
+  Watermarkvue_type_template_id_40206146_scoped_true_staticRenderFns,
   false,
   null,
-  "f1cc1e30",
+  "40206146",
   null
   
 )