coolcare-lite-scada-component 1.0.0 → 1.0.2

package/es/app.js

@@ -9,7 +9,7 @@ import '@antv/x6-react-shape';
 // import 'dayjs/locale/zh-cn';
 
 import queryToObject from "./utils/queryToObject";
-import { storeAccessToken } from "./utils/auth";
+import { storeAccessToken, storeXAccessToken } from "./utils/auth";
 
 // dayjs.locale('zh-cn');
 
@@ -41,8 +41,11 @@ function _getInitialState() {
           if (query.accessToken) {
             storeAccessToken(query.accessToken);
           }
+          if (query.xAccessToken) {
+            storeXAccessToken(query.xAccessToken);
+          }
           return _context.abrupt("return", {});
-        case 3:
+        case 4:
         case "end":
           return _context.stop();
       }

package/es/pages/display/index.js

@@ -15,10 +15,11 @@ import { queryToObject } from "../../utils";
 import { GetProductConfiguration } from "../../services/product/Product";
 import { GetDeviceConfiguration } from "../../services/gateway/Device";
 import { GetCompanyConfigurationPage } from "../../services/gateway/CompanyConfiguration";
-import { setRequestENV } from "../../services/request";
+import { setRequestENV, setRequrl } from "../../services/request";
 import Player from "./Player";
 import ScadaEmpty from "./components/Empty";
 import styles from "./index.css";
+import { storeToken } from "../../utils/auth";
 var Display = function Display(_ref) {
   var query_ = _ref.query_;
   var _useState = useState(),
@@ -34,6 +35,8 @@ var Display = function Display(_ref) {
     if (query_) {
       // 被当成组件使用时(非 iframe ),设置接口请求的 prefix
       setRequestENV((query_ === null || query_ === void 0 ? void 0 : query_.env) || 'prod');
+      // 配置请求地址
+      setRequrl((query_ === null || query_ === void 0 ? void 0 : query_.reqUrl) || '');
     }
   }, [query_]);
 
@@ -41,6 +44,9 @@ var Display = function Display(_ref) {
   useEffect(function () {
     var query = queryRef.current;
     if (!query) return;
+    if (query.token && query.xToken) {
+      storeToken(query.token, query.xToken);
+    }
     if (query.scene === 'product') {
       var fetchProductScadaConfig = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

package/es/services/request.js

@@ -84,13 +84,18 @@ var errorHandler = function errorHandler(error) {
 
 /** 默认使用打包时的环境，但可以通过下面的 setRequestENV 方法设置（被当成组件使用时，需要调用 setRequestENV 设置） */
 var Request_ENV = 'prod';
+var reqUrl = '';
 export function setRequestENV(env) {
   Request_ENV = env;
 }
+export function setRequrl(val) {
+  reqUrl = val;
+}
 var requestPrefixMap = {
   dev: 'https://dev.sinocold.com:30443',
   prod: 'https://iot.sinocold.net',
-  staging: 'https://dev.sinocold.com:30443'
+  staging: 'https://dev.sinocold.com:30443',
+  generalfushi: 'https://iot.generalfushi.com'
 };
 var requestClient = extend({
   errorHandler: errorHandler
@@ -103,7 +108,7 @@ requestClient.use( /*#__PURE__*/function () {
         case 0:
           req = ctx.req;
           url = req.url;
-          ctx.req.url = "".concat(requestPrefixMap[Request_ENV]).concat(url);
+          ctx.req.url = "".concat(reqUrl ? reqUrl : REACT_APP_PLATFORM && requestPrefixMap[REACT_APP_PLATFORM] ? requestPrefixMap[REACT_APP_PLATFORM] : requestPrefixMap[Request_ENV]).concat(url);
           _context.next = 5;
           return next();
         case 5:

package/es/typings.d.ts

@@ -8,7 +8,7 @@ interface Window {
   $emitter: import('mitt').Emitter<any>;
 }
 
-declare const REACT_APP_ENV: 'dev' | 'prod' | 'staging';
+declare const REACT_APP_ENV: 'dev' | 'prod' | 'staging' | string;
 
 /**
  * 编辑场景
@@ -61,6 +61,9 @@ type PlayerQuery =
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */
       env?: 'prod' | 'staging' | 'dev';
+      /** 请求地址 */
+      reqUrl?: string;
+      /** 使用场景 */
       scene: 'product';
       /** scene = 'production' 时传 产品 id */
       productId: string;
@@ -77,10 +80,17 @@ type PlayerQuery =
        * auto: 默认值，等比的情况下，尽量全屏铺满
        */
       zoomMode?: 'width' | 'auto';
+      /** token */
+      token?: string;
+      /** 刷新token */
+      xToken?: string;
     }
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */
       env?: 'prod' | 'staging' | 'dev';
+      /** 请求地址 */
+      reqUrl?: string;
+      /** 使用场景 */
       scene: 'device';
       /** scene = 'device' 时传设备 id */
       deviceId: string;
@@ -95,10 +105,17 @@ type PlayerQuery =
        * auto: 默认值，等比的情况下，尽量全屏铺满
        */
       zoomMode?: 'width' | 'auto';
+      /** token */
+      token?: string;
+      /** 刷新token */
+      xToken?: string;
     }
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */
       env?: 'prod' | 'staging' | 'dev';
+      /** 请求地址 */
+      reqUrl?: string;
+      /** 使用场景 */
       scene: 'freedom';
       /** 组态 id */
       scadaId: string;
@@ -113,6 +130,10 @@ type PlayerQuery =
        * auto: 默认值，等比的情况下，尽量全屏铺满
        */
       zoomMode?: 'width' | 'auto';
+      /** token */
+      token?: string;
+      /** 刷新token */
+      xToken?: string;
     };
 
 type WindowCommunicateMsg =

package/es/utils/auth.js

@@ -58,6 +58,9 @@ export function storeToken(accessToken, xAccessToken) {
 export function storeAccessToken(token) {
   Cookies.set(accessTokenCookieName, token);
 }
+export function storeXAccessToken(token) {
+  Cookies.set(xAccessTokenCookieName, token);
+}
 
 /**
  * 从 cookie 获取 access-token

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",
+    "build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
     "build:staging": "UMI_ENV=staging umi build",
     "build:component": "father build",
     "postinstall": "umi generate tmp",