@cqsjjb/jjb-react-admin-component 3.3.1-beta.8 → 3.3.2

package/AdaptiveTree/index.js

@@ -170,7 +170,9 @@ export default props => {
       }
     }, node[title])), /*#__PURE__*/React.createElement(Space, null, titleAction ? (titleAction(node) || []).map(item => {
       return /*#__PURE__*/React.createElement("div", {
-        onClick: () => {
+        onClick: e => {
+          e.stopPropagation();
+          e.preventDefault();
           item.onClick && item.onClick(node);
         },
         className: "operation"

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/ListDataContainer/index.js

@@ -59,7 +59,8 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
     showQuickJumper: true
   },
   tableProps = {},
-  proTable = false
+  proTable = false,
+  onRest = () => {}
 }, ref) => {
   const [form] = Form.useForm();
   const [tableData, setTableData] = useState([]);
@@ -130,12 +131,12 @@ const ListDataContainer = /*#__PURE__*/forwardRef(({
       obj[item.name] = undefined;
       return obj;
     }, {}));
+    onRest && onRest(form);
     // 重置分页并使用内部默认参数查询
     setPagination(initialPagination);
     loadDataSource();
   };
   const handlePaginationChange = newPagination => {
-    console.warn("ssssssssssss", newPagination);
     // 更新分页后，用新分页参数查询
     setPagination({
       ...newPagination,

package/PhoneBox/dianchi.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M938.667 426.667v-85.334c0-46.933-38.4-85.333-85.334-85.333H128c-46.933 0-85.333 38.4-85.333 85.333v341.334C42.667 729.6 81.067 768 128 768h725.333c46.934 0 85.334-38.4 85.334-85.333v-85.334c23.466 0 42.666-19.2 42.666-42.666v-85.334c0-23.466-19.2-42.666-42.666-42.666zM896 469.333v213.334c0 23.466-19.2 42.666-42.667 42.666H128c-23.467 0-42.667-19.2-42.667-42.666V341.333c0-23.466 19.2-42.666 42.667-42.666h725.333c23.467 0 42.667 19.2 42.667 42.666v128zM128 682.667h554.667V341.333H128v341.334z" fill="#2C2C2C" /></svg>

package/PhoneBox/index.js

@@ -1,6 +1,12 @@
 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';
+import dianchi from './dianchi.svg';
+import phone from './phone.svg';
 import './index.less';
 export default props => {
   const {
@@ -36,7 +42,7 @@ export default props => {
   useEffect(() => {
     const handleClickOutside = e => {
       const button = qrcodeButtonRef.current;
-      const tooltip = document.querySelector('.micro-temp-tooltip');
+      const tooltip = document.querySelector(`.${window.process.env.app?.antd?.['ant-prefix'] || 'ant'}-tooltip`);
       if (button && !button.contains(e.target) && tooltip && !tooltip.contains(e.target)) {
         setQrcodeVisible(false);
       }
@@ -69,6 +75,17 @@ export default props => {
     };
   }, []);
 
+  // 获取预览地址
+  const getPreviewUrl = () => {
+    // 从url中解析出id
+    const url = new URL(iframeUrl);
+    const hash = url.hash.substring(1);
+    const queryString = hash.replace(/^\//, '');
+    const params = new URLSearchParams(queryString);
+    const id = params.get('sceneEngineId');
+    return http.Get(`/scene/engine/preview/url/${id}`);
+  };
+
   // 二维码过期状态定时器
   const startQrcodeTimer = () => {
     if (qrcodeTimerId.current) {
@@ -90,25 +107,19 @@ 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' : ''}`
   }, /*#__PURE__*/React.createElement("img", {
     alt: "",
-    src: require('~/assets/phone.png').default,
+    src: phone,
     width: 356,
     height: 720
   }), /*#__PURE__*/React.createElement("div", {
@@ -118,7 +129,7 @@ export default props => {
   }, /*#__PURE__*/React.createElement("div", {
     className: "phone-header-time"
   }, currentTime), /*#__PURE__*/React.createElement("img", {
-    src: require('~/assets/shexiang.png').default,
+    src: shexiang,
     width: 76,
     height: 23,
     alt: ""
@@ -126,15 +137,15 @@ export default props => {
     className: "phone-header-status"
   }, /*#__PURE__*/React.createElement("img", {
     className: "status-xinhao",
-    src: require('~/assets/xinhao.png').default,
+    src: xinhao,
     alt: ""
   }), /*#__PURE__*/React.createElement("img", {
     className: "status-wangluo",
-    src: require('~/assets/wangluo.png').default,
+    src: wangluo,
     alt: ""
   }), /*#__PURE__*/React.createElement("img", {
     className: "status-dianchi",
-    src: require('~/assets/dianchi.png').default,
+    src: dianchi,
     alt: ""
   }))), showEmpty && !iframeUrl ? /*#__PURE__*/React.createElement("div", {
     style: {

package/PhoneBox/index.less

@@ -15,7 +15,7 @@
 
     .phone-content-header {
       height: 55px;
-      padding: 12px 24px;
+      padding: 0px 24px;
       display: flex;
       align-items: center;
       justify-content: space-between;

package/PhoneBox/phone.svg

@@ -0,0 +1,135 @@
+<svg width="356" height="720" viewBox="0 0 356 720" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#230;&#168;&#161;&#229;&#158;&#139;&#230;&#161;&#134;">
+<g id="Body">
+<path id="Base" d="M296.829 1.35898e-06L59.1059 6.55458e-06C28.1243 7.23171e-06 3.00879 25.189 3.00879 56.2613L3.0088 663.739C3.0088 694.811 28.1243 720 59.1059 720L296.829 720C327.811 720 352.926 694.811 352.926 663.739L352.926 56.2613C352.926 25.189 327.811 6.81854e-07 296.829 1.35898e-06Z" fill="#E0E1E3"/>
+<g id="Light" style="mix-blend-mode:overlay">
+<path d="M296.393 1.67594L59.5392 1.67594C29.2431 1.67594 4.67871 26.3122 4.67871 56.697L4.67873 663.286C4.67873 693.671 29.2431 718.307 59.5392 718.307L296.393 718.307C326.69 718.307 351.254 693.671 351.254 663.286L351.254 56.697C351.254 26.3122 326.69 1.67593 296.393 1.67594ZM349.583 662.85C349.583 692.565 325.57 716.648 295.942 716.648L59.9904 716.648C30.3627 716.648 6.34977 692.565 6.34977 662.85L6.34976 57.1495C6.34976 27.4351 30.3627 3.35188 59.9904 3.35188L295.959 3.35187C325.587 3.35187 349.6 27.4351 349.6 57.1495L349.6 662.867L349.583 662.85Z" fill="black"/>
+</g>
+<path id="Frame" d="M295.425 5.49709L60.5257 5.49709C32.0359 5.49709 8.94043 28.6602 8.94043 57.2333L8.94044 662.767C8.94044 691.34 32.0359 714.503 60.5257 714.503L295.425 714.503C323.915 714.503 347.01 691.34 347.01 662.767L347.01 57.2333C347.01 28.6602 323.915 5.49709 295.425 5.49709Z" fill="#1D1D1B"/>
+</g>
+<g id="Buttons">
+<g id="Lock">
+<path id="Base_2" d="M354.98 183.951L352.925 183.951L352.925 270.731L354.98 270.731L354.98 183.951Z" fill="url(#paint0_linear_247_40964)"/>
+<path id="Top-Shade" d="M354.98 270.748L354.98 183.985L356 185.107C355.482 194.342 355.515 260.391 356 269.608L354.98 270.731L354.98 270.748Z" fill="url(#paint1_linear_247_40964)"/>
+</g>
+<g id="Volume-Down">
+<path id="Base_3" d="M1.75469 234.849L0.584961 234.849L0.584962 289.82L1.7547 289.82L1.75469 234.849Z" fill="url(#paint2_linear_247_40964)"/>
+<path id="Top-Shade_2" d="M0.584868 289.82L0.584867 234.866L1.57507e-08 235.587C0.300789 241.436 0.267369 283.284 1.18567e-06 289.116L0.584868 289.837L0.584868 289.82Z" fill="url(#paint3_linear_247_40964)"/>
+<path id="Bottom-Shade" d="M3.00817 234.866L1.75488 234.866L1.75488 289.837L3.00817 289.837L3.00817 234.866Z" fill="url(#paint4_linear_247_40964)"/>
+</g>
+<g id="Volume-Up">
+<path id="Base_4" d="M1.75469 165.7L0.584961 165.7L0.584962 220.671L1.7547 220.671L1.75469 165.7Z" fill="url(#paint5_linear_247_40964)"/>
+<path id="Top-Shade_3" d="M0.584868 220.671L0.584867 165.717L1.57504e-08 166.437C0.300789 172.286 0.267369 214.135 1.18567e-06 219.967L0.584868 220.687L0.584868 220.671Z" fill="url(#paint6_linear_247_40964)"/>
+<path id="Bottom-Shade_2" d="M3.00817 165.7L1.75488 165.7L1.75488 220.671L3.00817 220.671L3.00817 165.7Z" fill="url(#paint7_linear_247_40964)"/>
+</g>
+<g id="Silence">
+<path id="Base_5" d="M1.75469 113.763L0.584961 113.763L0.584962 141.986L1.75469 141.986L1.75469 113.763Z" fill="url(#paint8_linear_247_40964)"/>
+<path id="Top-Shade_4" d="M0.584867 141.969L0.584867 113.763L1.46516e-08 114.433C0.300789 119.964 0.267368 135.768 6.01445e-07 141.282L0.584867 141.952L0.584867 141.969Z" fill="url(#paint9_linear_247_40964)"/>
+<path id="Bottom-Shade_3" d="M3.00817 113.763L1.75488 113.763L1.75488 141.986L3.00817 141.986L3.00817 113.763Z" fill="url(#paint10_linear_247_40964)"/>
+</g>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_247_40964" x1="353.944" y1="183.951" x2="353.944" y2="270.731" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.02" stop-color="#E0E1E3"/>
+<stop offset="0.04" stop-color="#A7A8A9"/>
+<stop offset="0.08" stop-color="#2B1D2A"/>
+<stop offset="0.11" stop-color="#8C8C8C"/>
+<stop offset="0.9" stop-color="#696969"/>
+<stop offset="0.94" stop-color="#2B1D2A"/>
+<stop offset="0.96" stop-color="#A7A8A9"/>
+<stop offset="0.98" stop-color="#8C8C8C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+<linearGradient id="paint1_linear_247_40964" x1="355.482" y1="183.968" x2="355.482" y2="270.731" gradientUnits="userSpaceOnUse">
+<stop stop-color="#676067"/>
+<stop offset="0.06" stop-color="#707070"/>
+<stop offset="0.19" stop-color="#8A8A8A"/>
+<stop offset="0.81" stop-color="#8A8A8A"/>
+<stop offset="0.92" stop-color="#707070"/>
+<stop offset="1" stop-color="#676067"/>
+</linearGradient>
+<linearGradient id="paint2_linear_247_40964" x1="-1465.34" y1="234.849" x2="-1465.34" y2="289.82" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.02" stop-color="#E0E1E3"/>
+<stop offset="0.04" stop-color="#A7A8A9"/>
+<stop offset="0.08" stop-color="#2D1E2C"/>
+<stop offset="0.11" stop-color="#8C8C8C"/>
+<stop offset="0.9" stop-color="#696969"/>
+<stop offset="0.94" stop-color="#2D1E2C"/>
+<stop offset="0.96" stop-color="#A7A8A9"/>
+<stop offset="0.98" stop-color="#8C8C8C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+<linearGradient id="paint3_linear_247_40964" x1="0.300788" y1="234.866" x2="0.300789" y2="289.82" gradientUnits="userSpaceOnUse">
+<stop stop-color="#676067"/>
+<stop offset="0.06" stop-color="#707070"/>
+<stop offset="0.19" stop-color="#8A8A8A"/>
+<stop offset="0.81" stop-color="#8A8A8A"/>
+<stop offset="0.92" stop-color="#707070"/>
+<stop offset="1" stop-color="#676067"/>
+</linearGradient>
+<linearGradient id="paint4_linear_247_40964" x1="0.000284912" y1="289.837" x2="1.68112" y2="234.866" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.05" stop-color="#2D1E2C"/>
+<stop offset="0.52" stop-color="#A7A8A9"/>
+<stop offset="0.96" stop-color="#2D1E2C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+<linearGradient id="paint5_linear_247_40964" x1="1.16983" y1="165.683" x2="1.16983" y2="220.654" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.02" stop-color="#E0E1E3"/>
+<stop offset="0.04" stop-color="#A7A8A9"/>
+<stop offset="0.08" stop-color="#2D1E2C"/>
+<stop offset="0.11" stop-color="#8C8C8C"/>
+<stop offset="0.9" stop-color="#696969"/>
+<stop offset="0.94" stop-color="#2D1E2C"/>
+<stop offset="0.96" stop-color="#A7A8A9"/>
+<stop offset="0.98" stop-color="#8C8C8C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+<linearGradient id="paint6_linear_247_40964" x1="0.300788" y1="165.7" x2="0.300789" y2="220.654" gradientUnits="userSpaceOnUse">
+<stop stop-color="#676067"/>
+<stop offset="0.06" stop-color="#707070"/>
+<stop offset="0.19" stop-color="#8A8A8A"/>
+<stop offset="0.81" stop-color="#8A8A8A"/>
+<stop offset="0.92" stop-color="#707070"/>
+<stop offset="1" stop-color="#676067"/>
+</linearGradient>
+<linearGradient id="paint7_linear_247_40964" x1="2.37317" y1="220.688" x2="2.37317" y2="165.7" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.05" stop-color="#2D1E2C"/>
+<stop offset="0.52" stop-color="#A7A8A9"/>
+<stop offset="0.96" stop-color="#2D1E2C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+<linearGradient id="paint8_linear_247_40964" x1="-1465.34" y1="113.746" x2="-1465.34" y2="141.969" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.02" stop-color="#E0E1E3"/>
+<stop offset="0.04" stop-color="#A7A8A9"/>
+<stop offset="0.08" stop-color="#2D1E2C"/>
+<stop offset="0.11" stop-color="#8C8C8C"/>
+<stop offset="0.9" stop-color="#696969"/>
+<stop offset="0.94" stop-color="#2D1E2C"/>
+<stop offset="0.96" stop-color="#A7A8A9"/>
+<stop offset="0.98" stop-color="#8C8C8C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+<linearGradient id="paint9_linear_247_40964" x1="0.300789" y1="113.763" x2="0.300789" y2="141.969" gradientUnits="userSpaceOnUse">
+<stop stop-color="#676067"/>
+<stop offset="0.06" stop-color="#707070"/>
+<stop offset="0.19" stop-color="#8A8A8A"/>
+<stop offset="0.81" stop-color="#8A8A8A"/>
+<stop offset="0.92" stop-color="#707070"/>
+<stop offset="1" stop-color="#676067"/>
+</linearGradient>
+<linearGradient id="paint10_linear_247_40964" x1="0.000283675" y1="141.986" x2="2.38698" y2="113.764" gradientUnits="userSpaceOnUse">
+<stop stop-color="#58595A"/>
+<stop offset="0.05" stop-color="#2D1E2C"/>
+<stop offset="0.52" stop-color="#A7A8A9"/>
+<stop offset="0.96" stop-color="#2D1E2C"/>
+<stop offset="1" stop-color="#A7A8A9"/>
+</linearGradient>
+</defs>
+</svg>

package/PhoneBox/shexiang.svg

@@ -0,0 +1,61 @@
+<svg width="79" height="23" viewBox="0 0 79 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#230;&#145;&#132;&#229;&#131;&#143;&#229;&#164;&#180;">
+<path id="Base" d="M67.2764 22.843L11.3798 22.843C5.0967 22.843 3.87533e-07 17.7314 2.49808e-07 11.4299C1.12084e-07 5.12837 5.0967 1.60769e-06 11.3798 1.47037e-06L67.2764 2.48714e-07C73.5595 1.11392e-07 78.6562 5.11161 78.6562 11.4299C78.6562 17.7314 73.5595 22.843 67.2764 22.843Z" fill="#1D1D1B"/>
+<g id="Lens">
+<path id="Base_2" d="M64.1174 16.4242C66.8676 16.4242 69.0971 14.1882 69.0971 11.4299C69.0971 8.67163 66.8676 6.43561 64.1174 6.43561C61.3672 6.43561 59.1377 8.67163 59.1377 11.4299C59.1377 14.1882 61.3672 16.4242 64.1174 16.4242Z" fill="url(#paint0_linear_247_40986)"/>
+<path id="Frame" d="M64.1171 14.279C65.6861 14.279 66.9579 13.0034 66.9579 11.4299C66.9579 9.85639 65.6861 8.58081 64.1171 8.58081C62.5482 8.58081 61.2764 9.85639 61.2764 11.4299C61.2764 13.0034 62.5482 14.279 64.1171 14.279Z" fill="url(#paint1_linear_247_40986)"/>
+<path id="Bottom-Reflection" d="M66.6076 11.4299C66.6076 12.8042 65.488 13.9271 64.1178 13.9271C62.7475 13.9271 61.6279 12.8042 61.6279 11.4299C61.6279 10.0556 62.7308 8.93276 64.1178 8.93276C65.5048 8.93276 66.6076 10.0389 66.6076 11.4299Z" fill="url(#paint2_linear_247_40986)"/>
+<path id="Top-Reflection" style="mix-blend-mode:multiply" d="M66.6076 11.4299C66.6076 12.8042 65.488 13.9271 64.1178 13.9271C62.7475 13.9271 61.6279 12.8042 61.6279 11.4299C61.6279 10.0556 62.7308 8.93276 64.1178 8.93276C65.5048 8.93276 66.6076 10.0389 66.6076 11.4299Z" fill="url(#paint3_radial_247_40986)"/>
+<path id="Light" style="mix-blend-mode:screen" d="M66.3729 12.7371C66.3729 12.2511 65.9718 11.8489 65.4872 11.8489C65.0026 11.8489 64.6016 12.2511 64.6016 12.7371C64.6016 13.2232 65.0026 13.6254 65.4872 13.6254C65.9718 13.6254 66.3729 13.2232 66.3729 12.7371Z" fill="url(#paint4_radial_247_40986)"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_247_40986" x1="64.1174" y1="16.1058" x2="64.1174" y2="6.28477" gradientUnits="userSpaceOnUse">
+<stop stop-color="#666666"/>
+<stop offset="1" stop-color="#010104"/>
+</linearGradient>
+<linearGradient id="paint1_linear_247_40986" x1="64.1339" y1="8.76517" x2="64.1339" y2="14.3796" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0B131C"/>
+<stop offset="1" stop-color="#354039"/>
+</linearGradient>
+<linearGradient id="paint2_linear_247_40986" x1="65.8724" y1="13.1896" x2="62.3529" y2="9.68046" gradientUnits="userSpaceOnUse">
+<stop stop-color="#231F20"/>
+<stop offset="0.08" stop-color="#212226"/>
+<stop offset="0.2" stop-color="#1F2C37"/>
+<stop offset="0.33" stop-color="#1A3C53"/>
+<stop offset="0.47" stop-color="#13537B"/>
+<stop offset="0.62" stop-color="#0A70AE"/>
+<stop offset="0.78" stop-color="#0095EE"/>
+<stop offset="0.8" stop-color="#0387D6"/>
+<stop offset="0.84" stop-color="#0D689F"/>
+<stop offset="0.88" stop-color="#154D71"/>
+<stop offset="0.91" stop-color="#1B394E"/>
+<stop offset="0.95" stop-color="#1F2A34"/>
+<stop offset="0.98" stop-color="#222225"/>
+<stop offset="1" stop-color="#231F20"/>
+</linearGradient>
+<radialGradient id="paint3_radial_247_40986" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(64.1178 11.4299) scale(2.48986 2.49715)">
+<stop stop-color="#231F20"/>
+<stop offset="0.2" stop-color="#165068"/>
+<stop offset="0.38" stop-color="#0C78A1"/>
+<stop offset="0.54" stop-color="#0594CB"/>
+<stop offset="0.66" stop-color="#01A6E4"/>
+<stop offset="0.73" stop-color="#00ADEE"/>
+<stop offset="0.76" stop-color="#01A5E3"/>
+<stop offset="0.81" stop-color="#0693C8"/>
+<stop offset="0.87" stop-color="#0D749B"/>
+<stop offset="0.94" stop-color="#184A5E"/>
+<stop offset="1" stop-color="#231F20"/>
+</radialGradient>
+<radialGradient id="paint4_radial_247_40986" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4872 12.7371) scale(0.885654 0.888245)">
+<stop stop-color="#CCCCCC"/>
+<stop offset="0.02" stop-color="#C4C4C4"/>
+<stop offset="0.22" stop-color="#898989"/>
+<stop offset="0.41" stop-color="#585858"/>
+<stop offset="0.59" stop-color="#313131"/>
+<stop offset="0.75" stop-color="#161616"/>
+<stop offset="0.89" stop-color="#050505"/>
+<stop offset="1"/>
+</radialGradient>
+</defs>
+</svg>

package/PhoneBox/wangluo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M1012.3915 297.221c-276.295-276.295-724.404-276.295-1000.699 0-15.59 15.59-15.59 40.798 0 56.277 15.59 15.589 40.797 15.589 56.276 0 245.227-245.228 642.92-245.228 888.147 0 15.59 15.589 40.797 15.589 56.276 0 15.479-15.48 15.479-40.687 0-56.277z m-850.666 171.15c-15.59 15.59-15.59 40.798 0 56.277 15.59 15.59 40.797 15.59 56.276 0 162.306-162.306 425.554-162.306 587.86 0 15.589 15.59 40.797 15.59 56.276 0 15.59-15.59 15.59-40.798 0-56.276-193.374-193.374-506.928-193.374-700.412 0z m551.042 181.544l0.221-0.221c-110.562-110.562-289.783-110.562-400.235 0-15.59 15.59-15.59 40.797 0 56.276 15.59 15.59 40.797 15.59 56.276 0 79.494-79.494 208.3-79.494 287.683 0l0.221-0.221a40.39 40.39 0 0 0 2.985 3.317c15.59 15.589 40.798 15.589 56.277 0 15.589-15.59 15.589-40.798 0-56.276-1.217-0.996-2.322-1.88-3.428-2.875zM453.3885 874.909c0 32.974 26.73 59.704 59.704 59.704 32.973 0 59.703-26.73 59.703-59.704 0-32.973-26.73-59.704-59.703-59.704-32.974 0-59.704 26.73-59.704 59.704z" fill="#000000" /></svg>

package/PhoneBox/xinhao.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M192.437 816.222c-23.575 0-42.863-19.288-42.863-42.863v-64.294c0-23.575 19.288-42.863 42.863-42.863s42.863 19.288 42.863 42.863v64.294c0.005 23.57-19.284 42.863-42.863 42.863zM406.754 816.222c-23.575 0-42.862-19.288-42.862-42.863v-171.458c0-23.575 19.288-42.862 42.862-42.862s42.863 19.288 42.863 42.862v171.458c0.005 23.57-19.284 42.863-42.863 42.863zM621.080 816.222c-23.575 0-42.862-19.288-42.862-42.863v-342.912c0-23.575 19.288-42.862 42.862-42.862s42.862 19.288 42.862 42.862v342.908c0 23.575-19.288 42.867-42.862 42.867zM835.397 816.222c-23.575 0-42.863-19.288-42.863-42.863v-557.234c0-23.575 19.288-42.863 42.863-42.863s42.863 19.288 42.863 42.863v557.229c0 23.575-19.288 42.867-42.863 42.867z" fill="#2c2c2c" /></svg>

package/SearchForm/index.js

@@ -1,3 +1,4 @@
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import React, { useState, useRef, useEffect } from 'react';
 import { Form, Button, Space, Row, Col } from 'antd';
 import { SearchOutlined, DoubleRightOutlined, UndoOutlined } from '@ant-design/icons';
@@ -17,14 +18,45 @@ const SearchForm = ({
   onFinish = () => {},
   onExpand
 }) => {
-  const internalForm = useRef();
-  const form = externalForm || internalForm;
+  // 如果外部没有传入 form，使用 Form.useForm() 创建实例
+  const [internalFormInstance] = Form.useForm();
+  const internalFormRef = useRef(internalFormInstance);
+
+  // 判断外部传入的是 ref 还是 form 实例
+  // ref 对象有 current 属性，form 实例没有
+  const isExternalRef = externalForm && 'current' in externalForm;
+
+  // 警告：ref 用法将在后续版本中移除
+  useEffect(() => {
+    if (isExternalRef) {
+      console.warn('[SearchForm] 警告：通过 ref 传入 form 的方式已废弃，将在后续版本中移除。' + '请使用 Form.useForm() 创建 form 实例并直接传入，例如：\n' + '  const [form] = Form.useForm();\n' + '  <SearchForm form={form} />');
+    }
+  }, [isExternalRef]);
+
+  // 获取实际的 form 实例（兼容 ref 和直接传入实例两种情况）
+  const getFormInstance = () => {
+    if (externalForm) {
+      return isExternalRef ? externalForm.current : externalForm;
+    }
+    return internalFormInstance;
+  };
+
+  // 兼容性处理：用于 form.current 访问方式的 ref
+  const formRef = externalForm && isExternalRef ? externalForm : internalFormRef;
+
+  // 更新内部 ref，确保 formRef.current 始终指向正确的实例
+  useEffect(() => {
+    if (!isExternalRef && externalForm) {
+      // 如果外部传入的是实例，将其赋值给内部 ref 的 current
+      internalFormRef.current = externalForm;
+    }
+  }, [externalForm, isExternalRef]);
   const [internalOpen, setInternalOpen] = useState(defaultExpand);
   useEffect(() => {
     if (onRef) {
-      onRef(form);
+      onRef(formRef);
     }
-  }, [form, onRef]);
+  }, [formRef, onRef]);
   const isControlled = expand !== undefined;
   const isOpen = isControlled ? expand : internalOpen;
   const handleToggle = () => {
@@ -47,8 +79,9 @@ const SearchForm = ({
     icon: /*#__PURE__*/React.createElement(UndoOutlined, null),
     loading: loading,
     onClick: () => {
-      form.current.resetFields();
-      onReset(form.current.getFieldsValue());
+      const formInstance = getFormInstance();
+      formInstance.resetFields();
+      onReset(formInstance.getFieldsValue());
     }
   }, "\u91CD\u7F6E"), formLine.length / colSize > 1 && /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DoubleRightOutlined, {
@@ -58,8 +91,30 @@ const SearchForm = ({
     }),
     onClick: handleToggle
   }, isOpen ? '收起' : '展开'));
+
+  /**
+   * 处理 formLine，确保所有 Form.Item 都有 noStyle 属性
+   * @param {ReactNode[]} nodes - 表单节点数组
+   * @returns {ReactNode[]} - 处理后的节点数组
+   */
+  const processFormLine = nodes => {
+    return nodes.map(node => {
+      // 检查是否是 Form.Item 组件
+      if (/*#__PURE__*/React.isValidElement(node) && node.type === Form.Item) {
+        // 如果没有 noStyle 属性，则克隆并添加
+        if (!node.props.noStyle) {
+          return /*#__PURE__*/React.cloneElement(node, {
+            noStyle: true
+          });
+        }
+      }
+      return node;
+    });
+  };
   const groupsList = () => {
-    const arr = formLine.map(node => ({
+    // 先处理 formLine，确保所有 Form.Item 都有 noStyle
+    const processedFormLine = processFormLine(formLine);
+    const arr = processedFormLine.map(node => ({
       show: true,
       node
     }));
@@ -73,12 +128,15 @@ const SearchForm = ({
   };
   const formItemList = groupsList();
   if (formItemList.length === 0) return null;
-  return /*#__PURE__*/React.createElement(Form, {
-    ref: form,
+  return /*#__PURE__*/React.createElement(Form, _extends({}, externalForm && isExternalRef ? {
+    ref: externalForm
+  } : {
+    form: externalForm || internalFormInstance
+  }, {
     style: style,
     initialValues: initialValues,
     onFinish: values => onFinish(values)
-  }, /*#__PURE__*/React.createElement(Row, {
+  }), /*#__PURE__*/React.createElement(Row, {
     gutter: [16, 16]
   }, formItemList.map((item, index) => /*#__PURE__*/React.createElement(Col, {
     key: index,

package/Table/index.d.ts

@@ -1,17 +1,64 @@
-// @ts-ignore
-import * as React from 'react';
-// @ts-ignore
-import type { TableProps } from 'antd';
-
-export interface OverTableProps extends TableProps {
-  // 是否禁用内容区滚动，默认-false
-  disabledResizer?: boolean;
-  // 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖
-  storeIndex?: string;
-}
-
-interface TableFc extends React.FC<OverTableProps> {
-}
-
-declare const Table: TableFc;
-export default Table;
+// @ts-ignore
+import * as React from 'react';
+// @ts-ignore
+import type { TableProps } from 'antd';
+
+/**
+ * 列设置配置项
+ */
+export interface SettingOptionType {
+  /** 是否可拖拽排序 */
+  draggable?: boolean;
+  /** 是否显示复选框 */
+  checkable?: boolean;
+  /** 是否显示列表项选项 */
+  showListItemOption?: boolean;
+  /** 重置时是否恢复选中状态 */
+  checkedReset?: boolean;
+  /** 列表高度 */
+  listsHeight?: number;
+  /** 额外内容 */
+  extra?: React.ReactNode;
+  /** 子元素 */
+  children?: React.ReactNode;
+  /** 自定义设置图标 */
+  settingIcon?: React.ReactNode;
+}
+
+/**
+ * ProTable options 配置项
+ */
+export interface OptionConfig {
+  /** 是否显示密度切换 */
+  density?: boolean;
+  /** 是否显示全屏按钮，或自定义函数 */
+  fullScreen?: boolean | ((e: React.MouseEvent<HTMLSpanElement>, action?: any) => void);
+  /** 是否显示刷新按钮，或自定义函数 */
+  reload?: boolean | ((e: React.MouseEvent<HTMLSpanElement>, action?: any) => void);
+  /** 列设置配置 */
+  setting?: boolean | SettingOptionType;
+  /** 搜索配置 */
+  search?: boolean | {
+    name?: string;
+    [key: string]: any;
+  };
+  /** 自定义刷新图标 */
+  reloadIcon?: React.ReactNode;
+  /** 自定义密度图标 */
+  densityIcon?: React.ReactNode;
+}
+
+export interface OverTableProps extends TableProps {
+  // 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖
+  storeIndex?: string;
+  // 是否启用自动计算滚动高度，默认-true
+  enableAutoScrollY?: boolean;
+  // ProTable options 配置项
+  options?: OptionConfig | false;
+}
+
+interface TableFc extends React.FC<OverTableProps> {
+}
+
+declare const Table: TableFc;
+export default Table;

package/Table/index.js

@@ -1,118 +1,100 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import React from 'react';
-import { tools } from '@cqsjjb/jjb-common-lib';
+import React, { useRef, useEffect, useState, useCallback } from 'react';
 import { ProTable } from '@ant-design/pro-components';
-import { useAntdResizableHeader } from 'use-antd-resizable-header';
-import { antPrefix, setTableSize, getTableSize, getPersistenceKey } from './utils';
 import './index.less';
-require('use-antd-resizable-header/dist/style.css');
+import { antPrefix } from './utils';
 export default function TablePro(props) {
   const prefix = antPrefix || 'ant';
   const baseCls = `.${prefix}-table`;
-  const tableCls = `${baseCls}-wrapper`;
+  const ref = useRef(null);
   const tableBodyCls = `${baseCls}-body`;
+  const tablePaginationCls = `${baseCls}-pagination`;
+  const tableFooterCls = `${baseCls}-footer`;
   const {
-    storeIndex
+    enableAutoScrollY = true,
+    options = {
+      reload: false,
+      density: true,
+      fullScreen: true,
+      setting: {
+        checkedReset: true,
+        draggable: false,
+        checkable: true
+      }
+    },
+    ...restProps
   } = props;
-  const [size, setSize] = React.useState(getTableSize(storeIndex) || 'default');
-  const [tableHeight, setTableHeight] = React.useState(0);
-  const persistenceKey = getPersistenceKey(storeIndex);
-  const enabledResizer = tools.isUndefined(props.disabledResizer);
-  React.useEffect(() => {
-    let mutationObserver, resizeObserver;
-    if (enabledResizer) {
-      // 监听-DOM树
-      mutationObserver = new MutationObserver(mutations => mutations.forEach(() => calcTableHeight()));
-      // 监听-缩放
-      resizeObserver = new ResizeObserver(entries => entries.forEach(() => calcTableHeight()));
-
-      // 初始化首次计算
-      setTimeout(() => calcTableHeight(), 500);
-
-      // 执行-监听-缩放
-      resizeObserver.observe(document.body);
-      // 执行-监听-DOM树是否发生变化
-      mutationObserver.observe(document.body, {
-        subtree: true,
-        childList: true
-      });
+  const [scrollY, setScrollY] = useState(undefined);
+  const timerRef = useRef(null);
+  const calcTableScrollY = () => {
+    const tableBody = ref.current?.querySelector?.(tableBodyCls);
+    const tableBodyRect = tableBody?.getBoundingClientRect();
+    const tableFooter = ref.current?.querySelector?.(tableFooterCls);
+    const tableFooterRect = tableFooter?.getBoundingClientRect();
+    const tablePagination = ref.current?.querySelector?.(tablePaginationCls);
+    const tablePaginationRect = tablePagination?.getBoundingClientRect();
+    const tableFooterHeight = tableFooterRect?.height || 0;
+    const tablePaginationMargin = 16;
+    const tablePaginationHeight = tablePaginationRect?.height || 0;
+    const border = 2;
+    const margin = 20;
+    const scrollY = window.innerHeight - tableBodyRect.top - tableFooterHeight - tablePaginationHeight - tablePaginationMargin - border - margin;
+    return scrollY;
+  };
+  const debouncedCalcScrollY = useCallback(() => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
     }
-    return () => {
-      if (mutationObserver && resizeObserver && enabledResizer) {
-        resizeObserver.unobserve(document.body);
-        mutationObserver.disconnect(document.body);
+    timerRef.current = setTimeout(() => {
+      const height = calcTableScrollY();
+      if (height) {
+        setScrollY(height);
       }
-    };
+    }, 150);
   }, []);
-  React.useEffect(() => {
-    setTableSize(size, storeIndex);
-  }, [size]);
+  useEffect(() => {
+    if (!ref.current || !enableAutoScrollY) return;
+
+    // 创建 ResizeObserver 监听元素尺寸变化
+    const resizeObserver = new ResizeObserver(() => {
+      // 等待 table-pagination 元素生成后再计算
+      debouncedCalcScrollY();
+    });
+    const mutationObserver = new MutationObserver(() => {
+      debouncedCalcScrollY();
+    });
+    mutationObserver.observe(ref.current, {
+      childList: true,
+      subtree: true,
+      attributes: true
+    });
 
-  // 计算高度
-  const calcTableHeight = () => {
-    try {
-      // table元素
-      const tableEl = document.querySelector(tableCls);
-      // table-body元素
-      const tableBodyEl = document.querySelector(tableBodyCls);
-      if (tableBodyEl && tableEl) {
-        // 获取table元素的矩形数据
-        const tableRect = tableEl.getBoundingClientRect();
-        // 获取table-body元素的矩形数据
-        const tableBodyRect = tableBodyEl.getBoundingClientRect();
-        // 获取底部的高度差
-        const bottomHeight = tableRect.bottom - tableBodyRect.bottom;
-        // 计算最终值
-        setTableHeight(innerHeight - tableBodyRect.top - bottomHeight - (window.__IN_BASE__ ? 38 : 22));
+    // 开始观察 ref.current 的尺寸变化
+    resizeObserver.observe(ref.current);
+    return () => {
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
       }
-    } catch (e) {
-      window.console['error'](e);
-    }
-  };
-  const {
-    components,
-    resizableColumns,
-    tableWidth,
-    resetColumns
-    // refresh
-  } = useAntdResizableHeader({
-    columns: props.columns,
-    columnsState: {
-      persistenceKey: persistenceKey.resizable,
-      persistenceType: 'localStorage'
+      resizeObserver.disconnect();
+      mutationObserver.disconnect();
+    };
+  }, [ref, enableAutoScrollY, debouncedCalcScrollY]);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    style: {
+      height: '100%'
     }
-  });
-  const scroll = {
-    x: tableWidth
-  };
-  if (enabledResizer) {
-    scroll.y = tableHeight;
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProTable, _extends({
+  }, /*#__PURE__*/React.createElement(ProTable, _extends({
     ghost: true,
     columnEmptyText: true,
-    size: size,
     search: false,
-    scroll: scroll,
+    scroll: enableAutoScrollY ? {
+      y: scrollY || 0
+    } : undefined,
     className: `${antPrefix}-gbs-pro-table`,
-    options: {
-      reload: false,
-      fullScreen: true,
-      setting: {
-        checkedReset: true,
-        extra: /*#__PURE__*/React.createElement("a", {
-          className: `${antPrefix}-pro-table-column-setting-action-rest-button`,
-          onClick: resetColumns
-        }, "\u91CD\u7F6E\u5217\u5BBD")
-      }
-    },
-    components: components,
-    columnsState: {
-      persistenceKey: persistenceKey.columnState,
-      persistenceType: 'localStorage'
-    },
-    onSizeChange: setSize
-  }, props, {
-    columns: resizableColumns
+    size: "default",
+    options: options
+  }, restProps, {
+    columns: restProps.columns
   })));
 }

package/Table/index.less

@@ -1,8 +1,10 @@
-.@{ant-prefix} {
+@com-prefix-cls: if(isdefined(@ant-prefix), @ant-prefix, ant);
+
+.@{com-prefix-cls} {
   &-gbs-pro-table {
-    .@{ant-prefix}-pro-card {
+    .@{com-prefix-cls}-pro-card {
       &-body {
-        .@{ant-prefix}-pro-table-list-toolbar {
+        .@{com-prefix-cls}-pro-table-list-toolbar {
           &-container {
             padding-top: 0;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.1-beta.8",
+  "version": "3.3.2",
   "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;
-    }
-  }
-}