@nutui/nutui 3.1.23-beta.1 → 3.1.23-beta.2

package/dist/packages/_es/TimePannel.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/TimeSelect.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Toast.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Uploader.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Video.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/WaterMark.js

@@ -0,0 +1,187 @@
+/*!
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
+* (c) 2022 @jdf2e.
+* Released under the MIT License.
+*/
+import { reactive, watch, computed, toRefs, openBlock, createElementBlock, normalizeClass, normalizeStyle } from "vue";
+import { c as createComponent } from "./component.js";
+import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
+import "../locale/lang";
+const { componentName, create } = createComponent("watermark");
+const _sfc_main = create({
+  props: {
+    name: {
+      type: String,
+      default: ""
+    },
+    gapY: {
+      type: Number,
+      default: 48
+    },
+    gapX: {
+      type: Number,
+      default: 24
+    },
+    zIndex: {
+      type: Number,
+      default: 2e3
+    },
+    width: {
+      type: Number,
+      default: 120
+    },
+    height: {
+      type: Number,
+      default: 64
+    },
+    rotate: {
+      type: Number,
+      default: -22
+    },
+    image: {
+      type: String,
+      default: ""
+    },
+    imageWidth: {
+      type: Number,
+      default: 120
+    },
+    imageHeight: {
+      type: Number,
+      default: 64
+    },
+    content: {
+      type: String,
+      default: ""
+    },
+    fontColor: {
+      type: String,
+      default: "rgba(0,0,0,.15)"
+    },
+    fontStyle: {
+      type: String,
+      default: "normal"
+    },
+    fontFamily: {
+      type: String,
+      default: "PingFang SC"
+    },
+    fontWeight: {
+      type: String,
+      default: "normal"
+    },
+    fontSize: {
+      type: [String, Number],
+      default: 14
+    },
+    fullPage: {
+      type: Boolean,
+      default: ""
+    }
+  },
+  emits: ["click"],
+  setup(props, { emit }) {
+    const state = reactive({
+      base64Url: ""
+    });
+    const {
+      zIndex,
+      gapX,
+      gapY,
+      width,
+      height,
+      rotate,
+      image,
+      imageWidth,
+      imageHeight,
+      content,
+      fontStyle,
+      fontWeight,
+      fontColor,
+      fontSize,
+      fontFamily
+    } = props;
+    const init = () => {
+      const canvas = document.createElement("canvas");
+      const ratio = window.devicePixelRatio;
+      console.log(ratio);
+      const ctx = canvas.getContext("2d");
+      const canvasWidth = `${(gapX + width) * ratio}px`;
+      const canvasHeight = `${(gapY + height) * ratio}px`;
+      const markWidth = width * ratio;
+      const markHeight = height * ratio;
+      canvas.setAttribute("width", canvasWidth);
+      canvas.setAttribute("height", canvasHeight);
+      if (ctx) {
+        if (image) {
+          ctx.translate(markWidth / 2, markHeight / 2);
+          ctx.rotate(Math.PI / 180 * Number(rotate));
+          const img = new Image();
+          img.crossOrigin = "anonymous";
+          img.referrerPolicy = "no-referrer";
+          img.src = image;
+          img.onload = () => {
+            ctx.drawImage(img, -imageWidth * ratio / 2, -imageHeight * ratio / 2, imageWidth * ratio, imageHeight * ratio);
+            ctx.restore();
+            state.base64Url = canvas.toDataURL();
+            console.log(state.base64Url);
+          };
+        } else if (content) {
+          ctx.textBaseline = "middle";
+          ctx.textAlign = "center";
+          ctx.translate(markWidth / 2, markHeight / 2);
+          ctx.rotate(Math.PI / 180 * Number(rotate));
+          const markSize = Number(fontSize) * ratio;
+          ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
+          ctx.fillStyle = fontColor;
+          ctx.fillText(content, 0, 0);
+          ctx.restore();
+          state.base64Url = canvas.toDataURL();
+          console.log(state.base64Url);
+        }
+      } else {
+        throw new Error("\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301Canvas");
+      }
+    };
+    init();
+    watch(() => [
+      zIndex,
+      gapX,
+      gapY,
+      width,
+      height,
+      rotate,
+      image,
+      imageWidth,
+      imageHeight,
+      content,
+      fontStyle,
+      fontWeight,
+      fontColor,
+      fontSize,
+      fontFamily
+    ], () => {
+      init();
+    });
+    const classes = computed(() => {
+      const prefixCls = componentName;
+      return {
+        [prefixCls]: true,
+        [`${prefixCls}-full-page`]: props.fullPage
+      };
+    });
+    return { ...toRefs(state), classes };
+  }
+});
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("view", {
+    class: normalizeClass(_ctx.classes),
+    style: normalizeStyle({
+      zIndex: _ctx.zIndex,
+      backgroundSize: `${_ctx.gapX + _ctx.width}px`,
+      backgroundImage: `url('${_ctx.base64Url}')`
+    })
+  }, null, 6);
+}
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };

package/dist/packages/_es/common.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/component.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index2.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index3.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index4.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/index5.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -302,6 +302,7 @@ const _sfc_main = create({
           state.chooseData = [...days];
         }
         if (!isFirst) {
+          console.log(state.chooseData);
           emit("select", state.chooseData);
           if (props.isAutoBackFill || !props.poppable) {
             confirm();

package/dist/packages/_es/plugin-vue_export-helper.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/pxCheck.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/raf.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:05 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:06:52 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/imagepreview/index.scss

@@ -59,7 +59,6 @@
   justify-content: center;
   height: 100%;
 
-
   .nut-imagepreview-box {
     width: 100%;
   }

package/dist/packages/locale/lang/baseLang.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:25 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:07:10 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/locale/lang/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:25 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:07:10 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/locale/lang/id-ID.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:25 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:07:10 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/locale/lang/index.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:25 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:07:10 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/locale/lang/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:25 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:07:10 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/locale/lang/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.23-beta.1 Mon Jun 27 2022 21:39:25 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.23-beta.2 Thu Jul 07 2022 19:07:10 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/picker/index.scss

@@ -69,6 +69,7 @@
     height: 252px;
     overflow: hidden;
     text-align: center;
+    -webkit-overflow-scrolling: touch;
   }
 
   &-roller {

package/dist/packages/watermark/index.scss

@@ -0,0 +1,13 @@
+.nut-watermark {
+  position: absolute;
+  z-index: $nut-water-mark-z-index;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  pointer-events: none;
+  background-repeat: repeat;
+  &-full-page {
+    position: fixed;
+  }
+}

package/dist/smartips/attributes.json

@@ -2407,6 +2407,10 @@
     "type": "boolean",
     "description": "属性说明：滑动过程中是否禁止冒泡，默认值：true"
   },
+  "nut-swiper/is-center": {
+    "type": "boolean",
+    "description": "属性说明：是否居中展示，必须传对应的`width` 和 `height`，默认值：false"
+  },
   "nut-switch/v-model": {
     "type": "boolean ｜ string ｜ number",
     "description": "属性说明：开关状态，默认值：`false`"
@@ -2822,5 +2826,61 @@
   "nut-video/options.playsinline": {
     "type": "boolean",
     "description": "属性说明：是否设置为行内播放元素（解决安卓兼容问题），默认值：false"
+  },
+  "nut-watermark/width": {
+    "type": "`number`",
+    "description": "属性说明：水印的宽度，默认值：`120`"
+  },
+  "nut-watermark/height": {
+    "type": "`number`",
+    "description": "属性说明：水印的高度，默认值：`64`"
+  },
+  "nut-watermark/rotate": {
+    "type": "`number`",
+    "description": "属性说明：水印绘制时，旋转的角度，默认值：`-22`"
+  },
+  "nut-watermark/image": {
+    "type": "`string`",
+    "description": "属性说明：图片源，建议导出 2 倍或 3 倍图，优先使用图片渲染水印，默认值：-"
+  },
+  "nut-watermark/imageWidth": {
+    "type": "`number`",
+    "description": "属性说明：图片宽度，默认值：`120`"
+  },
+  "nut-watermark/imageHeight": {
+    "type": "`number`",
+    "description": "属性说明：图片高度，默认值：`64`"
+  },
+  "nut-watermark/zIndex": {
+    "type": "`number`",
+    "description": "属性说明：追加的水印元素的 z-index，默认值：`2000`"
+  },
+  "nut-watermark/content": {
+    "type": "`string`",
+    "description": "属性说明：水印文字内容，默认值：-"
+  },
+  "nut-watermark/fontColor": {
+    "type": "`string`",
+    "description": "属性说明：水印文字颜色，默认值：`rgba(0, 0, 0, .15)`"
+  },
+  "nut-watermark/fontSize": {
+    "type": "`string | number`",
+    "description": "属性说明：文字大小，默认值：`16`"
+  },
+  "nut-watermark/gapX": {
+    "type": "`number`",
+    "description": "属性说明：水印之间的水平间距，默认值：`24`"
+  },
+  "nut-watermark/gapY": {
+    "type": "`number`",
+    "description": "属性说明：水印之间的垂直间距，默认值：`48`"
+  },
+  "nut-watermark/fullPage": {
+    "type": "`boolean`",
+    "description": "属性说明：是否覆盖整个页面，默认值：`true`"
+  },
+  "nut-watermark/fontFamily": {
+    "type": "`boolean`",
+    "description": "属性说明：水印文字字体，默认值：`true`"
   }
 }

package/dist/smartips/tags.json

@@ -878,7 +878,8 @@
       "init-page",
       "touchable",
       "is-preventDefault",
-      "is-stopPropagation"
+      "is-stopPropagation",
+      "is-center"
     ]
   },
   "nut-swiperitem": {
@@ -1039,5 +1040,23 @@
       "options.disabled",
       "options.playsinline"
     ]
+  },
+  "nut-watermark": {
+    "attributes": [
+      "width",
+      "height",
+      "rotate",
+      "image",
+      "imageWidth",
+      "imageHeight",
+      "zIndex",
+      "content",
+      "fontColor",
+      "fontSize",
+      "gapX",
+      "gapY",
+      "fullPage",
+      "fontFamily"
+    ]
   }
 }

package/dist/smartips/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "NutUI",
-  "version": "3.1.23-beta.1",
+  "version": "3.1.23-beta.2",
   "contributions": {
     "html": {
       "tags": [
@@ -5919,6 +5919,15 @@
                 "type": "boolean",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "is-center",
+              "default": "false",
+              "description": "是否居中展示，必须传对应的`width` 和 `height`",
+              "value": {
+                "type": "boolean",
+                "kind": "expression"
+              }
             }
           ]
         },
@@ -6954,6 +6963,139 @@
               }
             }
           ]
+        },
+        {
+          "name": "nut-watermark",
+          "slots": [],
+          "events": [],
+          "attributes": [
+            {
+              "name": "width",
+              "default": "`120`",
+              "description": "水印的宽度",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "height",
+              "default": "`64`",
+              "description": "水印的高度",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "rotate",
+              "default": "`-22`",
+              "description": "水印绘制时，旋转的角度",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "image",
+              "default": "-",
+              "description": "图片源，建议导出 2 倍或 3 倍图，优先使用图片渲染水印",
+              "value": {
+                "type": "`string`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "imageWidth",
+              "default": "`120`",
+              "description": "图片宽度",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "imageHeight",
+              "default": "`64`",
+              "description": "图片高度",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "zIndex",
+              "default": "`2000`",
+              "description": "追加的水印元素的 z-index",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "content",
+              "default": "-",
+              "description": "水印文字内容",
+              "value": {
+                "type": "`string`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "fontColor",
+              "default": "`rgba(0, 0, 0, .15)`",
+              "description": "水印文字颜色",
+              "value": {
+                "type": "`string`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "fontSize",
+              "default": "`16`",
+              "description": "文字大小",
+              "value": {
+                "type": "`string | number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "gapX",
+              "default": "`24`",
+              "description": "水印之间的水平间距",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "gapY",
+              "default": "`48`",
+              "description": "水印之间的垂直间距",
+              "value": {
+                "type": "`number`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "fullPage",
+              "default": "`true`",
+              "description": "是否覆盖整个页面",
+              "value": {
+                "type": "`boolean`",
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "fontFamily",
+              "default": "`true`",
+              "description": "水印文字字体",
+              "value": {
+                "type": "`boolean`",
+                "kind": "expression"
+              }
+            }
+          ]
         }
       ],
       "attributes": [],