pb-sxp-ui 1.0.58 → 1.0.59

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 ChatLabs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 ChatLabs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,111 +1,111 @@
-<!--
- * @Author       : haocanweng@chatlabs.cn
- * @Date         : 2023-08-23 18:25:31
- * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-03-20 16:26:29
- * @FilePath: \pb-sxp-ui\README.md
--->
-<h1 align="center">Page Builder SXP UI</h1>
-
-<div align="center">
-React enterprise-class UI components
-</div>
-
-## 📦 安装
-
-```bash
-npm install pb-sxp-ui
-# or
-yarn add pb-sxp-ui
-```
-
-## 🔨 使用
-以 Next.js 框架为例子：
-
-```jsx
-import { GetServerSideProps } from 'next';
-import React, { FC } from 'react'
-import Pagebuilder, { PageView } from 'pb-sxp-ui';
-
-// 初始化 PageBuilder 配置
-Pagebuilder.init({
-  tenantId: 'xxxxxxxxxx',
-  appId: 'xxxxxxxxx',
-  env: 'live' // 可选参数，默认是 live 环境
-});
-
-
-interface IProps {
-  path: string;
-  data: any
-}
-
-const ContentPage: FC<IProps> = ({ data ,path}) => {
-  return (
-    <PageView data={data?.data} isSsr path={path}/>
-  )
-}
-
-export const getServerSideProps: GetServerSideProps<IProps> = async (
-  context
-) => {
-  // 接收传来的路径
-  const path = context.query.path as string;
-  // 获取页面数据
-  const result = await Pagebuilder.getDetail(path)
-  return {
-    props: {
-      path,
-      data: result.data
-    },
-  };
-};
-
-export default ContentPage;
-
-```
-
-## ⌨️ 本地调试
-
-### 运行开发环境
-
-```bash
-$ npm install
-$ npm run start
-```
-
-### 生成本地开发全局链接
-
-```bash
-npm link
-# or
-yarn link
-```
-
-### 在使用该包的项目中安装调试
-
-```bash
-npm link pb-sxp-ui
-# or
-yarn link pb-sxp-ui
-```
-
-## 👾 发布
-
-### 打包线上安装包
-
-```bash
-npm run package
-# or
-yarn package
-```
-
-### 发布 npm
-
-```bash
-$ npm version patch|minor|major
-$ npm publish
-
-# 自动化发布包
-$ npm run pub patch|minor|major|xx.xx.xx
-```
+<!--
+ * @Author       : haocanweng@chatlabs.cn
+ * @Date         : 2023-08-23 18:25:31
+ * @LastEditors: binruan@chatlabs.com
+ * @LastEditTime: 2024-03-20 16:26:29
+ * @FilePath: \pb-sxp-ui\README.md
+-->
+<h1 align="center">Page Builder SXP UI</h1>
+
+<div align="center">
+React enterprise-class UI components
+</div>
+
+## 📦 安装
+
+```bash
+npm install pb-sxp-ui
+# or
+yarn add pb-sxp-ui
+```
+
+## 🔨 使用
+以 Next.js 框架为例子：
+
+```jsx
+import { GetServerSideProps } from 'next';
+import React, { FC } from 'react'
+import Pagebuilder, { PageView } from 'pb-sxp-ui';
+
+// 初始化 PageBuilder 配置
+Pagebuilder.init({
+  tenantId: 'xxxxxxxxxx',
+  appId: 'xxxxxxxxx',
+  env: 'live' // 可选参数，默认是 live 环境
+});
+
+
+interface IProps {
+  path: string;
+  data: any
+}
+
+const ContentPage: FC<IProps> = ({ data ,path}) => {
+  return (
+    <PageView data={data?.data} isSsr path={path}/>
+  )
+}
+
+export const getServerSideProps: GetServerSideProps<IProps> = async (
+  context
+) => {
+  // 接收传来的路径
+  const path = context.query.path as string;
+  // 获取页面数据
+  const result = await Pagebuilder.getDetail(path)
+  return {
+    props: {
+      path,
+      data: result.data
+    },
+  };
+};
+
+export default ContentPage;
+
+```
+
+## ⌨️ 本地调试
+
+### 运行开发环境
+
+```bash
+$ npm install
+$ npm run start
+```
+
+### 生成本地开发全局链接
+
+```bash
+npm link
+# or
+yarn link
+```
+
+### 在使用该包的项目中安装调试
+
+```bash
+npm link pb-sxp-ui
+# or
+yarn link pb-sxp-ui
+```
+
+## 👾 发布
+
+### 打包线上安装包
+
+```bash
+npm run package
+# or
+yarn package
+```
+
+### 发布 npm
+
+```bash
+$ npm version patch|minor|major
+$ npm publish
+
+# 自动化发布包
+$ npm run pub patch|minor|major|xx.xx.xx
+```

package/dist/index.cjs

@@ -1129,7 +1129,7 @@ function useEventReport() {
 }
 
 const AppointForm$1 = (_a) => {
-    var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType, isExternalLink, onClick, onClose } = _a, props = __rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "isExternalLink", "onClick", "onClose"]);
+    var { columns, style, title, textStyle, submitBgColor, submitColor, submitText, layoutType, isExternalLink, isPopup, onClick, onClose } = _a, props = __rest(_a, ["columns", "style", "title", "textStyle", "submitBgColor", "submitColor", "submitText", "layoutType", "isExternalLink", "isPopup", "onClick", "onClose"]);
     const { submitForm, popupDetailData } = useSxpDataSource();
     const { jumpToWeb } = useEventReport();
     const formRef = React.useRef();
@@ -1194,7 +1194,9 @@ const AppointForm$1 = (_a) => {
                 const position = popupDetailData === null || popupDetailData === void 0 ? void 0 : popupDetailData.index;
                 jumpToWeb(data, product, cta, position);
             }
-            onClose === null || onClose === void 0 ? void 0 : onClose();
+            if (!isPopup) {
+                onClose === null || onClose === void 0 ? void 0 : onClose();
+            }
             onClick === null || onClick === void 0 ? void 0 : onClick();
         }
     }), 1000);
@@ -8450,10 +8452,10 @@ const CommodityDetail$1 = (_a) => {
             React.createElement("div", { className: 'pb-commondity-content-title', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.title, hidden: !!product && !(product === null || product === void 0 ? void 0 : product.title) }, (_b = product === null || product === void 0 ? void 0 : product.title) !== null && _b !== void 0 ? _b : 'Pendant in Yellow Gold with Diamonds, Medium'),
             React.createElement("div", { className: 'pb-commondity-content-price', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.price, hidden: !!product && !(product === null || product === void 0 ? void 0 : product.price) }, priceText),
             React.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
-                React.createElement(ExpandableText$1, { foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, onClick: () => setShowModal(true), isPost: isPost, text: (_c = product === null || product === void 0 ? void 0 : product.info) !== null && _c !== void 0 ? _c : `The design inspiration of Tiffany Lock series comes from the power of connection and inclusiveness, and the
-            bold and avant-garde visual design interprets the emotional bond connecting my heart. The Tiffany Lock
-            collection is unisex and is inspired by the padlock pattern found in the Tiffany Antique Collection. This
-            necklace features a stylish and eye-catching oval clasp chain decorated with a lock pattern. Crafted from
+                React.createElement(ExpandableText$1, { foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, onClick: () => setShowModal(true), isPost: isPost, text: (_c = product === null || product === void 0 ? void 0 : product.info) !== null && _c !== void 0 ? _c : `The design inspiration of Tiffany Lock series comes from the power of connection and inclusiveness, and the
+            bold and avant-garde visual design interprets the emotional bond connecting my heart. The Tiffany Lock
+            collection is unisex and is inspired by the padlock pattern found in the Tiffany Antique Collection. This
+            necklace features a stylish and eye-catching oval clasp chain decorated with a lock pattern. Crafted from
             18-karat gold, this necklace is embellished with hand-set diamonds.`, maxStr: 79, className: 'pb-commondity-content-info', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.info }))));
     };
     const renderBtn = () => {
@@ -8631,10 +8633,12 @@ const getMediaValueByMode = (obj) => {
 };
 
 const Prompt$1 = (_a) => {
-    var { content, btnText, style, icon, onClick } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "onClick"]);
+    var { content, btnText, style, icon, isPopup, onClose, onClick } = _a, props = __rest(_a, ["content", "btnText", "style", "icon", "isPopup", "onClose", "onClick"]);
     const iconSrc = typeof icon === 'string' ? icon : getMediaValueByMode(icon);
     const handleOk = () => {
-        window === null || window === void 0 ? void 0 : window.sxpPopup('');
+        if (!isPopup) {
+            onClose === null || onClose === void 0 ? void 0 : onClose();
+        }
         onClick === null || onClick === void 0 ? void 0 : onClick();
     };
     return (React.createElement("div", Object.assign({ className: `pb-prompt ${css.css(Object.assign({}, style))}` }, props),
@@ -8911,7 +8915,7 @@ const CommodityDetailDiroNew$1 = (_a) => {
     const productInfoText = ({ isPost }) => {
         return (React.createElement("div", { hidden: !!product && (!(product === null || product === void 0 ? void 0 : product.info) || (product === null || product === void 0 ? void 0 : product.info) === '') },
             React.createElement(ExpandableText$1, { isPost: isPost, onClick: () => setShowModal(true), className: 'pb-commondityDiroNew-info', style: commodityStyles === null || commodityStyles === void 0 ? void 0 : commodityStyles.info, foldText: tipText === null || tipText === void 0 ? void 0 : tipText.foldText, unfoldText: tipText === null || tipText === void 0 ? void 0 : tipText.unfoldText, text: (product === null || product === void 0 ? void 0 : product.info) ||
-                    `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
+                    `Unveiled at the Spring-Summer 2023 fashion show, the Dior Toujours bag is distinguished by a casual and practical design. Crafted in black calfskin with Macrocannage topstitching, it showcases a spacious interior compartment with a matching pouch to organize essentials. Its leather strap closure keeps items secure while the D of the CD Lock closure twists to adjust the sides and enhance the bag's silhouette. The leather handles can be adjusted using the small notches in order to be able to carry the large bag by hand or wear it over the shoulder. CD Lock and strap closures D.I.O.R. charms Removable interior pouch Adjustable leather handles Dust bag included
 Made in Italy` })));
     };
     return (React.createElement("div", { className: 'pb-commondityDiroNew' },
@@ -13580,7 +13584,7 @@ var index$1 = React.memo(DiyPortalPreview);
  * @Author: binruan@chatlabs.com
  * @Date: 2023-10-31 10:56:01
  * @LastEditors: binruan@chatlabs.com
- * @LastEditTime: 2024-05-13 15:19:20
+ * @LastEditTime: 2024-05-14 10:12:52
  * @FilePath: \pb-sxp-ui\src\core\components\SxpPageRender\Popup\index.tsx
  *
  */
@@ -13626,13 +13630,14 @@ const Popup = () => {
     const renderPopupDetail = React.useMemo(() => {
         var _a, _b, _c;
         return (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.sxpPageConf) === null || _a === void 0 ? void 0 : _a.globalConfig) === null || _b === void 0 ? void 0 : _b.popupList) === null || _c === void 0 ? void 0 : _c.map((value, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             if ((value === null || value === void 0 ? void 0 : value.id) === (popup === null || popup === void 0 ? void 0 : popup.id)) {
                 const t = resolver[(_a = value === null || value === void 0 ? void 0 : value.item) === null || _a === void 0 ? void 0 : _a.type];
                 const Component = withBindDataSource(t);
                 const isExternalLink = ((_d = (_c = (_b = value === null || value === void 0 ? void 0 : value.item) === null || _b === void 0 ? void 0 : _b.event) === null || _c === void 0 ? void 0 : _c.onClick) === null || _d === void 0 ? void 0 : _d.linkType) === 'externalLink';
-                const defaulSetting = (_e = t === null || t === void 0 ? void 0 : t.extend) === null || _e === void 0 ? void 0 : _e.defaulSetting;
-                return (React.createElement(Component, Object.assign({ key: index, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_f = value === null || value === void 0 ? void 0 : value.item) === null || _f === void 0 ? void 0 : _f.style), { width: '100%', height: '80vh', overflow: 'auto' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_g = value === null || value === void 0 ? void 0 : value.item) === null || _g === void 0 ? void 0 : _g.textStyle), bindDatas: (_j = (_h = value === null || value === void 0 ? void 0 : value.item) === null || _h === void 0 ? void 0 : _h.bindDatas) !== null && _j !== void 0 ? _j : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_k = value === null || value === void 0 ? void 0 : value.item) === null || _k === void 0 ? void 0 : _k.props, { event: ((_l = value === null || value === void 0 ? void 0 : value.item) === null || _l === void 0 ? void 0 : _l.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, isExternalLink: isExternalLink, onClose: handleClose })));
+                const isPopup = ((_g = (_f = (_e = value === null || value === void 0 ? void 0 : value.item) === null || _e === void 0 ? void 0 : _e.event) === null || _f === void 0 ? void 0 : _f.onClick) === null || _g === void 0 ? void 0 : _g.linkType) === 'popup';
+                const defaulSetting = (_h = t === null || t === void 0 ? void 0 : t.extend) === null || _h === void 0 ? void 0 : _h.defaulSetting;
+                return (React.createElement(Component, Object.assign({ key: index, style: Object.assign(Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.style), (_j = value === null || value === void 0 ? void 0 : value.item) === null || _j === void 0 ? void 0 : _j.style), { width: '100%', height: '80vh', overflow: 'auto' }), textStyle: Object.assign(Object.assign({}, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.textStyle), (_k = value === null || value === void 0 ? void 0 : value.item) === null || _k === void 0 ? void 0 : _k.textStyle), bindDatas: (_m = (_l = value === null || value === void 0 ? void 0 : value.item) === null || _l === void 0 ? void 0 : _l.bindDatas) !== null && _m !== void 0 ? _m : [] }, defaulSetting === null || defaulSetting === void 0 ? void 0 : defaulSetting.props, (_o = value === null || value === void 0 ? void 0 : value.item) === null || _o === void 0 ? void 0 : _o.props, { event: ((_p = value === null || value === void 0 ? void 0 : value.item) === null || _p === void 0 ? void 0 : _p.event) || {}, schema: schema, id: value === null || value === void 0 ? void 0 : value.id, isExternalLink: isExternalLink, isPopup: isPopup, onClose: handleClose })));
             }
             else {
                 return React.createElement(React.Fragment, null);