@bit-sun/business-component 2.2.0-alpha.3 → 2.2.0-alpha.4

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, Popover, Card, Avatar, Image, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, isEmpty } from 'lodash';
-import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, Component, useLayoutEffect, createRef, Fragment } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, Component, useLayoutEffect, createRef } from 'react';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import { UnorderedListOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, CopyOutlined, SearchOutlined, CaretLeftOutlined, CloseCircleOutlined, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, CaretDownOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, DashOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined } from '@ant-design/icons';
 import { useDebounceFn, useMount } from 'ahooks';
@@ -32,8 +32,7 @@ var ENUM = {
     LIMIT_MENU_DATA: 'limitedMenuData',
     USER_INFO: 'userInfo',
     DICT_CODES: 'dicData',
-    CHILD_APP_BACK: 'child_app_back',
-    SEARCH_FIELDS_CONDITION: 'searchFieldsCondition' //表格搜索项信息缓存
+    CHILD_APP_BACK: 'child_app_back' //标记子应用goback事件
   }
 };
 
@@ -15988,43 +15987,25 @@ var DetailWrapper = /*#__PURE__*/React.memo(function (_ref) {
   var pageTitle = useMemo(function () {
     return getPageTitle(pathname);
   }, [pathname, title]);
-  // const breadcrumbArr = `${basePath}${pathname}`
-  //   .split('/')
-  //   .slice(1)
-  //   .map((_item, index, arr) =>
-  //     matchParamsPath(
-  //       `/${arr.slice(0, index + 1).join('/')}`,
-  //       breadcrumbNameMap,
-  //     ),
-  //   )
-  //   .filter((item) => item);
   useEffect(function () {}, []);
   var ShowFullScreen = function ShowFullScreen() {
-    if (window.top != window) {
-      window.parent.postMessage({
-        type: 'screenChange',
-        id: itemPath
-      }, '*');
-      setIsFnllScreen(!isFullScreen);
-    } else {
-      var _isFullScreen = document.fullScreen || document.webkitIsFullScreen || document.mozFullScreen;
-      var contentEle = document.querySelector("body");
-      // addTabsNavStyle(isFullScreen);
-      if (contentEle && !_isFullScreen) {
-        var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
-        if (fullScreenEle) {
-          fullScreenEle.call(contentEle);
-          setIsFnllScreen(true);
-          return;
-        }
+    var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
+    var contentEle = window.top.document.querySelector("body");
+    // addTabsNavStyle(isFullScreen);
+    if (contentEle && !isFullScreen) {
+      var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
+      if (fullScreenEle) {
+        fullScreenEle.call(contentEle);
+        setIsFnllScreen(true);
+        return;
       }
-      if (document && _isFullScreen) {
-        var exitFullScreen = document.exitFullscreen || document.mozCancelFullScreen || document.webkitCancelFullScreen || document.msExitFullscreen;
-        if (exitFullScreen) {
-          exitFullScreen.call(document);
-          setIsFnllScreen(false);
-          return;
-        }
+    }
+    if (window.top.document && isFullScreen) {
+      var exitFullScreen = window.top.document.exitFullscreen || window.top.document.mozCancelFullScreen || window.top.document.webkitCancelFullScreen || window.top.document.msExitFullscreen;
+      if (exitFullScreen) {
+        exitFullScreen.call(window.top.document);
+        setIsFnllScreen(false);
+        return;
       }
     }
   };
@@ -16537,556 +16518,11 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           }
         }, /*#__PURE__*/React.createElement(Tooltip, {
           placement: "top",
-          title: (record === null || record === void 0 ? void 0 : record.fixed) === 'right' ? '取消固定' : '固定列尾'
-        }, /*#__PURE__*/React.createElement("img", {
-          src: (record === null || record === void 0 ? void 0 : record.fixed) === 'right' ? fixedRightActive : fixedRight
-        })));
-      }
-    }, {
-      title: '删除',
-      dataIndex: 'title1',
-      render: function render(text, record) {
-        return /*#__PURE__*/React.createElement("span", {
-          onClick: function onClick() {
-            _this.setState({
-              sortDataSource: _this.state.sortDataSource.filter(function (item) {
-                return item.title !== record.title;
-              }),
-              isDefaultValue: false,
-              dataSource: _toConsumableArray(_this.state.dataSource.map(function (item) {
-                if (item.title === record.title) {
-                  return _objectSpread2(_objectSpread2({}, item), {}, {
-                    hidden: true
-                  });
-                }
-                return item;
-              }))
-            });
-          }
-        }, /*#__PURE__*/React.createElement("img", {
-          src: close
-        }));
-      }
-    }, {
-      title: 'Sort',
-      dataIndex: 'sort',
-      className: 'drag-visible',
-      render: function render() {
-        return /*#__PURE__*/React.createElement(DragHandle$2, null);
-      }
-    }];
-    _this.showModal = function () {
-      _this.setState({
-        visible: true
-      });
-      _this.setInitValue();
-    };
-    _this.handleOk = function (e) {
-      var _this$state2 = _this.state,
-        sortDataSource = _this$state2.sortDataSource,
-        isDefaultValue = _this$state2.isDefaultValue,
-        defaultValue = _this$state2.defaultValue;
-      if (!sortDataSource.length) {
-        message.warning('至少选择一列!');
-        return;
-      }
-      // if (isDefaultValue) {
-      //   this.patchUserColumnConfig('');
-      //   return;
-      // }
-      _this.patchUserColumnConfig(sortDataSource);
-    };
-    _this.handleCancel = function (e) {
-      console.log(e);
-      _this.setState({
-        visible: false
-      });
-    };
-    _this.handleTableHeadHidden = function (title) {
-      var _this$state3 = _this.state,
-        sortDataSource = _this$state3.sortDataSource,
-        dataSource = _this$state3.dataSource;
-      _this.setState({
-        sortDataSource: sortDataSource.filter(function (item) {
-          return item.title !== title;
-        }),
-        dataSource: _toConsumableArray(dataSource.map(function (item) {
-          if (item.title === title) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
-              hidden: true
-            });
-          }
-          return item;
-        }))
-      }, function () {
-        _this.handleOk();
-      });
-    };
-    _this.onSortEnd = function (_ref) {
-      var oldIndex = _ref.oldIndex,
-        newIndex = _ref.newIndex;
-      var sortDataSource = _this.state.sortDataSource;
-      if (oldIndex !== newIndex) {
-        var newData = arrayMoveImmutable([].concat(sortDataSource), oldIndex, newIndex).filter(function (el) {
-          return !!el;
-        });
-        _this.setState({
-          sortDataSource: [].concat(_toConsumableArray(newData.filter(function (item) {
-            return item.fixed === 'left';
-          })), _toConsumableArray(newData.filter(function (item) {
-            return !item.fixed;
-          })), _toConsumableArray(newData.filter(function (item) {
-            return item.fixed === 'right';
-          }))),
-          isDefaultValue: false
-        });
-      }
-    };
-    _this.DraggableContainer = function (props) {
-      return /*#__PURE__*/React.createElement(SortableBody$2, _objectSpread2({
-        useDragHandle: true,
-        disableAutoscroll: true,
-        helperClass: "row-dragging",
-        onSortEnd: _this.onSortEnd
-      }, props));
-    };
-    _this.DraggableBodyRow = function (_ref2) {
-      var className = _ref2.className,
-        style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$c);
-      var sortDataSource = _this.state.sortDataSource;
-      // function findIndex base on Table rowKey props and should always be a right array index
-      var index = sortDataSource.findIndex(function (x) {
-        return x.key === restProps['data-row-key'];
-      });
-      return /*#__PURE__*/React.createElement(SortableItem$2, _objectSpread2({
-        index: index
-      }, restProps));
-    };
-    _this.onChange = function (e, title) {
-      var _this$state4 = _this.state,
-        sortDataSource = _this$state4.sortDataSource,
-        dataSource = _this$state4.dataSource;
-      if (!e.target.checked) {
-        _this.setState({
-          sortDataSource: sortDataSource.filter(function (item) {
-            return item.title !== title;
-          }),
-          isDefaultValue: false,
-          dataSource: _toConsumableArray(dataSource.map(function (item) {
-            if (item.title === title) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                hidden: true
-              });
-            }
-            return item;
-          }))
-        });
-      } else {
-        var _fixedLeft = [];
-        var _fixedRight = [];
-        var noFixedSortSource = [];
-        var newSortData = [].concat(_toConsumableArray(sortDataSource), _toConsumableArray(dataSource.filter(function (item) {
-          return item.title === title;
-        }).map(function (source) {
-          return _objectSpread2(_objectSpread2({}, source), {}, {
-            hidden: false
-          });
-        })));
-        newSortData.forEach(function (item) {
-          if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
-            _fixedLeft.push(item);
-          } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
-            _fixedRight.push(item);
-          } else {
-            noFixedSortSource.push(item);
-          }
-        });
-        _this.setState({
-          sortDataSource: [].concat(_fixedLeft, noFixedSortSource, _fixedRight),
-          isDefaultValue: false,
-          dataSource: _toConsumableArray(dataSource.map(function (item) {
-            if (item.title === title) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                hidden: false
-              });
-            }
-            return item;
-          }))
-        });
-      }
-    };
-    _this.handleReset = function () {
-      _this.setInitValue(true);
-    };
-    _this.onSearch = function (e) {
-      _this.setState({
-        searchDataSource: e.target.value
-      });
-    };
-    _this.onSearchSort = function (e) {
-      _this.setState({
-        onSearchSort: e.target.value
-      });
-    };
-    return _this;
-  }
-  _createClass(SortableTable, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var _this$props2 = this.props,
-        datasource = _this$props2.datasource,
-        showColumn = _this$props2.showColumn,
-        bsTableCode = _this$props2.bsTableCode;
-      var config = this.getConfigFromlocalstorage();
-      this.setState({
-        dataSource: datasource.map(function (item) {
-          var _innerItem$3;
-          var innerItem = config.filter(function (inneritem) {
-            var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
-            var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
-            return innerKey && innerKey === itemKey;
-          });
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            key: item.key || item.dataIndex,
-            width: ((_innerItem$3 = innerItem[0]) === null || _innerItem$3 === void 0 ? void 0 : _innerItem$3.width) || item.width,
-            hidden: config.length ? !innerItem.length : item.hidden
-          });
-        }),
-        defaultValue: datasource.map(function (item) {
-          var _innerItem$4;
-          var innerItem = config.filter(function (inneritem) {
-            var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
-            var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
-            return innerKey && innerKey === itemKey;
-          });
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            key: item.key || item.dataIndex,
-            width: ((_innerItem$4 = innerItem[0]) === null || _innerItem$4 === void 0 ? void 0 : _innerItem$4.width) || item.width,
-            hidden: config.length ? !innerItem.length : item.hidden
-          });
-        }),
-        sortDataSource: datasource.filter(function (item) {
-          return !item.hidden;
-        }).map(function (item) {
-          var _showColumn$filter$;
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            key: item.key || item.dataIndex,
-            width: ((_showColumn$filter$ = showColumn.filter(function (inneritem) {
-              var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
-              var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
-              return innerKey && innerKey === itemKey;
-            })[0]) === null || _showColumn$filter$ === void 0 ? void 0 : _showColumn$filter$.width) || item.width
-          });
-        }),
-        bsTableCode: bsTableCode
-      });
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-      var _this$state5 = this.state,
-        dataSource = _this$state5.dataSource,
-        searchDataSource = _this$state5.searchDataSource,
-        sortDataSource = _this$state5.sortDataSource,
-        visible = _this$state5.visible,
-        onSearchSort = _this$state5.onSearchSort;
-      var seatchDataSource = dataSource.filter(function (item) {
-        var _item$title;
-        return (item === null || item === void 0 ? void 0 : (_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.indexOf(searchDataSource || '')) > -1;
-      });
-      return /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_wrapper'
-      }, visible && /*#__PURE__*/React.createElement(Modal, {
-        title: "\u8BBE\u7F6E\u8868\u5934\u5185\u5BB9",
-        wrapClassName: 'sort_table_wrapper',
-        width: 820,
-        visible: visible,
-        onOk: this.handleOk,
-        onCancel: this.handleCancel,
-        footer: [/*#__PURE__*/React.createElement(Button, {
-          key: "back",
-          onClick: this.handleReset
-        }, "\u6062\u590D\u9ED8\u8BA4"), /*#__PURE__*/React.createElement(Button, {
-          key: "submit",
-          onClick: this.handleCancel
-        }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
-          key: "submit",
-          type: "primary",
-          onClick: this.handleOk
-        }, "\u786E\u8BA4")]
-      }, /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table'
-      }, /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_column_wrapper'
-      }, /*#__PURE__*/React.createElement("span", {
-        className: 'sort_table_column_count'
-      }, "\u53EF\u9009\u5B57\u6BB5 ", /*#__PURE__*/React.createElement("span", null, "\uFF08\u5171", dataSource.length, "\u4E2A\uFF09")), /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_column'
-      }, /*#__PURE__*/React.createElement(Input, {
-        prefix: /*#__PURE__*/React.createElement(SearchOutlined, {
-          className: "site-form-item-icon"
-        }),
-        placeholder: "\u641C\u7D22",
-        allowClear: true,
-        onChange: this.onSearch,
-        style: {
-          width: 540
-        }
-      }), /*#__PURE__*/React.createElement("div", null, !searchDataSource && /*#__PURE__*/React.createElement(Checkbox, {
-        checked: !dataSource.some(function (item) {
-          if (item.hidden) return true;
-          return false;
-        }),
-        onClick: function onClick(e) {
-          _this2.setState({
-            isDefaultValue: false,
-            dataSource: _toConsumableArray(dataSource.map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                hidden: !e.target.checked
-              });
-            })),
-            sortDataSource: e.target.checked ? [].concat(_toConsumableArray(dataSource.filter(function (item) {
-              return item.fixed === 'left';
-            }).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                hidden: false
-              });
-            })), _toConsumableArray(dataSource.filter(function (item) {
-              return !item.fixed;
-            }).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                hidden: false
-              });
-            })), _toConsumableArray(dataSource.filter(function (item) {
-              return item.fixed === 'right';
-            }).map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                hidden: false
-              });
-            }))) : []
-          });
-        }
-      }, "\u5168\u9009")), /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_column_all'
-      }, searchDataSource ? seatchDataSource.map(function (item) {
-        return /*#__PURE__*/React.createElement(Checkbox, {
-          checked: !item.hidden,
-          onChange: function onChange(e) {
-            _this2.onChange(e, item.title);
-          }
-        }, item.title);
-      }) : dataSource.filter(function (item) {
-        var _item$title2, _item$title3;
-        return (item === null || item === void 0 ? void 0 : (_item$title2 = item.title) === null || _item$title2 === void 0 ? void 0 : _item$title2.indexOf('人')) === -1 && (item === null || item === void 0 ? void 0 : (_item$title3 = item.title) === null || _item$title3 === void 0 ? void 0 : _item$title3.indexOf('日期')) === -1;
-      }).map(function (item) {
-        return /*#__PURE__*/React.createElement(Checkbox, {
-          checked: !item.hidden,
-          onChange: function onChange(e) {
-            _this2.onChange(e, item.title);
-          }
-        }, item.title);
-      }), !!seatchDataSource.length && /*#__PURE__*/React.createElement("span", {
-        style: {
-          width: '144px'
-        }
-      }), !seatchDataSource.length && /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_column_all_empty'
-      }, "\u672A\u67E5\u8BE2\u5230\u7ED3\u679C")), !searchDataSource && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_column_special'
-      }, /*#__PURE__*/React.createElement("span", null, "\u4EBA\u5458\u65F6\u95F4\u5B57\u6BB5")), /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_column_all'
-      }, _toConsumableArray(dataSource).filter(function (item) {
-        var _item$title4, _item$title5;
-        return (item === null || item === void 0 ? void 0 : (_item$title4 = item.title) === null || _item$title4 === void 0 ? void 0 : _item$title4.indexOf('人')) > -1 || (item === null || item === void 0 ? void 0 : (_item$title5 = item.title) === null || _item$title5 === void 0 ? void 0 : _item$title5.indexOf('日期')) > -1;
-      }).map(function (item) {
-        return /*#__PURE__*/React.createElement(Checkbox, {
-          checked: !item.hidden,
-          onChange: function onChange(e) {
-            _this2.onChange(e, item.title);
-          }
-        }, item.title);
-      }), /*#__PURE__*/React.createElement("span", {
-        style: {
-          width: '144px'
-        }
-      }))))), /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_content_wrapper'
-      }, /*#__PURE__*/React.createElement("span", {
-        className: 'sort_table_content_count'
-      }, "\u5DF2\u9009\u5B57\u6BB5 ", /*#__PURE__*/React.createElement("span", null, "\uFF08\u5171", sortDataSource.length, "\u4E2A\uFF09")), /*#__PURE__*/React.createElement("div", {
-        className: 'sort_table_content'
-      }, /*#__PURE__*/React.createElement("span", {
-        style: {
-          paddingLeft: '10px'
-        }
-      }, /*#__PURE__*/React.createElement(Input, {
-        prefix: /*#__PURE__*/React.createElement(SearchOutlined, {
-          className: "site-form-item-icon"
-        }),
-        placeholder: "\u641C\u7D22",
-        allowClear: true,
-        onChange: this.onSearchSort,
-        style: {
-          width: 190
-        }
-      })), /*#__PURE__*/React.createElement(Table, {
-        pagination: false,
-        showHeader: false,
-        dataSource: onSearchSort ? sortDataSource.filter(function (item) {
-          var _item$title6;
-          return (item === null || item === void 0 ? void 0 : (_item$title6 = item.title) === null || _item$title6 === void 0 ? void 0 : _item$title6.indexOf(onSearchSort)) > -1;
-        }) : sortDataSource,
-        columns: this.columns,
-        rowKey: "key",
-        // rowSelection={rowSelection}
-        components: {
-          body: {
-            wrapper: this.DraggableContainer,
-            row: this.DraggableBodyRow
-          }
-        }
-      }))))), /*#__PURE__*/React.createElement("div", {
-        onClick: this.showModal,
-        style: {
-          fontSize: 14
-        }
-      }, "\u5217\u8BBE\u7F6E"));
-    }
-  }]);
-  return SortableTable;
-}(React.Component);
-
-var _excluded$d = ["className", "style"];
-var DragHandle$3 = SortableHandle(function () {
-  return /*#__PURE__*/React.createElement("img", {
-    src: drag
-  });
-});
-var SortableItem$3 = SortableElement(function (props) {
-  return /*#__PURE__*/React.createElement("tr", _objectSpread2({}, props));
-});
-var SortableBody$3 = SortableContainer(function (props) {
-  return /*#__PURE__*/React.createElement("tbody", _objectSpread2({}, props));
-});
-var SearchItemTable = /*#__PURE__*/function (_React$Component) {
-  _inherits(SearchItemTable, _React$Component);
-  var _super = _createSuper(SearchItemTable);
-  function SearchItemTable() {
-    var _this;
-    _classCallCheck(this, SearchItemTable);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _this.state = {
-      dataSource: [],
-      columns: [],
-      sortDataSource: [],
-      setVisible: false,
-      searchDataSource: false,
-      onSearchSort: false,
-      isDefaultValue: false,
-      defaultValue: [],
-      bsTableCode: '' //设置table 列的标识
-    };
-    _this.patchUserSearchFieldsConfig = function (config) {
-      var that = _assertThisInitialized(_this);
-      var configvalue = config ? config.map(function (item) {
-        return {
-          name: item.name,
-          hidden: item.hidden
-        };
-      }) : '';
-      axios({
-        url: '/user/appConfig/saveQueryCriteria',
-        method: 'POST',
-        data: {
-          code: that.state.bsTableCode,
-          detail: configvalue ? JSON.stringify(configvalue) : ''
-        }
-      }).then(function (res) {
-        var _res$data;
-        if ((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.status) === '0') {
-          _this.patchConfigToLocalstorage(configvalue);
-        } else {
-          message.error('保存搜索项自定义失败，请稍后尝试');
-        }
-      });
-    };
-    _this.getConfigFromlocalstorage = function () {
-      var config = localStorage.getItem(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION) || '[]';
-      var configArray = JSON.parse(config);
-      var configSetting = configArray.filter(function (item) {
-        return item.code === _this.state.bsTableCode;
-      });
-      if (configSetting.length && configSetting[0].detail) {
-        return JSON.parse(configSetting[0].detail);
-      }
-      return [];
-    };
-    _this.patchConfigToLocalstorage = function (configvalue) {
-      var setShowSearchFields = _this.props.setShowSearchFields;
-      var _this$state = _this.state,
-        sortDataSource = _this$state.sortDataSource,
-        bsTableCode = _this$state.bsTableCode;
-      var config = localStorage.getItem(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION) || '[]';
-      var configArray = JSON.parse(config);
-      var currentSetting = configArray.filter(function (item) {
-        return item.code === bsTableCode;
-      });
-      if (currentSetting.length) {
-        currentSetting[0].detail = JSON.stringify(configvalue);
-      } else {
-        configArray.push({
-          "code": bsTableCode,
-          "detail": JSON.stringify(configvalue)
-        });
+          title: (record === null || record === void 0 ? void 0 : record.fixed) === 'right' ? '取消固定' : '固定列尾'
+        }, /*#__PURE__*/React.createElement("img", {
+          src: (record === null || record === void 0 ? void 0 : record.fixed) === 'right' ? fixedRightActive : fixedRight
+        })));
       }
-      localStorage.setItem(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION, JSON.stringify(configArray));
-      _this.setState({
-        visible: false
-      });
-      setShowSearchFields(_toConsumableArray(sortDataSource));
-    };
-    _this.setInitValue = function () {
-      var _this$props = _this.props,
-        _this$props$datasourc = _this$props.datasource,
-        datasource = _this$props$datasourc === void 0 ? [] : _this$props$datasourc,
-        _this$props$showSearc = _this$props.showSearchFields,
-        showSearchFields = _this$props$showSearc === void 0 ? [] : _this$props$showSearc;
-      var config = _this.getConfigFromlocalstorage();
-      _this.setState({
-        isDefaultValue: true,
-        dataSource: datasource.map(function (item) {
-          var innerItem = config.filter(function (inneritem) {
-            var innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-            var itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
-            return innerKey && innerKey === itemKey;
-          });
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            hidden: config.length && !innerItem.length
-          });
-        }),
-        defaultValue: datasource.map(function (item) {
-          var innerItem = config.filter(function (inneritem) {
-            var innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-            var itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
-            return innerKey && innerKey === itemKey;
-          });
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            hidden: config.length && !innerItem.length
-          });
-        }),
-        sortDataSource: _toConsumableArray(showSearchFields)
-      });
-    };
-    _this.columns = [{
-      title: '搜索字段名称',
-      dataIndex: 'label',
-      className: 'drag-visible',
-      width: 100
     }, {
       title: '删除',
       dataIndex: 'title1',
@@ -17095,11 +16531,11 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick() {
             _this.setState({
               sortDataSource: _this.state.sortDataSource.filter(function (item) {
-                return item.label !== record.label;
+                return item.title !== record.title;
               }),
               isDefaultValue: false,
               dataSource: _toConsumableArray(_this.state.dataSource.map(function (item) {
-                if (item.label === record.label) {
+                if (item.title === record.title) {
                   return _objectSpread2(_objectSpread2({}, item), {}, {
                     hidden: true
                   });
@@ -17117,7 +16553,7 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
       dataIndex: 'sort',
       className: 'drag-visible',
       render: function render() {
-        return /*#__PURE__*/React.createElement(DragHandle$3, null);
+        return /*#__PURE__*/React.createElement(DragHandle$2, null);
       }
     }];
     _this.showModal = function () {
@@ -17132,10 +16568,14 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
         isDefaultValue = _this$state2.isDefaultValue,
         defaultValue = _this$state2.defaultValue;
       if (!sortDataSource.length) {
-        message.warning('至少选择一个搜索项!');
+        message.warning('至少选择一列!');
         return;
       }
-      _this.patchUserSearchFieldsConfig(sortDataSource);
+      // if (isDefaultValue) {
+      //   this.patchUserColumnConfig('');
+      //   return;
+      // }
+      _this.patchUserColumnConfig(sortDataSource);
     };
     _this.handleCancel = function (e) {
       console.log(e);
@@ -17172,13 +16612,19 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
           return !!el;
         });
         _this.setState({
-          sortDataSource: _toConsumableArray(newData),
+          sortDataSource: [].concat(_toConsumableArray(newData.filter(function (item) {
+            return item.fixed === 'left';
+          })), _toConsumableArray(newData.filter(function (item) {
+            return !item.fixed;
+          })), _toConsumableArray(newData.filter(function (item) {
+            return item.fixed === 'right';
+          }))),
           isDefaultValue: false
         });
       }
     };
     _this.DraggableContainer = function (props) {
-      return /*#__PURE__*/React.createElement(SortableBody$3, _objectSpread2({
+      return /*#__PURE__*/React.createElement(SortableBody$2, _objectSpread2({
         useDragHandle: true,
         disableAutoscroll: true,
         helperClass: "row-dragging",
@@ -17188,27 +16634,28 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     _this.DraggableBodyRow = function (_ref2) {
       var className = _ref2.className,
         style = _ref2.style,
-        restProps = _objectWithoutProperties(_ref2, _excluded$d);
+        restProps = _objectWithoutProperties(_ref2, _excluded$c);
       var sortDataSource = _this.state.sortDataSource;
+      // function findIndex base on Table rowKey props and should always be a right array index
       var index = sortDataSource.findIndex(function (x) {
-        return x.name === restProps['data-row-key'];
+        return x.key === restProps['data-row-key'];
       });
-      return /*#__PURE__*/React.createElement(SortableItem$3, _objectSpread2({
+      return /*#__PURE__*/React.createElement(SortableItem$2, _objectSpread2({
         index: index
       }, restProps));
     };
-    _this.onChange = function (e, label) {
+    _this.onChange = function (e, title) {
       var _this$state4 = _this.state,
         sortDataSource = _this$state4.sortDataSource,
         dataSource = _this$state4.dataSource;
       if (!e.target.checked) {
         _this.setState({
           sortDataSource: sortDataSource.filter(function (item) {
-            return item.label !== label;
+            return item.title !== title;
           }),
           isDefaultValue: false,
           dataSource: _toConsumableArray(dataSource.map(function (item) {
-            if (item.label === label) {
+            if (item.title === title) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 hidden: true
               });
@@ -17217,18 +16664,30 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
           }))
         });
       } else {
+        var _fixedLeft = [];
+        var _fixedRight = [];
+        var noFixedSortSource = [];
         var newSortData = [].concat(_toConsumableArray(sortDataSource), _toConsumableArray(dataSource.filter(function (item) {
-          return item.label === label;
+          return item.title === title;
         }).map(function (source) {
           return _objectSpread2(_objectSpread2({}, source), {}, {
             hidden: false
           });
         })));
+        newSortData.forEach(function (item) {
+          if ((item === null || item === void 0 ? void 0 : item.fixed) === 'left') {
+            _fixedLeft.push(item);
+          } else if ((item === null || item === void 0 ? void 0 : item.fixed) === 'right') {
+            _fixedRight.push(item);
+          } else {
+            noFixedSortSource.push(item);
+          }
+        });
         _this.setState({
-          sortDataSource: _toConsumableArray(newSortData),
+          sortDataSource: [].concat(_fixedLeft, noFixedSortSource, _fixedRight),
           isDefaultValue: false,
           dataSource: _toConsumableArray(dataSource.map(function (item) {
-            if (item.label === label) {
+            if (item.title === title) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 hidden: false
               });
@@ -17253,39 +16712,53 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     };
     return _this;
   }
-  _createClass(SearchItemTable, [{
+  _createClass(SortableTable, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this$props2 = this.props,
         datasource = _this$props2.datasource,
-        showSearchFields = _this$props2.showSearchFields,
+        showColumn = _this$props2.showColumn,
         bsTableCode = _this$props2.bsTableCode;
       var config = this.getConfigFromlocalstorage();
       this.setState({
         dataSource: datasource.map(function (item) {
+          var _innerItem$3;
           var innerItem = config.filter(function (inneritem) {
-            var innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-            var itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
+            var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
+            var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
             return innerKey && innerKey === itemKey;
           });
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            hidden: config.length && !innerItem.length
+            key: item.key || item.dataIndex,
+            width: ((_innerItem$3 = innerItem[0]) === null || _innerItem$3 === void 0 ? void 0 : _innerItem$3.width) || item.width,
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         defaultValue: datasource.map(function (item) {
+          var _innerItem$4;
           var innerItem = config.filter(function (inneritem) {
-            var innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-            var itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
+            var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
+            var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
             return innerKey && innerKey === itemKey;
           });
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            hidden: config.length && !innerItem.length
+            key: item.key || item.dataIndex,
+            width: ((_innerItem$4 = innerItem[0]) === null || _innerItem$4 === void 0 ? void 0 : _innerItem$4.width) || item.width,
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         sortDataSource: datasource.filter(function (item) {
           return !item.hidden;
         }).map(function (item) {
-          return _objectSpread2({}, item);
+          var _showColumn$filter$;
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            key: item.key || item.dataIndex,
+            width: ((_showColumn$filter$ = showColumn.filter(function (inneritem) {
+              var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
+              var itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : item.key || item.dataIndex;
+              return innerKey && innerKey === itemKey;
+            })[0]) === null || _showColumn$filter$ === void 0 ? void 0 : _showColumn$filter$.width) || item.width
+          });
         }),
         bsTableCode: bsTableCode
       });
@@ -17295,20 +16768,19 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
       var _this$state5 = this.state,
-        _this$state5$dataSour = _this$state5.dataSource,
-        dataSource = _this$state5$dataSour === void 0 ? [] : _this$state5$dataSour,
+        dataSource = _this$state5.dataSource,
         searchDataSource = _this$state5.searchDataSource,
         sortDataSource = _this$state5.sortDataSource,
         visible = _this$state5.visible,
         onSearchSort = _this$state5.onSearchSort;
-      var newSearchSource = dataSource.filter(function (item) {
-        var _item$label;
-        return (item === null || item === void 0 ? void 0 : (_item$label = item.label) === null || _item$label === void 0 ? void 0 : _item$label.indexOf(searchDataSource || '')) > -1;
+      var seatchDataSource = dataSource.filter(function (item) {
+        var _item$title;
+        return (item === null || item === void 0 ? void 0 : (_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.indexOf(searchDataSource || '')) > -1;
       });
       return /*#__PURE__*/React.createElement("div", {
         className: 'sort_table_wrapper'
       }, visible && /*#__PURE__*/React.createElement(Modal, {
-        title: "\u8BBE\u7F6E\u641C\u7D22\u9879\u5185\u5BB9",
+        title: "\u8BBE\u7F6E\u8868\u5934\u5185\u5BB9",
         wrapClassName: 'sort_table_wrapper',
         width: 820,
         visible: visible,
@@ -17356,36 +16828,71 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
                 hidden: !e.target.checked
               });
             })),
-            sortDataSource: e.target.checked ? _toConsumableArray(dataSource.map(function (item) {
+            sortDataSource: e.target.checked ? [].concat(_toConsumableArray(dataSource.filter(function (item) {
+              return item.fixed === 'left';
+            }).map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 hidden: false
               });
-            })) : []
+            })), _toConsumableArray(dataSource.filter(function (item) {
+              return !item.fixed;
+            }).map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                hidden: false
+              });
+            })), _toConsumableArray(dataSource.filter(function (item) {
+              return item.fixed === 'right';
+            }).map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                hidden: false
+              });
+            }))) : []
           });
         }
       }, "\u5168\u9009")), /*#__PURE__*/React.createElement("div", {
         className: 'sort_table_column_all'
-      }, searchDataSource ? newSearchSource.map(function (item) {
+      }, searchDataSource ? seatchDataSource.map(function (item) {
         return /*#__PURE__*/React.createElement(Checkbox, {
           checked: !item.hidden,
           onChange: function onChange(e) {
-            _this2.onChange(e, item.label);
+            _this2.onChange(e, item.title);
           }
-        }, item.label);
-      }) : dataSource.map(function (item) {
+        }, item.title);
+      }) : dataSource.filter(function (item) {
+        var _item$title2, _item$title3;
+        return (item === null || item === void 0 ? void 0 : (_item$title2 = item.title) === null || _item$title2 === void 0 ? void 0 : _item$title2.indexOf('人')) === -1 && (item === null || item === void 0 ? void 0 : (_item$title3 = item.title) === null || _item$title3 === void 0 ? void 0 : _item$title3.indexOf('日期')) === -1;
+      }).map(function (item) {
         return /*#__PURE__*/React.createElement(Checkbox, {
           checked: !item.hidden,
           onChange: function onChange(e) {
-            _this2.onChange(e, item.label);
+            _this2.onChange(e, item.title);
           }
-        }, item.label);
-      }), !!newSearchSource.length && /*#__PURE__*/React.createElement("span", {
+        }, item.title);
+      }), !!seatchDataSource.length && /*#__PURE__*/React.createElement("span", {
         style: {
           width: '144px'
         }
-      }), !newSearchSource.length && /*#__PURE__*/React.createElement("div", {
+      }), !seatchDataSource.length && /*#__PURE__*/React.createElement("div", {
         className: 'sort_table_column_all_empty'
-      }, "\u672A\u67E5\u8BE2\u5230\u7ED3\u679C")))), /*#__PURE__*/React.createElement("div", {
+      }, "\u672A\u67E5\u8BE2\u5230\u7ED3\u679C")), !searchDataSource && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+        className: 'sort_table_column_special'
+      }, /*#__PURE__*/React.createElement("span", null, "\u4EBA\u5458\u65F6\u95F4\u5B57\u6BB5")), /*#__PURE__*/React.createElement("div", {
+        className: 'sort_table_column_all'
+      }, _toConsumableArray(dataSource).filter(function (item) {
+        var _item$title4, _item$title5;
+        return (item === null || item === void 0 ? void 0 : (_item$title4 = item.title) === null || _item$title4 === void 0 ? void 0 : _item$title4.indexOf('人')) > -1 || (item === null || item === void 0 ? void 0 : (_item$title5 = item.title) === null || _item$title5 === void 0 ? void 0 : _item$title5.indexOf('日期')) > -1;
+      }).map(function (item) {
+        return /*#__PURE__*/React.createElement(Checkbox, {
+          checked: !item.hidden,
+          onChange: function onChange(e) {
+            _this2.onChange(e, item.title);
+          }
+        }, item.title);
+      }), /*#__PURE__*/React.createElement("span", {
+        style: {
+          width: '144px'
+        }
+      }))))), /*#__PURE__*/React.createElement("div", {
         className: 'sort_table_content_wrapper'
       }, /*#__PURE__*/React.createElement("span", {
         className: 'sort_table_content_count'
@@ -17409,34 +16916,34 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
         pagination: false,
         showHeader: false,
         dataSource: onSearchSort ? sortDataSource.filter(function (item) {
-          var _item$label2;
-          return (item === null || item === void 0 ? void 0 : (_item$label2 = item.label) === null || _item$label2 === void 0 ? void 0 : _item$label2.indexOf(onSearchSort)) > -1;
+          var _item$title6;
+          return (item === null || item === void 0 ? void 0 : (_item$title6 = item.title) === null || _item$title6 === void 0 ? void 0 : _item$title6.indexOf(onSearchSort)) > -1;
         }) : sortDataSource,
         columns: this.columns,
-        rowKey: "name",
+        rowKey: "key",
+        // rowSelection={rowSelection}
         components: {
           body: {
             wrapper: this.DraggableContainer,
             row: this.DraggableBodyRow
           }
         }
-      }))))), /*#__PURE__*/React.createElement("div", {
+      }))))), /*#__PURE__*/React.createElement("img", {
+        width: 32,
         onClick: this.showModal,
-        style: {
-          fontSize: 14
-        }
-      }, "\u641C\u7D22\u9879\u8BBE\u7F6E"));
+        src: shezhi
+      }));
     }
   }]);
-  return SearchItemTable;
+  return SortableTable;
 }(React.Component);
 
-var _excluded$e = ["onResize", "width"];
+var _excluded$d = ["onResize", "width"];
 var MemoQueryTable = /*#__PURE__*/React.memo(QueryTable);
 var ResizeableTitle$2 = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
-    restProps = _objectWithoutProperties(props, _excluded$e);
+    restProps = _objectWithoutProperties(props, _excluded$d);
   if (!width) {
     return /*#__PURE__*/React.createElement("th", _objectSpread2({}, restProps));
   }
@@ -17481,28 +16988,26 @@ var BsSulaQueryTable = (function (props) {
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
     showColumn = _useState12[0],
-    setShowColumns = _useState12[1]; // 列字段
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    showSearchFields = _useState14[0],
-    setShowSearchFields = _useState14[1]; //搜索项字段
+    setShowColumns = _useState12[1];
   var _props$isPage = props.isPage,
     pagination = props.pagination,
     tableCode = props.tableCode;
-  var _useState15 = useState('100vh'),
-    _useState16 = _slicedToArray(_useState15, 2),
-    height = _useState16[0],
-    setHeight = _useState16[1];
+  var _useState13 = useState('100vh'),
+    _useState14 = _slicedToArray(_useState13, 2),
+    height = _useState14[0],
+    setHeight = _useState14[1];
   var sortTableRef = useRef(null);
   var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
   // 获取table高度
   var getTableHeight = function getTableHeight() {
-    var _document$querySelect, _document$querySelect2, _document$querySelect3;
-    var cancelHeight = window.top == window ? 303 : 223;
-    var isFullScreen = document.fullScreen || document.webkitIsFullScreen || document.mozFullScreen;
-    var h = document.body.clientHeight - (((_document$querySelect = document.querySelector('.table-bssula-summary')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0) - (((_document$querySelect2 = document.querySelector('.ant-form ant-form-horizontal')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 0) - (isFullScreen ? 0 : ((_document$querySelect3 = document.querySelector('.ant-pro-page-container-warp')) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.clientHeight) || 0) - cancelHeight + 'px';
-    setHeight(h);
-    setValue(_objectSpread2({}, value));
+    setTimeout(function () {
+      var _document$querySelect, _document$querySelect2, _document$querySelect3, _document$querySelect4;
+      var cancelHeight = window.top == window ? 303 : 223;
+      var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
+      var h = document.body.clientHeight - (((_document$querySelect = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0) - (((_document$querySelect2 = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav")) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 0) - (((_document$querySelect3 = document.querySelector(".ant-tabs-tabpane-active .ant-form ant-form-horizontal")) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.clientHeight) || 0) - (isFullScreen ? 0 : ((_document$querySelect4 = document.querySelector(".ant-tabs-tabpane-active .ant-pro-page-container-warp")) === null || _document$querySelect4 === void 0 ? void 0 : _document$querySelect4.clientHeight) || 0) - cancelHeight + 'px';
+      setHeight(h);
+      setValue(_objectSpread2({}, value));
+    }, 0);
   };
   //监测是否按下esc键
   function checkFull() {
@@ -17512,8 +17017,8 @@ var BsSulaQueryTable = (function (props) {
     if (isFull == undefined) isFull = false;
     return isFull;
   }
-  var getConfigFromlocalstorage = function getConfigFromlocalstorage(type) {
-    var config = localStorage.getItem(type) || '[]';
+  var getConfigFromlocalstorage = function getConfigFromlocalstorage() {
+    var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     var configArray = JSON.parse(config);
     var configSetting = configArray.filter(function (item) {
       return item.code === bsTableCode;
@@ -17569,7 +17074,7 @@ var BsSulaQueryTable = (function (props) {
       columns: _toConsumableArray(props.columns)
     }));
     var columns = props.columns;
-    var columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
+    var columnConfig = getConfigFromlocalstorage();
     var showColumns = columnConfig.length ? columnConfig.map(function (item) {
       var inner = columns.filter(function (inneritem) {
         var innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : inneritem.key || inneritem.dataIndex;
@@ -17593,26 +17098,10 @@ var BsSulaQueryTable = (function (props) {
     });
     setShowColumns(_toConsumableArray(showColumns));
   };
-  var setInitialSearchFieldsInfo = function setInitialSearchFieldsInfo() {
-    //获取搜索字段的缓存配置
-    var _props$fields = props.fields,
-      fields = _props$fields === void 0 ? [] : _props$fields;
-    var searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
-    var showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map(function (item) {
-      var inner = fields.filter(function (inneritem) {
-        var innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
-        var itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
-        return innerKey && innerKey === itemKey;
-      })[0];
-      return _objectSpread2(_objectSpread2({}, inner), item);
-    }) : fields;
-    setShowSearchFields(_toConsumableArray(showSearchFields));
-  };
   //组件初始挂载
   useEffect(function () {
     getTableHeight();
     setInitialTableInfo();
-    setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
       watchWinResize();
     });
@@ -17629,17 +17118,6 @@ var BsSulaQueryTable = (function (props) {
       JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialTableInfo();
     }
   }, [props === null || props === void 0 ? void 0 : props.columns]);
-  useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.fields) && (value === null || value === void 0 ? void 0 : value.fields)) {
-      var newKeys = props.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      var oldKeys = value.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialSearchFieldsInfo();
-    }
-  }, [props === null || props === void 0 ? void 0 : props.fields]);
   useEffect(function () {
     setInitialTableInfo();
   }, [props === null || props === void 0 ? void 0 : props.refreshColumns]);
@@ -17714,34 +17192,25 @@ var BsSulaQueryTable = (function (props) {
     return tableProps;
   };
   var ShowFullScreen = function ShowFullScreen() {
-    var itemPath = props.itemPath;
-    if (window.top != window) {
-      window.parent.postMessage({
-        type: 'screenChange',
-        id: itemPath
-      }, '*');
-      setIsFnllScreen(!isFullScreen);
-    } else {
-      var _isFullScreen = document.fullScreen || document.webkitIsFullScreen || document.mozFullScreen;
-      var contentEle = document.querySelector("body");
-      // addTabsNavStyle(isFullScreen);
-      if (contentEle && !_isFullScreen) {
-        var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
-        if (fullScreenEle) {
-          fullScreenEle.call(contentEle);
-          setIsFnllScreen(true);
-          // getTableHeight(true);
-          return;
-        }
+    var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
+    var contentEle = window.top.document.querySelector("body");
+    // addTabsNavStyle(isFullScreen);
+    if (contentEle && !isFullScreen) {
+      var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
+      if (fullScreenEle) {
+        fullScreenEle.call(contentEle);
+        setIsFnllScreen(true);
+        // getTableHeight(true);
+        return;
       }
-      if (document && _isFullScreen) {
-        var exitFullScreen = document.exitFullscreen || document.mozCancelFullScreen || document.webkitCancelFullScreen || document.msExitFullscreen;
-        if (exitFullScreen) {
-          exitFullScreen.call(document);
-          setIsFnllScreen(false);
-          // getTableHeight();
-          return;
-        }
+    }
+    if (window.top.document && isFullScreen) {
+      var exitFullScreen = window.top.document.exitFullscreen || window.top.document.mozCancelFullScreen || window.top.document.webkitCancelFullScreen || window.top.document.msExitFullscreen;
+      if (exitFullScreen) {
+        exitFullScreen.call(window.top.document);
+        setIsFnllScreen(false);
+        // getTableHeight();
+        return;
       }
     }
   };
@@ -17751,28 +17220,16 @@ var BsSulaQueryTable = (function (props) {
     actionsRender = [].concat(_toConsumableArray(actionsRender), [{
       type: 'text',
       props: {
-        children: /*#__PURE__*/React.createElement("span", {
-          className: "ant-dropdown-link"
-        }, /*#__PURE__*/React.createElement(Dropdown, {
-          overlay: /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(Menu.Item, null, /*#__PURE__*/React.createElement(SortableTable$1, {
-            ref: sortTableRef,
-            setShowColumns: setShowColumns,
-            showColumn: showColumn,
-            datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
-            bsTableCode: bsTableCode
-          })), /*#__PURE__*/React.createElement(Menu.Item, null, /*#__PURE__*/React.createElement(SearchItemTable, {
-            ref: sortTableRef,
-            setShowSearchFields: setShowSearchFields,
-            showSearchFields: showSearchFields,
-            datasource: (value === null || value === void 0 ? void 0 : value.fields) || [],
-            bsTableCode: bsTableCode
-          }))),
-          placement: "bottom"
+        children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
+          title: "\u5217\u8BBE\u7F6E"
         }, /*#__PURE__*/React.createElement("span", {
           className: "ant-dropdown-link"
-        }, /*#__PURE__*/React.createElement("img", {
-          width: 32,
-          src: shezhi
+        }, /*#__PURE__*/React.createElement(SortableTable$1, {
+          ref: sortTableRef,
+          setShowColumns: setShowColumns,
+          showColumn: showColumn,
+          datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
+          bsTableCode: bsTableCode
         }))))
       }
     }, {
@@ -17856,7 +17313,6 @@ var BsSulaQueryTable = (function (props) {
   }, handleTimeValue()), {}, {
     tableProps: setTableProps(),
     columns: _toConsumableArray(showColumn),
-    fields: _toConsumableArray(showSearchFields),
     ref: props.forwardedRef || refs,
     isFullScreen: isFullScreen
   });
@@ -17879,7 +17335,7 @@ var BsSulaQueryTable = (function (props) {
       summary: props.summary,
       statusMapping: props.statusMapping
     });
-  }, [value, checkedList, showColumn, props.statusMapping, showSearchFields]);
+  }, [value, checkedList, showColumn, props.statusMapping]);
   return /*#__PURE__*/React.createElement(MemoQueryTable, _objectSpread2({}, memoConfig));
 });
 
@@ -18027,14 +17483,13 @@ function handleUserPhone() {
   return enStr;
 }
 var setLoginOutPath = function setLoginOutPath() {
-  if (window.top == window) {
+  if (window.__POWERED_BY_WUJIE__) {
+    var _window$$wujie;
+    (_window$$wujie = window.$wujie) === null || _window$$wujie === void 0 ? void 0 : _window$$wujie.props.goToLogin();
+  } else {
     history.push({
       pathname: '/user/login'
     });
-  } else {
-    window.parent.postMessage({
-      type: 'go2Login'
-    }, '*');
   }
 };
 var getBreadcrumbNameMap = function getBreadcrumbNameMap(menuData) {
@@ -19952,7 +19407,7 @@ var CustomerMenuHeader = function CustomerMenuHeader(_ref) {
 var css_248z$m = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
 styleInject(css_248z$m);
 
-var _excluded$f = ["route"];
+var _excluded$e = ["route"];
 var TabPane = Tabs.TabPane;
 var UN_LISTTEN_DRP;
 var routerArray = [];
@@ -20566,7 +20021,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(BasicLayout, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this2 = this,
+      var _window$$wujie,
+        _this2 = this,
         _localStorage$getItem;
       var _this$props = this.props,
         history = _this$props.history,
@@ -20575,27 +20031,42 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         pathToRegexp = _this$props.pathToRegexp;
       var istParent = 0;
       var self = this;
-      window.top != window && window.addEventListener('message', function (e) {
-        istParent = 1;
-        if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
-          localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
-        } else {
-          localStorage.setItem('isTabChange', true);
-        }
-        if (typeof e.data === 'string') {
-          var newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
-          history.push(newKey);
-        } else {
-          var info = e.data;
+      // window.top != window &&
+      //   window.addEventListener('message', function (e) {
+      //     istParent = 1;
+      //     if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
+      //       localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
+      //     } else {
+      //       localStorage.setItem('isTabChange', true);
+      //     }
+      //     if (typeof e.data === 'string') {
+      //       let newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
+      //       history.push(newKey);
+      //     } else {
+      //       const info = e.data;
+      //       if (info.type === 'remove') {
+      //         self.tabActions['remove'](info.key.replace(/^\/\w+\//, '/'));
+      //       }
+      //     }
+      //   });
+      (_window$$wujie = window.$wujie) === null || _window$$wujie === void 0 ? void 0 : _window$$wujie.bus.$on("main-route-change", function (appname, info) {
+        console.log('$on main route change ----------------------------', appname, info);
+        if (appname === itemPath) {
+          istParent = 1;
+          if (info.type === 'main') {
+            var newPath = encodeUrlQuery(info.path);
+            history.push(newPath);
+          }
           if (info.type === 'remove') {
-            self.tabActions['remove'](info.key.replace(/^\/\w+\//, '/'));
+            self.tabActions['remove'](info.path);
           }
         }
       });
       UN_LISTTEN_DRP = history.listen(function (route) {
-        if (window.__POWERED_BY_QIANKUN__) {
-          if (window.location.href.indexOf("/".concat(itemPath)) === -1) return;
-        }
+        // if ((window as any).__POWERED_BY_QIANKUN__) {
+        //   if (window.location.href.indexOf(`/${itemPath}`) === -1) return;
+        // }
+        if (route.pathname.startsWith("/".concat(itemPath, "/"))) return;
         var _this2$state = _this2.state,
           listenRouterState = _this2$state.listenRouterState,
           listenRouterKey = _this2$state.listenRouterKey,
@@ -20614,8 +20085,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           currentKey = decodeURIComponent(route.pathname + _this2.parseQueryString(route.search));
         }
         if (!istParent) {
+          var _window$$wujie2;
           if (route.pathname === '/') return;
-          window.parent.postMessage("/parent/".concat(itemPath).concat(currentKey), '*');
+          (_window$$wujie2 = window.$wujie) === null || _window$$wujie2 === void 0 ? void 0 : _window$$wujie2.bus.$emit('sub-route-change', itemPath, currentKey);
+          // window.parent.postMessage(`/parent/${itemPath}${currentKey}`, '*');
         }
         // 防止出错
         if (listenRouterKey.length !== listenRouterState.length) {
@@ -20657,28 +20130,24 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         lastTwoRouterArray.shift();
         if (!localStorage.getItem('isTabChange') && !localStorage.getItem('isMenuClick')) {
           if (lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string') {
+            var _route$state;
             var needRemoveKeyArray = hideMenuArray.filter(function (itemRoute) {
               return pathToRegexp(itemRoute.path || '').test(lastTwoRouterArray[0]);
             });
             // lastTwoRouterArray[0] != lastTwoRouterArray[1] 该判断条件用于判断是否是tab删除操作，如果是tab页删除操作，删除的是不是最后一个打开的tab页，执行history.push会导致错误的将最后打开的那个tab页也删除掉
-            if (needRemoveKeyArray.length && lastTwoRouterArray[0] != lastTwoRouterArray[1]) {
-              if ((!(lastTwoRouterArray[0].indexOf('/order/mainOrder/supplement') >= 0) || !pathToRegexp('/order/mainOrder/:parmode/separateOrder/:id').test(lastTwoRouterArray[1])) && (!pathToRegexp('/order/mainOrder/:parmode/separateOrder/:id').test(lastTwoRouterArray[0]) || !(lastTwoRouterArray[1].indexOf('order/mainOrder/separateOrder/') >= 0))) {
-                var _route$state;
-                if (!((_route$state = route.state) === null || _route$state === void 0 ? void 0 : _route$state.thisHideInMenuDoNotClose)) {
-                  newListenRouterState = newListenRouterState.filter(function (item) {
-                    var _ref3 = item.key ? item.key.split('?') : [],
-                      _ref4 = _slicedToArray(_ref3, 1),
-                      pathname = _ref4[0];
-                    return pathname && pathname !== lastTwoRouterArray[0];
-                  });
-                  newListenRouterKey = newListenRouterKey.filter(function (item) {
-                    var _ref5 = item ? item.split('?') : [],
-                      _ref6 = _slicedToArray(_ref5, 1),
-                      pathname = _ref6[0];
-                    return pathname && pathname !== lastTwoRouterArray[0];
-                  });
-                }
-              }
+            if (needRemoveKeyArray.length && lastTwoRouterArray[0] != lastTwoRouterArray[1] && !((_route$state = route.state) === null || _route$state === void 0 ? void 0 : _route$state.thisHideInMenuDoNotClose)) {
+              newListenRouterState = newListenRouterState.filter(function (item) {
+                var _ref3 = item.key ? item.key.split('?') : [],
+                  _ref4 = _slicedToArray(_ref3, 1),
+                  pathname = _ref4[0];
+                return pathname && pathname !== lastTwoRouterArray[0];
+              });
+              newListenRouterKey = newListenRouterKey.filter(function (item) {
+                var _ref5 = item ? item.split('?') : [],
+                  _ref6 = _slicedToArray(_ref5, 1),
+                  pathname = _ref6[0];
+                return pathname && pathname !== lastTwoRouterArray[0];
+              });
             }
           }
           // refs?.tableRef?.current?.refreshTable();
@@ -20750,7 +20219,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       }); // 添加数据大屏
       var _this$props3 = this.props,
         route = _this$props3.route,
-        restPrpos = _objectWithoutProperties(_this$props3, _excluded$f);
+        restPrpos = _objectWithoutProperties(_this$props3, _excluded$e);
       var exist = route.routes.find(function (route) {
         return route.path === '/homePage/data-show';
       });
@@ -21155,6 +20624,7 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
         getDictionaryTextByValue = _this$props4.getDictionaryTextByValue,
         timeFormat = _this$props4.timeFormat,
         transparentProps = _this$props4.transparentProps;
+      console.log('child wrapper conpent', this.props);
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
         getDictionarySource: getDictionarySource,
         getDictionaryTextByValue: getDictionaryTextByValue,
@@ -21546,10 +21016,10 @@ var index$6 = /*#__PURE__*/forwardRef(function (props, ref) {
   }))))));
 });
 
-var _excluded$g = ["children"];
+var _excluded$f = ["children"];
 var Drawer = (function (props) {
   var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded$g);
+    restProps = _objectWithoutProperties(props, _excluded$f);
   return /*#__PURE__*/React.createElement(Drawer$1, _objectSpread2({
     mask: true,
     closable: false,
@@ -29482,9 +28952,7 @@ var FieldsSettingsTable = (function (props) {
     _props$codeProps = props.codeProps,
     codeProps = _props$codeProps === void 0 ? '' : _props$codeProps,
     moduleType = props.moduleType,
-    moduleRelationId = props.moduleRelationId,
-    _props$tableFlag = props.tableFlag,
-    tableFlag = _props$tableFlag === void 0 ? false : _props$tableFlag;
+    moduleRelationId = props.moduleRelationId;
   var ref = useRef(null);
   var _useState = useState({
       visible: false,
@@ -29573,9 +29041,6 @@ var FieldsSettingsTable = (function (props) {
       render: function render(_ref2) {
         var text = _ref2.text,
           record = _ref2.record;
-        if (tableFlag) {
-          return /*#__PURE__*/React.createElement("div", null, " \u5217\u8868\uFF1A", "{\"key\": \"extensionFields,".concat(record.code, "\",\"dataIndex\": \"extensionFields,").concat(record.code, "\",\"title\": \"").concat(record.name, "\"},"));
-        }
         if (!codeProps.columns) {
           return /*#__PURE__*/React.createElement("div", null, "\u8868\u5355\uFF1A", "{\"name\": \"extensionFields,".concat(record.code, "\",\"label\": \"").concat(record.name, "\"},"));
         }
@@ -29811,10 +29276,7 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     codeProps = props.codeProps,
     customerFields = props.customerFields,
     initialSetting = props.initialSetting,
-    pageType = props.pageType,
-    _props$detailTablesSe = props.detailTablesSetting,
-    detailTablesSetting = _props$detailTablesSe === void 0 ? [] : _props$detailTablesSe,
-    saveTableCallBack = props.saveTableCallBack;
+    pageType = props.pageType;
   var codeFilter = {};
   if (codeProps.columns) {
     // table
@@ -29838,6 +29300,7 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       fields: codeProps.fields
     }).fields;
   }
+  console.log('codeFilter', codeFilter);
   var styleRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -29859,18 +29322,6 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     _useState10 = _slicedToArray(_useState9, 2),
     moduleParams = _useState10[0],
     setModuleParams = _useState10[1];
-  var _useState11 = useState('main'),
-    _useState12 = _slicedToArray(_useState11, 2),
-    activeKey = _useState12[0],
-    setActiveKey = _useState12[1]; //默认详情页配置
-  var _useState13 = useState({}),
-    _useState14 = _slicedToArray(_useState13, 2),
-    tablesConfigParams = _useState14[0],
-    setTablesConfigParams = _useState14[1];
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    tableJsonEditorValsArr = _useState16[0],
-    setTableJsonEditorValsArr = _useState16[1];
   useEffect(function () {
     Promise.all([axios.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
@@ -29894,56 +29345,6 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       }
     });
   }, []);
-  useEffect(function () {
-    //明细表的配置数据
-    var axiosArr = detailTablesSetting.map(function (item) {
-      return axios.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(item.tableCode));
-    });
-    Promise.all(axiosArr).then(function (_ref5) {
-      var _ref6 = _toArray(_ref5),
-        resArr = _ref6.slice(0);
-      detailTablesSetting.map(function (item, index) {
-        var _resArr$index;
-        var _ref7 = ((_resArr$index = resArr[index]) === null || _resArr$index === void 0 ? void 0 : _resArr$index.data) || {},
-          code = _ref7.code,
-          data = _ref7.data;
-        if (data) {
-          var businessType = data.businessType,
-            fieldGroup = data.code,
-            moduleType = data.moduleType;
-          setTablesConfigParams(_objectSpread2(_objectSpread2({}, tablesConfigParams), {}, _defineProperty({}, item.tableCode, {
-            businessType: businessType,
-            fieldGroup: fieldGroup,
-            moduleType: moduleType,
-            tableFlag: true
-          })));
-        }
-      });
-    });
-    var detailTableCodeFilter = detailTablesSetting.map(function (item) {
-      if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          columns: item === null || item === void 0 ? void 0 : item.initialSetting
-        });
-      }
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        columns: item === null || item === void 0 ? void 0 : item.columns.map(function (childItem) {
-          return {
-            key: childItem.key || childItem.dataIndex,
-            dataIndex: childItem.dataIndex || childItem.key,
-            isStaticCode: true,
-            title: childItem.title
-          };
-        })
-      });
-    });
-    setTableJsonEditorValsArr(_toConsumableArray(detailTableCodeFilter));
-    detailTableCodeFilter.map(function (item) {
-      if ((item === null || item === void 0 ? void 0 : item.initialSetting) && (item === null || item === void 0 ? void 0 : item.initialSetting.length)) {
-        onClickRunDetailTables(item.initialSetting, false, item.tableCode, detailTableCodeFilter);
-      }
-    });
-  }, [detailTablesSetting.length]);
   var onClickRun = function onClickRun(value, isSave) {
     setJsonEditorVal(value);
     try {
@@ -29953,40 +29354,6 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       message.error(e);
     }
   };
-  //明细表保存
-  var onClickRunDetailTables = function onClickRunDetailTables(value, isSave, tableCode, tableSouce) {
-    var targetCode = tableCode || activeKey;
-    var targetTableSource = tableSouce || tableJsonEditorValsArr;
-    var newArr = targetTableSource.map(function (item) {
-      if (item.tableCode == targetCode) {
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          columns: value
-        });
-      }
-      return item;
-    });
-    setTableJsonEditorValsArr(_toConsumableArray(newArr));
-    try {
-      var target = targetTableSource.find(function (item) {
-        return item.tableCode == targetCode;
-      });
-      var _codeProps = {
-        fields: [],
-        columns: target === null || target === void 0 ? void 0 : target.columns
-      };
-      var newValue = {
-        fields: [],
-        columns: value
-      };
-      var result = hanleCallbackValue(_codeProps, newValue, target === null || target === void 0 ? void 0 : target.customerFields);
-      saveTableCallBack({
-        columns: result.columns,
-        tableCode: targetCode
-      }, isSave, value);
-    } catch (e) {
-      message.error(e);
-    }
-  };
   React.useEffect(function () {
     localStorage.setItem('jsonEditorVal', JSON.stringify(jsonEditorVal || {}));
   }, [jsonEditorVal]);
@@ -30008,26 +29375,9 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       return setVisible(false);
     },
     className: 'customFieldsDrawer'
-  }, detailTablesSetting.length == 0 && /*#__PURE__*/React.createElement(Fragment, null, isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      padding: "10px 0",
-      fontSize: "16px",
-      fontWeight: "bolder"
-    }
-  }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React.createElement(FieldsSettingsTable, _objectSpread2({}, tableParams)), /*#__PURE__*/React.createElement(Editor, {
-    type: "table",
-    onRun: onClickRun,
-    value: jsonEditorVal,
-    shallowHeight: height
-  })), detailTablesSetting.length > 0 && /*#__PURE__*/React.createElement(Tabs, {
-    defaultActiveKey: activeKey,
-    onChange: function onChange(v) {
-      return setActiveKey(v);
-    }
-  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
-    tab: "\u8BE6\u60C5\u9875\u914D\u7F6E",
-    key: "main"
-  }, isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: styleRef
+  }), isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
     style: {
       padding: "10px 0",
       fontSize: "16px",
@@ -30038,23 +29388,7 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     onRun: onClickRun,
     value: jsonEditorVal,
     shallowHeight: height
-  })), tableJsonEditorValsArr.map(function (k) {
-    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: k.title,
-      key: k.tableCode
-    }, !tablesConfigParams[k.tableCode] ? /*#__PURE__*/React.createElement("div", {
-      style: {
-        padding: "10px 0",
-        fontSize: "16px",
-        fontWeight: "bolder"
-      }
-    }, "\u63D0\u793A\uFF1A\u4E1A\u52A1\u5BF9\u8C61\u672A\u7EF4\u62A4\uFF0C\u8BF7\u5728\u901A\u7528\u5355\u636E\u5BF9\u5E94\u4E1A\u52A1\u7C7B\u578B\u4E0B\u7EF4\u62A4\u4E1A\u52A1\u5BF9\u8C61") : /*#__PURE__*/React.createElement(FieldsSettingsTable, _objectSpread2({}, tablesConfigParams[k.tableCode])), /*#__PURE__*/React.createElement(Editor, {
-      type: "table",
-      onRun: onClickRunDetailTables,
-      value: k.columns,
-      shallowHeight: height
-    }));
-  }))), !visible && isAdmin() && /*#__PURE__*/React.createElement(ConfigButton, {
+  })), !visible && isAdmin() && /*#__PURE__*/React.createElement(ConfigButton, {
     type: 'primary',
     onClick: function onClick() {
       return setVisible(true);