@cqsjjb/jjb-react-admin-component 3.3.1-beta.13 → 3.3.1-beta.15

package/PhoneBox/index.js

@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { Empty, Space, message, Tooltip, Button, QRCode } from 'antd';
 import { SyncOutlined } from '@ant-design/icons';
+import { http } from '@cqsjjb/jjb-common-lib';
 import shexiang from './shexiang.svg';
 import xinhao from './xinhao.svg';
 import wangluo from './wangluo.svg';
@@ -74,6 +75,13 @@ export default props => {
     };
   }, []);
 
+  // 获取预览地址
+  const getPreviewUrl = () => {
+    // 从url中解析出id
+    const id = new URL(iframeUrl).searchParams.get('sceneEngineId');
+    return http.Get(`/scene/engine/preview/url/${id}`);
+  };
+
   // 二维码过期状态定时器
   const startQrcodeTimer = () => {
     if (qrcodeTimerId.current) {
@@ -95,19 +103,13 @@ export default props => {
     }, 60000);
   };
   const getQrCodeUrl = () => {
-    if (fetchQrcodeUrl) {
-      fetchQrcodeUrl().then(res => {
-        setQrcodeUrl(res.data);
-        setIsQrcodeExpire(false); // 重置二维码过期状态
-        startQrcodeTimer(); // 启动过期状态定时器
-        startQrcodeExpireTimeUpdateTimer(); // 启动过期时间定时器
-      });
-    } else {
-      setQrcodeUrl(`${iframeUrl}?t=${Date.now()}`);
+    const ftechFunc = fetchQrcodeUrl || getPreviewUrl;
+    ftechFunc().then(res => {
+      setQrcodeUrl(res.data);
       setIsQrcodeExpire(false); // 重置二维码过期状态
       startQrcodeTimer(); // 启动过期状态定时器
       startQrcodeExpireTimeUpdateTimer(); // 启动过期时间定时器
-    }
+    });
   };
   return /*#__PURE__*/React.createElement("div", {
     className: `phone-box ${size === 'small' ? 'phone-box-small' : ''}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.1-beta.13",
+  "version": "3.3.1-beta.15",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",

package/ControlWrapper/index.less

@@ -1,38 +0,0 @@
-@com-prefix-cls: if(isdefined(@ant-prefix), @ant-prefix, ant);
-
-.@{com-prefix-cls}-form-item-control-label-wrapper {
-  .@{com-prefix-cls}-form-item-control-label-span {
-    border: 1px solid #d9d9d9;
-    height: 32px;
-    line-height: 30px;
-    box-sizing: border-box;
-    margin-right: -1px;
-    padding: 0 2px 0 8px;
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    white-space: nowrap;
-  }
-
-  &.@{com-prefix-cls}-form-item-control-label-has {
-    .@{com-prefix-cls}-select-selector, .@{com-prefix-cls}-picker, .@{com-prefix-cls}-input, .@{com-prefix-cls}-input-affix-wrapper {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-      border-left-color: transparent !important;
-      &:hover, &:focus, &:focus-within{
-        border-left-color: @colorPrimary !important;
-      }
-    }
-  }
-
-  &-default {
-    .@{com-prefix-cls}-form-item-control-label-span {
-      border-color: #d9d9d9;
-    }
-  }
-
-  &-dark {
-    .@{com-prefix-cls}-form-item-control-label-span {
-      border-color: #424242;
-    }
-  }
-}