@zgfe/modules-page 1.0.1-alpha.6 → 1.0.1-alpha.8

package/dist/esm/components/detail/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 import "./index.less";
 import { BizGlobalDataContext, IconFont, SocketClient, ajax } from '@zgfe/business-lib';
 import { Tooltip } from 'antd';
@@ -51,7 +51,7 @@ var DetailContent = function DetailContent(props) {
     setPageUrl = _useState10[1];
   useEffect(function () {
     var secret = getSocketSecret();
-    var url = "wss://".concat(location.host, "/").concat(api.socket);
+    var url = "wss://".concat(location.host).concat(api.socket);
     var socket = new SocketClient(url, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appKey, {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       origin: 4,
@@ -101,7 +101,7 @@ var DetailContent = function DetailContent(props) {
     });
     client.on('pageInfo', function (message) {
       console.log('接收消息', message);
-      if (message.href !== pageUrl) {
+      if (message.href !== openUrl) {
         setPageUrl(message.href);
         // 如果当前类型是单页面，则更新页面选择
         if (props.type === 'page') {
@@ -159,6 +159,19 @@ var DetailContent = function DetailContent(props) {
     //     }, 500),
     //   );
   }, [props.params]);
+  var openUrl = useMemo(function () {
+    if (!pageUrl) return '';
+    var pUrl = pageUrl,
+      url = '';
+    var hash = pUrl.match(/#\S*$/) || [''];
+    if (hash) pUrl = pUrl.replace(hash[0], '');
+    if (/\?/.test(pageUrl)) {
+      url = "".concat(pUrl.replace(/\/$/, ''), "&zgSecret=").concat(getSocketSecret()).concat(hash);
+    } else {
+      url = "".concat(pUrl.replace(/\/$/, ''), "?zgSecret=").concat(getSocketSecret()).concat(hash);
+    }
+    return url;
+  }, [pageUrl]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -171,7 +184,7 @@ var DetailContent = function DetailContent(props) {
     title: pageUrl
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-top-value")
-  }, pageUrl))), /*#__PURE__*/React.createElement("div", {
+  }, decodeURI(pageUrl || '')))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-content")
   }, props.result.map(function (item, index) {
     var _props$params2, _props$params$userGro;
@@ -194,7 +207,7 @@ var DetailContent = function DetailContent(props) {
   }, /*#__PURE__*/React.createElement("img", {
     src: renderImg
   }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
-    href: pageUrl === null || pageUrl === void 0 ? void 0 : pageUrl.trim(),
+    href: openUrl,
     target: "_blank"
   }, "\u6253\u5F00\u65B0\u6807\u7B7E\u9875", /*#__PURE__*/React.createElement(IconFont, {
     type: "zhuanfa"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.6",
+  "version": "1.0.1-alpha.8",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2cb8cb2a99605604935d19fce276a53b823382b4"
+  "gitHead": "212dc7aa436b8f739820d7086ff8c2b0121d4d05"
 }