@chaoswise/business 0.0.11 → 0.0.13

package/lib/Watermark/index.js

@@ -1,6 +1,6 @@
 import _Watermark from "@chaoswise/ui/lib/Watermark";
 import _message from "@chaoswise/ui/lib/message";
-var _excluded = ["type", "fetchWatermark", "densityConfig"];
+var _excluded = ["type", "fetchWatermark", "densityConfig", "children"];
 function _typeof(o) { "@babel/helpers - typeof"; return _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; }, _typeof(o); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -17,10 +17,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React, { useEffect, useState, useRef, useCallback } from "react";
+import React, { useEffect, useState, useRef, useCallback, useMemo } from "react";
 import PropTypes from "prop-types";
 import moment from "moment";
-import { fetchGet } from "@chaoswise/request";
 import "./index.less";
 
 // 疏密类型
@@ -46,7 +45,9 @@ var WatermarkCom = function WatermarkCom(_ref) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            return _context.abrupt("return", fetchGet("/docp/gateway/douc/api/v1/watermark/query").then(function (res) {
+            return _context.abrupt("return", fetch("/docp/gateway/douc/api/v1/watermark/query").then(function (res) {
+              return res.json();
+            }).then(function (res) {
               if (res && res.code === 100000) {
                 return res.data;
               } else {
@@ -63,9 +64,12 @@ var WatermarkCom = function WatermarkCom(_ref) {
     })) : _ref$fetchWatermark,
     _ref$densityConfig = _ref.densityConfig,
     densityConfig = _ref$densityConfig === void 0 ? {} : _ref$densityConfig,
+    children = _ref.children,
     rest = _objectWithoutProperties(_ref, _excluded);
   var watermarkRef = useRef();
-  var _useState = useState(false),
+
+  // 默认为 false 的话，刷新页面会有bug
+  var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
@@ -141,7 +145,7 @@ var WatermarkCom = function WatermarkCom(_ref) {
     }
   }, []);
   useEffect(function () {
-    if (!visible) {
+    if (!visible || children) {
       return;
     }
     watermarkRef.current && document.body.append(watermarkRef.current);
@@ -150,11 +154,20 @@ var WatermarkCom = function WatermarkCom(_ref) {
     return function () {
       watermarkRef.current && watermarkRef.current.remove();
     };
-  }, [visible]);
-  return /*#__PURE__*/React.createElement("div", {
-    ref: targetRef,
-    className: visible ? "portal-watermark" : "portal-watermark-hidden"
-  }, /*#__PURE__*/React.createElement(_Watermark, _extends({}, watermarkProps, rest)));
+  }, [visible, children]);
+  function renderWatermark() {
+    if (children) {
+      return visible ? /*#__PURE__*/React.createElement(_Watermark, _extends({}, watermarkProps, rest, {
+        zIndex: 10000
+      }), children) : children;
+    } else {
+      return /*#__PURE__*/React.createElement("div", {
+        ref: targetRef,
+        className: visible ? "portal-watermark" : "portal-watermark-hidden"
+      }, /*#__PURE__*/React.createElement(_Watermark, _extends({}, watermarkProps, rest)));
+    }
+  }
+  return renderWatermark();
 };
 WatermarkCom.propTypes = {
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/business",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "业务组件库",
   "keywords": [
     "ui",
@@ -105,5 +105,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "60181c1fdb22f05a1d323960462760a08c4769c0"
+  "gitHead": "1121ba93642b5739af19ea1fcec86a737d5655d4"
 }