zl-element 0.0.15 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zl-element",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "A Vue.js 2.0 UI Toolkit for Web",
   "main": "src/zl_element.umd.min.js",
   "module": "zl_element.common.js",

package/src/zl_element.common.js

@@ -35,27 +35,6 @@ module.exports = function (argument, usingIterator) {
 };
 
 
-/***/ }),
-
-/***/ 134:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1601);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6314);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__);
-// Imports
-
-
-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, "*[data-v-fa5edd36]{box-sizing:border-box}.zl-water-mark-container[data-v-fa5edd36]{position:relative;overflow:hidden}.zl-water-mark-container .zl-water-mark[data-v-fa5edd36]{-webkit-user-select:none;-moz-user-select:none;user-select:none;position:absolute;width:100%;height:100%;left:0;top:0;z-index:10;pointer-events:none;display:flex;flex-direction:column}.zl-water-mark-container .zl-water-mark .zl-water-mark-out[data-v-fa5edd36]{width:100%;height:100%;display:flex;flex-direction:row}.zl-water-mark-container .zl-water-mark .zl-water-mark-out:nth-child(2n) .zl-water-mark-in[data-v-fa5edd36]{transform:translate(-25%) rotate(-25deg)}.zl-water-mark-container .zl-water-mark .zl-water-mark-out .zl-water-mark-in[data-v-fa5edd36]{flex-grow:1;flex-shrink:0;align-items:center;font-size:18px;display:flex;justify-content:center;transform:translate(25%) rotate(-25deg)}", ""]);
-// Exports
-/* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
-
-
 /***/ }),
 
 /***/ 283:
@@ -605,6 +584,22 @@ module.exports = function (object, names) {
 };
 
 
+/***/ }),
+
+/***/ 1940:
+/***/ (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__(5369);
+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__(8459)/* ["default"] */ .A)
+var update = add("4bd3c088", content, true, {"sourceMap":false,"shadowMode":false});
+
 /***/ }),
 
 /***/ 2106:
@@ -1288,22 +1283,6 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".pagination[data-v-7970fd90]{padding-t
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
-/***/ }),
-
-/***/ 4352:
-/***/ (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__(6506);
-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__(8459)/* ["default"] */ .A)
-var update = add("f2fdef84", content, true, {"sourceMap":false,"shadowMode":false});
-
 /***/ }),
 
 /***/ 4376:
@@ -1628,6 +1607,43 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".div-tree[data-v-5642d0fd]{height:65vh
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
+/***/ }),
+
+/***/ 5130:
+/***/ (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__(6204);
+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__(8459)/* ["default"] */ .A)
+var update = add("44513866", content, true, {"sourceMap":false,"shadowMode":false});
+
+/***/ }),
+
+/***/ 5369:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1601);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6314);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__);
+// Imports
+
+
+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, ".zl-query-box[data-v-435cbd0a]{display:flex;width:214px;justify-content:end}.zl-query-box .zl-icon-box[data-v-435cbd0a]{color:#1677ff;-webkit-user-select:none;-moz-user-select:none;user-select:none;width:48px}", ""]);
+// Exports
+/* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
+
+
 /***/ }),
 
 /***/ 5397:
@@ -1772,6 +1788,27 @@ module.exports = function (obj) {
 };
 
 
+/***/ }),
+
+/***/ 6204:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1601);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6314);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__);
+// Imports
+
+
+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, "*[data-v-666df18e]{box-sizing:border-box}.zl-water-mark-container[data-v-666df18e]{position:relative;overflow:hidden}.zl-water-mark-container .zl-water-mark[data-v-666df18e]{-webkit-user-select:none;-moz-user-select:none;user-select:none;position:absolute;width:100%;height:100%;left:0;top:0;z-index:10;pointer-events:none;display:flex;flex-direction:column}.zl-water-mark-container .zl-water-mark .zl-water-mark-out[data-v-666df18e]{width:100%;height:100%;display:flex;flex-direction:row}.zl-water-mark-container .zl-water-mark .zl-water-mark-out:nth-child(2n) .zl-water-mark-in[data-v-666df18e]{transform:translate(-25%) rotate(-25deg)}.zl-water-mark-container .zl-water-mark .zl-water-mark-out .zl-water-mark-in[data-v-666df18e]{flex-grow:1;flex-shrink:0;align-items:center;font-size:18px;display:flex;justify-content:center;transform:translate(25%) rotate(-25deg)}", ""]);
+// Exports
+/* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
+
+
 /***/ }),
 
 /***/ 6269:
@@ -1919,27 +1956,6 @@ module.exports = function (iterator, fn, value, ENTRIES) {
 module.exports = false;
 
 
-/***/ }),
-
-/***/ 6506:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1601);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6314);
-/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1__);
-// Imports
-
-
-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, ".zl-query-box[data-v-2d2ff87a]{display:flex}.zl-query-box .zl-icon-box[data-v-2d2ff87a]{color:#1677ff;-webkit-user-select:none;-moz-user-select:none;user-select:none;width:48px}", ""]);
-// Exports
-/* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
-
-
 /***/ }),
 
 /***/ 6518:
@@ -2022,22 +2038,6 @@ module.exports = DESCRIPTORS ? function (object, key, value) {
 };
 
 
-/***/ }),
-
-/***/ 6736:
-/***/ (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__(134);
-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__(8459)/* ["default"] */ .A)
-var update = add("6e932a24", content, true, {"sourceMap":false,"shadowMode":false});
-
 /***/ }),
 
 /***/ 6801:
@@ -4189,8 +4189,8 @@ var main_component = normalizeComponent(
 
 src_main.install = Vue => Vue.component(src_main.name, src_main);
 /* harmony default export */ var TreeOnlyPop = (src_main);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./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!./package/Select/src/main.vue?vue&type=template&id=66f5047c
-var mainvue_type_template_id_66f5047c_render = function render() {
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./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!./package/Select/src/main.vue?vue&type=template&id=e36df9ee
+var mainvue_type_template_id_e36df9ee_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-select', {
@@ -4199,6 +4199,9 @@ var mainvue_type_template_id_66f5047c_render = function render() {
       "size": _vm.size,
       "clearable": ""
     },
+    on: {
+      "change": _vm.selectChange
+    },
     model: {
       value: _vm.selectValue,
       callback: function ($$v) {
@@ -4206,7 +4209,7 @@ var mainvue_type_template_id_66f5047c_render = function render() {
       },
       expression: "selectValue"
     }
-  }, [_vm.showTotal ? _c('el-option', {
+  }, [_vm.total ? _c('el-option', {
     attrs: {
       "label": "全部",
       "value": ""
@@ -4221,7 +4224,7 @@ var mainvue_type_template_id_66f5047c_render = function render() {
     });
   })], 2);
 };
-var mainvue_type_template_id_66f5047c_staticRenderFns = [];
+var mainvue_type_template_id_e36df9ee_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/Select/src/main.vue?vue&type=script&lang=js
 
@@ -4240,15 +4243,18 @@ var mainvue_type_template_id_66f5047c_staticRenderFns = [];
       type: String
     },
     function: {
-      type: Function,
-      default: () => {}
+      type: Function
+    },
+    list: {
+      type: Array,
+      default: () => []
     },
     placeholder: {
       default: '请选择',
       type: String
     },
-    showTotal: {
-      default: false,
+    total: {
+      default: true,
       type: Boolean
     },
     defaultProps: {
@@ -4277,14 +4283,23 @@ var mainvue_type_template_id_66f5047c_staticRenderFns = [];
   },
   methods: {
     handleQuery() {
-      this.function().then(res => {
-        this.arrayList = res.map(res => {
-          return {
-            value: res[this.defaultProps.value],
-            label: res[this.defaultProps.label]
-          };
+      if (!this.function && !this.list.length) {
+        this.$message({
+          type: 'warning',
+          message: '请配置function方法或者list数据!'
         });
+        return;
+      }
+      const data = this.function ? this.function() : Promise.resolve(this.list);
+      data.then(res => {
+        this.arrayList = res.map(item => ({
+          value: item[this.defaultProps.value],
+          label: item[this.defaultProps.label]
+        }));
       });
+    },
+    selectChange(val) {
+      this.$emit('change', val);
     }
   }
 });
@@ -4300,8 +4315,8 @@ var mainvue_type_template_id_66f5047c_staticRenderFns = [];
 ;
 var src_main_component = normalizeComponent(
   package_Select_src_mainvue_type_script_lang_js,
-  mainvue_type_template_id_66f5047c_render,
-  mainvue_type_template_id_66f5047c_staticRenderFns,
+  mainvue_type_template_id_e36df9ee_render,
+  mainvue_type_template_id_e36df9ee_staticRenderFns,
   false,
   null,
   null,
@@ -5147,8 +5162,8 @@ var Export_src_main_component = normalizeComponent(
 
 Export_src_main.install = Vue => Vue.component(Export_src_main.name, Export_src_main);
 /* harmony default export */ var Export = (Export_src_main);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./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!./package/Query/src/main.vue?vue&type=template&id=2d2ff87a&scoped=true
-var mainvue_type_template_id_2d2ff87a_scoped_true_render = function render() {
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./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!./package/Query/src/main.vue?vue&type=template&id=435cbd0a&scoped=true
+var mainvue_type_template_id_435cbd0a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -5187,7 +5202,7 @@ var mainvue_type_template_id_2d2ff87a_scoped_true_render = function render() {
     class: [_vm.className, 'el-icon--right']
   })]) : _vm._e()], 1);
 };
-var mainvue_type_template_id_2d2ff87a_scoped_true_staticRenderFns = [];
+var mainvue_type_template_id_435cbd0a_scoped_true_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/Query/src/main.vue?vue&type=script&lang=js
 
@@ -5243,9 +5258,9 @@ var mainvue_type_template_id_2d2ff87a_scoped_true_staticRenderFns = [];
 });
 ;// ./package/Query/src/main.vue?vue&type=script&lang=js
  /* harmony default export */ var package_Query_src_mainvue_type_script_lang_js = (Query_src_mainvue_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!./package/Query/src/main.vue?vue&type=style&index=0&id=2d2ff87a&prod&lang=scss&scoped=true
-var mainvue_type_style_index_0_id_2d2ff87a_prod_lang_scss_scoped_true = __webpack_require__(4352);
-;// ./package/Query/src/main.vue?vue&type=style&index=0&id=2d2ff87a&prod&lang=scss&scoped=true
+// 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!./package/Query/src/main.vue?vue&type=style&index=0&id=435cbd0a&prod&lang=scss&scoped=true
+var mainvue_type_style_index_0_id_435cbd0a_prod_lang_scss_scoped_true = __webpack_require__(1940);
+;// ./package/Query/src/main.vue?vue&type=style&index=0&id=435cbd0a&prod&lang=scss&scoped=true
 
 ;// ./package/Query/src/main.vue
 
@@ -5258,11 +5273,11 @@ var mainvue_type_style_index_0_id_2d2ff87a_prod_lang_scss_scoped_true = __webpac
 
 var Query_src_main_component = normalizeComponent(
   package_Query_src_mainvue_type_script_lang_js,
-  mainvue_type_template_id_2d2ff87a_scoped_true_render,
-  mainvue_type_template_id_2d2ff87a_scoped_true_staticRenderFns,
+  mainvue_type_template_id_435cbd0a_scoped_true_render,
+  mainvue_type_template_id_435cbd0a_scoped_true_staticRenderFns,
   false,
   null,
-  "2d2ff87a",
+  "435cbd0a",
   null
   
 )
@@ -5602,58 +5617,13 @@ var InputTable_src_main_component = normalizeComponent(
 
 InputTable_src_main.install = Vue => Vue.component(InputTable_src_main.name, InputTable_src_main);
 /* harmony default export */ var InputTable = (InputTable_src_main);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./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!./package/WaterMark/src/main.vue?vue&type=template&id=fa5edd36&scoped=true
-var mainvue_type_template_id_fa5edd36_scoped_true_render = function render() {
-  var _vm = this,
-    _c = _vm._self._c;
-  return _c('div', {
-    staticClass: "zl-water-mark-container",
-    class: [_vm.classNameQuery]
-  }, [_c('div', {
-    staticClass: "zl-water-mark",
-    style: {
-      opacity: _vm.opacity,
-      color: _vm.color
-    }
-  }, _vm._l(_vm.dataList, function (item, index) {
-    return _c('div', {
-      key: 'item' + index,
-      staticClass: "zl-water-mark-out"
-    }, _vm._l(_vm.childLength, function (child, cIndex) {
-      return _c('div', {
-        key: cIndex,
-        staticClass: "zl-water-mark-in"
-      }, [_vm._v(_vm._s(_vm.timeText))]);
-    }), 0);
-  }), 0), _vm._t("default")], 2);
-};
-var mainvue_type_template_id_fa5edd36_scoped_true_staticRenderFns = [];
-
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/WaterMark/src/main.vue?vue&type=script&lang=js
+
+
 function parseTime(time, cFormat) {
-  if (arguments.length === 0 || !time) {
-    return null;
-  }
+  if (!time) return null;
   const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}';
-  let date;
-  if (typeof time === 'object') {
-    date = time;
-  } else {
-    if (typeof time === 'string') {
-      if (/^[0-9]+$/.test(time)) {
-        // support "1548221490638"
-        time = parseInt(time);
-      } else {
-        // support safari
-        // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
-        time = time.replace(new RegExp(/-/gm), '/');
-      }
-    }
-    if (typeof time === 'number' && time.toString().length === 10) {
-      time = time * 1000;
-    }
-    date = new Date(time);
-  }
+  const date = typeof time === 'object' ? time : new Date(typeof time === 'string' ? time.replace(/-/g, '/') : time * 1);
   const formatObj = {
     y: date.getFullYear(),
     m: date.getMonth() + 1,
@@ -5663,15 +5633,10 @@ function parseTime(time, cFormat) {
     s: date.getSeconds(),
     a: date.getDay()
   };
-  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+  return format.replace(/{([ymdhisa])+}/g, (result, key) => {
     const value = formatObj[key];
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') {
-      return ['日', '一', '二', '三', '四', '五', '六'][value];
-    }
-    return value.toString().padStart(2, '0');
+    return key === 'a' ? ['日', '一', '二', '三', '四', '五', '六'][value] : String(value).padStart(2, '0');
   });
-  return time_str;
 }
 /* harmony default export */ var WaterMark_src_mainvue_type_script_lang_js = ({
   name: "ZlWaterMark",
@@ -5689,12 +5654,12 @@ function parseTime(time, cFormat) {
       default: false
     },
     text: {
-      default: "测试水 ",
+      default: "水印 ",
       type: String
     },
     opacity: {
       type: Number,
-      default: 0.12
+      default: 0.14
     },
     color: {
       type: String,
@@ -5707,13 +5672,10 @@ function parseTime(time, cFormat) {
   },
   computed: {
     timeText() {
-      if (this.hiddenTime) {
-        return '';
-      }
-      return this.text + ` ${this.time}`;
+      return this.hiddenTime ? '' : `${this.text} ${this.time}`;
     },
     classNameQuery() {
-      return 'zl-water-' + this.className;
+      return `zl-water-${this.className}`;
     }
   },
   mounted() {
@@ -5724,36 +5686,59 @@ function parseTime(time, cFormat) {
     this.setImgTimes();
   },
   deactivated() {
-    this.mainTimer && clearInterval(this.mainTimer);
+    clearInterval(this.mainTimer);
   },
   methods: {
     init() {
-      let watermark = document.querySelector('.' + this.classNameQuery);
-      let wordsLength = this.text.length * 16 + 180;
-      this.dataList = Math.floor(watermark.clientHeight / 180);
-      this.childLength = Math.floor(watermark.clientWidth / wordsLength);
+      const watermark = document.querySelector(`.${this.classNameQuery}`);
+      if (!watermark) return;
+      const wordsLength = this.text.length * 16 + 180;
+      this.dataList = Math.ceil(watermark.clientHeight / 180);
+      this.childLength = Math.ceil(watermark.clientWidth / wordsLength);
     },
     setImgTimes() {
-      let _this = this;
-      if (this.hiddenTime) {
-        return;
-      }
-      this.mainTimer && clearInterval(this.mainTimer);
+      if (this.hiddenTime) return;
+      clearInterval(this.mainTimer);
       this.mainTimer = setInterval(() => {
-        _this.time = parseTime(new Date());
+        this.time = parseTime(new Date());
       }, 1000);
     }
+  },
+  render(h) {
+    const createWaterMarkOut = () => {
+      return h('div', {
+        class: 'zl-water-mark-out'
+      }, Array.from({
+        length: this.childLength
+      }).map((_, index) => {
+        return h('div', {
+          class: 'zl-water-mark-in',
+          key: `watermark-${index}`
+        }, this.timeText);
+      }));
+    };
+    return h('div', {
+      class: ['zl-water-mark-container', this.classNameQuery]
+    }, [h('div', {
+      class: 'zl-water-mark',
+      style: {
+        opacity: this.opacity,
+        color: this.color
+      }
+    }, Array.from({
+      length: this.dataList
+    }).map((_, index) => createWaterMarkOut(index))), this.$slots.default]);
   }
 });
 ;// ./package/WaterMark/src/main.vue?vue&type=script&lang=js
  /* harmony default export */ var package_WaterMark_src_mainvue_type_script_lang_js = (WaterMark_src_mainvue_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!./package/WaterMark/src/main.vue?vue&type=style&index=0&id=fa5edd36&prod&scoped=true&lang=scss
-var mainvue_type_style_index_0_id_fa5edd36_prod_scoped_true_lang_scss = __webpack_require__(6736);
-;// ./package/WaterMark/src/main.vue?vue&type=style&index=0&id=fa5edd36&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!./package/WaterMark/src/main.vue?vue&type=style&index=0&id=666df18e&prod&scoped=true&lang=scss
+var mainvue_type_style_index_0_id_666df18e_prod_scoped_true_lang_scss = __webpack_require__(5130);
+;// ./package/WaterMark/src/main.vue?vue&type=style&index=0&id=666df18e&prod&scoped=true&lang=scss
 
 ;// ./package/WaterMark/src/main.vue
-
-
+var src_main_render, src_main_staticRenderFns
+;
 
 ;
 
@@ -5762,11 +5747,11 @@ var mainvue_type_style_index_0_id_fa5edd36_prod_scoped_true_lang_scss = __webpac
 
 var WaterMark_src_main_component = normalizeComponent(
   package_WaterMark_src_mainvue_type_script_lang_js,
-  mainvue_type_template_id_fa5edd36_scoped_true_render,
-  mainvue_type_template_id_fa5edd36_scoped_true_staticRenderFns,
+  src_main_render,
+  src_main_staticRenderFns,
   false,
   null,
-  "fa5edd36",
+  "666df18e",
   null
   
 )