@cqsjjb/jjb-react-admin-component 3.3.1-beta.12 → 3.3.1-beta.14

package/FormilyDescriptions/index.js

@@ -18,7 +18,10 @@ export default function FormilyDescriptions({
         token: sessionStorage.token
       }
     }).then(res => res.json()).then(res => {
-      if (res.success) setRegions(res.data);
+      if (res.success) {
+        setRegions(res.data);
+        props.onLoad && props.onLoad();
+      }
     });
   }, []);
   const dataSource = tools.getDynamicFormilyFields(schema, values, {
@@ -85,9 +88,12 @@ export function ItemRender({
     setOpen(true);
   };
   const renderContent = () => {
+    const systemStyle = props.systemStyle ? props.systemStyle(data.fieldCode) : {};
     if (tools.isArray(data.value)) {
       if (tools.isStringArray(data.value) || tools.isNumberArray(data.value)) {
-        return data.value.join('、');
+        return /*#__PURE__*/React.createElement("div", {
+          style: systemStyle
+        }, data.value.join('、'));
       }
       if (tools.isObjectArray(data.value)) {
         return data.formType === 'Table' ? /*#__PURE__*/React.createElement(RenderTable, {
@@ -97,7 +103,8 @@ export function ItemRender({
           imageHeight: imageHeight,
           imagePreview: imagePreview,
           extraFileLink: extraFileLink,
-          onPreview: handlePreview
+          onPreview: handlePreview,
+          systemStyle: systemStyle
         }) : data.value.map((file, index) => /*#__PURE__*/React.createElement(RenderFileItem, {
           key: index,
           url: file.url,
@@ -107,7 +114,8 @@ export function ItemRender({
           imageHeight: imageHeight,
           imagePreview: imagePreview,
           extraFileLink: extraFileLink,
-          onPreview: () => handlePreview(file.url)
+          onPreview: () => handlePreview(file.url),
+          systemStyle: systemStyle
         }));
       }
       return tools.textPlaceholder();
@@ -116,7 +124,8 @@ export function ItemRender({
       name: data.name,
       value: data.value,
       maxTagCount: props.maxTagCount,
-      renderItemText: props.renderItemText
+      renderItemText: props.renderItemText,
+      systemStyle: systemStyle
     });
   };
   return /*#__PURE__*/React.createElement(Fragment, null, renderContent(), /*#__PURE__*/React.createElement(Modal, {
@@ -141,7 +150,8 @@ export function RenderText({
   value,
   name,
   maxTagCount = 1,
-  renderItemText
+  renderItemText,
+  systemStyle
 }) {
   const [text, setText] = useState();
   const [options, setOptions] = useState([]);
@@ -168,7 +178,8 @@ export function RenderText({
         width: '100%',
         display: 'flex',
         minHeight: 22,
-        flexDirection: 'column'
+        flexDirection: 'column',
+        ...systemStyle
       }
     }, /*#__PURE__*/React.createElement(Spin, {
       spinning: loading
@@ -185,10 +196,14 @@ export function RenderText({
       maxTagCount: maxTagCount
     })));
   }
-  return renderItemText ? renderItemText({
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      ...systemStyle
+    }
+  }, renderItemText ? renderItemText({
     text,
     name
-  }) : tools.textPlaceholder(text);
+  }) : tools.textPlaceholder(text));
 }
 export function RenderFileItem(props) {
   const {
@@ -199,16 +214,22 @@ export function RenderFileItem(props) {
     imageHeight,
     imagePreview,
     extraFileLink,
-    onPreview
+    onPreview,
+    systemStyle
   } = props;
   return isImage ? /*#__PURE__*/React.createElement(RenderImage, {
     url: url,
     imageWidth: imageWidth,
     imageHeight: imageHeight,
     imagePreview: imagePreview,
-    extraFileLink: extraFileLink
+    extraFileLink: extraFileLink,
+    systemStyle: systemStyle
   }) : /*#__PURE__*/React.createElement(Tooltip, {
     title: url
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      ...systemStyle
+    }
   }, IS_PDF_REG.test(url) || IS_VIDEO_REG.test(url) ? /*#__PURE__*/React.createElement(RenderValidFile, {
     url: url,
     name: name,
@@ -217,20 +238,25 @@ export function RenderFileItem(props) {
   }) : /*#__PURE__*/React.createElement(RenderInvalidFile, {
     url: url,
     name: name
-  }));
+  })));
 }
 export function RenderImage({
   url,
   imageWidth,
   imageHeight,
   imagePreview,
-  extraFileLink
+  extraFileLink,
+  systemStyle
 }) {
   return /*#__PURE__*/React.createElement("span", {
     style: {
       display: 'inline-block',
       marginRight: 4,
-      marginBottom: 4
+      marginBottom: 4,
+      ...(systemStyle ? {
+        ...systemStyle,
+        border: `1px solid ${systemStyle?.color || '#d9d9d9'}`
+      } : {})
     }
   }, /*#__PURE__*/React.createElement(Image, {
     src: url,
@@ -279,12 +305,17 @@ export function RenderTable({
   imageHeight,
   imagePreview,
   extraFileLink,
-  onPreview
+  onPreview,
+  systemStyle
 }) {
   const renderColumn = col => {
     const originalRender = col.render;
     col.render = row => {
-      if (tools.isNumberArray(row) || tools.isStringArray(row)) return row.join(',');
+      if (tools.isNumberArray(row) || tools.isStringArray(row)) {
+        return /*#__PURE__*/React.createElement("div", {
+          style: systemStyle
+        }, row.join(','));
+      }
       if (tools.isUploadFileListArray(row)) {
         return /*#__PURE__*/React.createElement(Space, {
           direction: "vertical"
@@ -297,7 +328,8 @@ export function RenderTable({
           imageHeight: imageHeight,
           imagePreview: imagePreview,
           extraFileLink: extraFileLink,
-          onPreview: () => onPreview(file.url)
+          onPreview: () => onPreview(file.url),
+          systemStyle: systemStyle
         })));
       }
       if (tools.isObject(row)) return '数据错误';
@@ -308,6 +340,7 @@ export function RenderTable({
   return /*#__PURE__*/React.createElement(Table, {
     rowKey: (record, index) => index,
     columns: columns.map(renderColumn),
-    dataSource: dataSource
+    dataSource: dataSource,
+    style: systemStyle
   });
 }

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.12",
+  "version": "3.3.1-beta.14",
   "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;
-    }
-  }
-}