@bit-sun/business-component 4.0.11-alpha.19 → 4.0.11-alpha.20

package/package.json

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

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

@@ -215,12 +215,12 @@ class SearchItemTable extends React.Component {
             onClick={() => {
               this.setState({
                 sortDataSource: this.state.sortDataSource.filter((item) => {
-                  return item.label !== record.label;
+                  return item.name !== record.name;
                 }),
                 isDefaultValue: false,
                 dataSource: [
                   ...this.state.dataSource.map((item) => {
-                    if (item.label === record.label) {
+                    if (item.name === record.name) {
                       return {
                         ...item,
                         hidden: true,
@@ -265,6 +265,7 @@ class SearchItemTable extends React.Component {
     console.log(e);
     this.setState({
       visible: false,
+      searchDataSource: '',
     });
   };
 
@@ -326,17 +327,17 @@ class SearchItemTable extends React.Component {
     return <SortableItem index={index} {...restProps} />;
   };
 
-  onChange = (e: CheckboxChangeEvent, label) => {
+  onChange = (e: CheckboxChangeEvent, name) => {
     const { sortDataSource, dataSource } = this.state;
     if (!e.target.checked) {
       this.setState({
         sortDataSource: sortDataSource.filter((item) => {
-          return item.label !== label;
+          return item.name !== name;
         }),
         isDefaultValue: false,
         dataSource: [
           ...dataSource.map((item) => {
-            if (item.label === label) {
+            if (item.name === name) {
               return {
                 ...item,
                 hidden: true,
@@ -350,7 +351,7 @@ class SearchItemTable extends React.Component {
       let newSortData = [
         ...sortDataSource,
         ...dataSource
-          .filter((item) => item.label === label)
+          .filter((item) => item.name === name)
           .map((source) => {
             return {
               ...source,
@@ -363,7 +364,7 @@ class SearchItemTable extends React.Component {
         isDefaultValue: false,
         dataSource: [
           ...dataSource.map((item) => {
-            if (item.label === label) {
+            if (item.name === name) {
               return {
                 ...item,
                 hidden: false,
@@ -396,14 +397,41 @@ class SearchItemTable extends React.Component {
     });
   };
 
+  // 处理非标准 特殊搜索项 名称回显
+  showSearchItemLabel = (item: object) => {
+    //搜索项 存在 label默认返回
+    if(item.label){
+      return item.label;
+    } else {
+      switch(item.field.type){
+        //多值录入搜索组件 默认使用下拉框第一个选项
+        case 'bs-multiInput':
+          const { options = [] } = item?.field?.props;
+          return options[0]?.text;
+        default:
+          return '';
+      }
+    }
+  }
+
+
   render() {
     const {
-      dataSource = [],
+      dataSource: originDataSource = [],
       searchDataSource,
-      sortDataSource,
+      sortDataSource: originSortDataSource = [],
       visible,
       onSearchSort,
     } = this.state;
+    const dataSource = originDataSource.map((item: any) => ({
+      ...item,
+      label: this.showSearchItemLabel(item),
+    }));
+    const sortDataSource = originSortDataSource.map((item: any) => ({
+      ...item,
+      label: this.showSearchItemLabel(item),
+    }));
+
     let newSearchSource = dataSource.filter(
       (item) => item?.label?.indexOf(searchDataSource||'') > -1,
     );
@@ -487,7 +515,7 @@ class SearchItemTable extends React.Component {
                             <Checkbox
                               checked={!item.hidden}
                               onChange={(e) => {
-                                this.onChange(e, item.label);
+                                this.onChange(e, item.name);
                               }}
                             >
                               {item.label}
@@ -499,7 +527,7 @@ class SearchItemTable extends React.Component {
                             <Checkbox
                               checked={!item.hidden}
                               onChange={(e) => {
-                                this.onChange(e, item.label);
+                                this.onChange(e, item.name);
                               }}
                             >
                               {item.label}