pb-sxp-ui 1.15.3 → 1.15.5

package/lib/materials/sxp/consentPopup/Click/index.js

@@ -3,19 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 require("./index.less");
-const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDetail"));
+const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
+const tool_1 = require("../../../../core/utils/tool");
+const hooks_1 = require("../../../../core/hooks");
 const Click = (_a) => {
-    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton"]);
+    var { isTel, open, content, style, consentPopupCate, acceptButton, rejectButton, showRejectButton } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "acceptButton", "rejectButton", "showRejectButton"]);
+    const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
+    const [consentResult, setConsentResult] = (0, react_1.useState)(true);
+    const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
+        setConsentResult(res);
+    });
     const visivle = (0, react_1.useMemo)(() => {
-        return consentPopupCate || (open && style);
-    }, [consentPopupCate, open]);
-    const handleClickAccept = () => { };
-    const handleClickReject = () => { };
+        return consentPopupCate || (open && style && !consentResult);
+    }, [consentPopupCate, open, style, consentResult]);
+    (0, react_1.useEffect)(() => {
+        !consentPopupCate && open && style && handleGetAccount();
+    }, []);
+    const handleClickAccept = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
+        if (res)
+            setConsentResult(true);
+    });
+    const handleClickReject = () => {
+        history === null || history === void 0 ? void 0 : history.back();
+    };
     return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupClick' },
         react_1.default.createElement("div", { className: 'consentPopupClick-container', style: style },
-            react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } }),
-            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept }, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text),
-            react_1.default.createElement("button", { style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject }, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text))))))));
+            react_1.default.createElement("div", { className: 'consentPopupClick-container-content' },
+                react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } })),
+            react_1.default.createElement("button", { style: acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style, onClick: handleClickAccept, dangerouslySetInnerHTML: {
+                    __html: (0, tool_1.setFontForText)(acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.text, acceptButton === null || acceptButton === void 0 ? void 0 : acceptButton.style)
+                } }),
+            react_1.default.createElement("button", { hidden: !showRejectButton, style: rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style, onClick: handleClickReject, dangerouslySetInnerHTML: {
+                    __html: (0, tool_1.setFontForText)(rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.text, rejectButton === null || rejectButton === void 0 ? void 0 : rejectButton.style)
+                } }))))))));
 };
 exports.default = (0, react_1.memo)(Click);

package/lib/materials/sxp/consentPopup/Click/settingRender.js

@@ -123,6 +123,11 @@ exports.default = [
     {
         title: '拒绝按钮样式',
         child: [
+            {
+                type: 'Switch',
+                label: '开启',
+                name: ['props', 'showRejectButton']
+            },
             {
                 type: 'Color',
                 label: '背景色',
@@ -154,7 +159,7 @@ exports.default = [
             {
                 type: 'TextMargin',
                 label: '边距',
-                name: ['props', 'acceptButton', 'style']
+                name: ['props', 'rejectButton', 'style']
             },
             {
                 type: 'Group',

package/lib/materials/sxp/consentPopup/Swipe/index.js

@@ -3,13 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 require("./index.less");
-const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
 const ConsentDetail_1 = tslib_1.__importDefault(require("../../popup/ConsentDetail"));
-const closeIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjhJREFUWEfFlztOw0AQhmeWiJ4CCmpQ5DiRQsIJyAWg5A0lR0AIChDiCJS8ER0cADgBeRSxt4CCDgkaKiq8i+zYeWx2413HEWmiJJv9v535Z2aN8M8vFPT9z3zETD0aAUChUJjwvPFHAJhBhB3Hqd6OAsK2yyucwykAvP38eJX398Z3AJDLlVYR8ToU9Rhj25TWr9KEsKy5dULIGQCMtfZly45TvwsAstm56UwG6wA4FUFwzrdctxZBDcWSy5XWEPG8I84/GcMipdWPtgcsaz5PCHtKG0IuTiqUvjT9U/WYMG2IOPE+AP+LtCB0xKUAAyA2Xbd2o2OG0NQXvTnvhL17D7EPtH9TRCIWwkRcGYGIQgYBABuqPuHXOQBc6pw80lBGwBQiiXhsBHQhkoprA6iM6acjhDQKu5YJZW6XeOI3XJdpvfsdTu52VfXEekD8owQiXGIubpSCbhDbLu8DwKEAd+A41SOdPpE4BS0viFOtvV2iKWqUgn5x/tmS70xR01GuDSCKc86/OCcLgTyyZ0ScDGNhFAktAJV4NFJ9YyaFiAWIE+9uVkkgBgLoig8DMWAa9ro9ynkUdlW5maZDCmB6clmz0k1HH4Cs1Ezbq2p2yEpUuBOKTSZZex00RUWIrltxuuK6EOGDSbGIOPZicpMx6fny650377qNRgBgWeVFQuA+6UjVgREhGIMlSqsPUQqIbZdOOIdZQmCv2axRnU1N1+TzJYsxOEaEV8ep7frPZ7Gd0FTEdP0ft0/kMNdg0eoAAAAASUVORK5CYII=';
+const tel_png_1 = tslib_1.__importDefault(require("./tel.png"));
+const hooks_1 = require("../../../../core/hooks");
 const Swipe = (_a) => {
     var { isTel, open, content, style, consentPopupCate, swipeIcon } = _a, props = tslib_1.__rest(_a, ["isTel", "open", "content", "style", "consentPopupCate", "swipeIcon"]);
     const touchInfo = (0, react_1.useRef)();
     const threshold = 50;
+    const { getAccount, accountSonsent } = (0, hooks_1.useSxpDataSource)();
+    const [consentResult, setConsentResult] = (0, react_1.useState)(true);
+    const handleGetAccount = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (getAccount === null || getAccount === void 0 ? void 0 : getAccount());
+        setConsentResult(res);
+    });
+    const visivle = (0, react_1.useMemo)(() => {
+        return consentPopupCate || (open && style && !consentResult);
+    }, [consentPopupCate, open, style, consentResult]);
+    (0, react_1.useEffect)(() => {
+        !consentPopupCate && open && style && handleGetAccount();
+    }, []);
+    const handleClickAccept = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const res = yield (accountSonsent === null || accountSonsent === void 0 ? void 0 : accountSonsent(true));
+        if (res)
+            setConsentResult(true);
+    });
     const handleTouchStart = (event) => {
         const touch = event.touches[0];
         touchInfo.current = { y: touch.clientY, d: 0 };
@@ -28,19 +45,15 @@ const Swipe = (_a) => {
             return;
         const { d } = touchInfo.current || {};
         if (d > threshold) {
+            handleClickAccept();
         }
         touchInfo.current = {};
     };
-    const handleClickReject = () => { };
-    const visivle = (0, react_1.useMemo)(() => {
-        return consentPopupCate || (open && style);
-    }, [consentPopupCate, open]);
     return (react_1.default.createElement(react_1.default.Fragment, null, isTel ? (react_1.default.createElement("img", { src: tel_png_1.default, style: { objectFit: 'cover', width: '100%', height: '100%' } })) : (react_1.default.createElement(react_1.default.Fragment, null, visivle && (react_1.default.createElement("div", { className: 'consentPopupSwipe', onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd },
         react_1.default.createElement("div", { className: 'consentPopupSwipe-container', style: style },
-            react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } }),
-            react_1.default.createElement("button", { "aria-label": 'close', className: 'consentPopupSwipe-container-close', onClick: handleClickReject },
-                react_1.default.createElement("img", { src: closeIcon, alt: 'close' })),
-            swipeIcon && (react_1.default.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon', onClick: handleClickReject },
+            react_1.default.createElement("div", { className: 'consentPopupSwipe-container-content' },
+                react_1.default.createElement(ConsentDetail_1.default, { content: content, style: { padding: 0 } })),
+            swipeIcon && (react_1.default.createElement("div", { className: 'consentPopupSwipe-container-swipeIcon' },
                 react_1.default.createElement("img", { src: swipeIcon, alt: 'Swipe Icon' }))))))))));
 };
 exports.default = (0, react_1.memo)(Swipe);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pb-sxp-ui",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "React enterprise-class UI components",
   "main": "dist/index.cjs",
   "module": "dist/index.js",