@bit-sun/business-component 4.0.11-alpha.1 → 4.0.11-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.11-alpha.1",
+  "version": "4.0.11-alpha.11",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/assets/copyImg.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 28</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="单据-详情页订单金额信息" transform="translate(-418.000000, -1210.000000)">
+            <g id="编组-2" transform="translate(280.000000, 998.000000)">
+                <g id="编组" transform="translate(0.000000, 204.000000)">
+                    <g id="编组-28" transform="translate(138.000000, 8.000000)">
+                        <rect id="矩形" stroke="#979797" fill="#005CFF" opacity="0" x="0.5" y="0.5" width="23" height="23"></rect>
+                        <path d="M13.5,9 C14.3284271,9 15,9.67157287 15,10.5 L15,18.5 C15,19.3284271 14.3284271,20 13.5,20 L5.5,20 C4.67157288,20 4,19.3284271 4,18.5 L4,10.5 C4,9.67157287 4.67157288,9 5.5,9 L13.5,9 Z M13.5,10.5 L5.5,10.5 L5.5,18.5 L13.5,18.5 L13.5,10.5 Z M12,15 L12,16.5 L7,16.5 L7,15 L12,15 Z M18.5,4 C19.3284271,4 20,4.67157288 20,5.5 L20,13.5 C20,14.3284271 19.3284271,15 18.5,15 L16,15 L16,13.5 L18.5,13.5 L18.5,5.5 L10.5,5.5 L10.5,8 L9,8 L9,5.5 C9,4.67157288 9.67157287,4 10.5,4 L18.5,4 Z M12,12.5 L12,14 L7,14 L7,12.5 L12,12.5 Z" id="形状" fill="#005CFF" fill-rule="nonzero"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/assets/zhankaitiaojian-icon.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>zhankaitiaojian-icon</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="24" height="24"></rect>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon" transform="translate(-702.000000, -498.000000)">
+            <g id="zhankaitiaojian-icon" transform="translate(702.000000, 498.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <use id="蒙版" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use>
+                <path d="M12.0142082,6 L18,11.9972435 L12.0142082,18 L11.04209,17.0260337 L16.0562218,11.9972435 L11.04209,6.97396631 L12.0142082,6 Z M6.97257658,6 L12.9583683,11.9972435 L6.97257658,18 L6.00091666,17.0260337 L11.0150485,11.9972435 L6,6.97396631 L6.97257658,6 Z" id="形状" fill="#005CFF" fill-rule="nonzero" mask="url(#mask-2)" transform="translate(12.000000, 12.000000) rotate(-270.000000) translate(-12.000000, -12.000000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/components/Business/BsLayouts/index.tsx

@@ -507,11 +507,24 @@ class BasicLayout extends React.PureComponent {
               query: route.query,
               match: match,
               key: currentKey,
+              state: route.state,
               tab: this.getPageTitle(route.pathname) + '',
             },
           ];
           newListenRouterKey = [...listenRouterKey, currentKey];
         }
+      } else {
+        // 更新已存储路由的query和state
+        newListenRouterState = newListenRouterState.map(item => {
+          if (item.key === currentKey) {
+            return {
+              ...item,
+              query: route.query,
+              state: route.state,
+            };
+          }
+          return item;
+        })
       }
 
       // -------------------处理页签关闭----------------------------
@@ -1507,6 +1520,7 @@ class BasicLayout extends React.PureComponent {
                   getDictionaryTextByValue={this.getDictionaryTextByValue}
                   timeFormat={this.timeFormat}
                   transparentProps={transparentProps}
+                  activeKey={activeKey}
                 />
               </TabPane>
             ))}
@@ -1559,6 +1573,9 @@ class WrapperComponent extends React.Component {
     if (window.__POWERED_BY_WUJIE__ && nextProps?.item?.key?.indexOf('edit-template-template') > -1) { // 适配wujie环境主应用下渲染打印编辑器
       return true
     }
+    if (nextProps.activeKey === nextProps.item.key && JSON.stringify(nextProps.item) !== JSON.stringify(this.props.item)) {
+      return true;
+    }
     return false;
   }
   render() {

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -749,6 +749,20 @@ export default (props: any) => {
     }
   };
 
+  const columnsDom = <span className="ant-dropdown-link">
+    <div onClick={sortTableRef?.current?.showModal} className="ant-dropdown-link">
+      <img style={{position: 'relative', left: '-7px'}} width={24} src={shezhi} />
+    </div>
+  </span>
+
+  const queryFieldsDom = <SearchItemTable
+    ref={searchTableRef}
+    setShowSearchFields={setShowSearchFields}
+    showSearchFields={showSearchFields}
+    datasource={value?.fields || []}
+    bsTableCode={bsTableCode}
+  />
+
   const memoConfig = useMemo(
     () => ({
       ...config,
@@ -756,6 +770,8 @@ export default (props: any) => {
       summaryList: props.summaryList ? getTableSummaryInfo : undefined,
       statusMapping: props.statusMapping,
       isBsSulaQueryTable: true,
+      columnsDom:columnsDom,
+      queryFieldsDom,
     }),
     [
       checkedList,
@@ -766,23 +782,9 @@ export default (props: any) => {
     ],
   );
 
-  const columnsDom = <span className="ant-dropdown-link">
-    <div onClick={sortTableRef?.current?.showModal} className="ant-dropdown-link">
-      <img style={{position: 'relative', left: '-7px'}} width={24} src={shezhi} />
-    </div>
-  </span>
-
-  const queryFieldsDom = <SearchItemTable
-      ref={searchTableRef}
-      setShowSearchFields={setShowSearchFields}
-      showSearchFields={showSearchFields}
-      datasource={value?.fields || []}
-      bsTableCode={bsTableCode}
-    />
-
   return (
     <div id="bs-sula-query-table">
-      <MemoQueryTable {...memoConfig} columnsDom={columnsDom} queryFieldsDom={queryFieldsDom} />
+      <MemoQueryTable {...memoConfig} />
       {/* 列设置弹出框表格 */}
       <SortableTable
         ref={sortTableRef}

package/src/components/Business/BsSulaQueryTable/utils.tsx

@@ -253,7 +253,7 @@ export const tableColumnsImage = (
     <>
       {url ? (
         <div className={`clomnsImg`}>
-          <Image src={url} width="28px" height="28px" {...paramsObj}></Image>
+          <Image src={url} width="16px" height="16px" {...paramsObj}></Image>
         </div>
       ) : (
         <div className={`clomnsImg2`}>

package/src/components/Business/DetailPageWrapper/index.less

@@ -31,7 +31,6 @@
 .detail_page_wrapper {
   // padding-top: 51px;
   height: calc(100vh - 80px);
-  background-color: #FFF;
 }
 
 .back_home_img_content {
@@ -81,7 +80,7 @@
   gap: 8px;
   margin-right: 20px;
   button {
-    height: 32px !important;
+    height: 24px !important;
     display: flex;
     align-items: center;
     gap: 2px;