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

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 } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, Component, useLayoutEffect, createRef, Fragment } 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';
@@ -17052,8 +17052,10 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     };
     _this.setInitValue = function () {
       var _this$props = _this.props,
-        datasource = _this$props.datasource,
-        showSearchFields = _this$props.showSearchFields;
+        _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,
@@ -17593,7 +17595,8 @@ var BsSulaQueryTable = (function (props) {
   };
   var setInitialSearchFieldsInfo = function setInitialSearchFieldsInfo() {
     //获取搜索字段的缓存配置
-    var fields = props.fields;
+    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) {
@@ -29479,7 +29482,9 @@ var FieldsSettingsTable = (function (props) {
     _props$codeProps = props.codeProps,
     codeProps = _props$codeProps === void 0 ? '' : _props$codeProps,
     moduleType = props.moduleType,
-    moduleRelationId = props.moduleRelationId;
+    moduleRelationId = props.moduleRelationId,
+    _props$tableFlag = props.tableFlag,
+    tableFlag = _props$tableFlag === void 0 ? false : _props$tableFlag;
   var ref = useRef(null);
   var _useState = useState({
       visible: false,
@@ -29568,6 +29573,9 @@ 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, "\"},"));
         }
@@ -29803,7 +29811,10 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     codeProps = props.codeProps,
     customerFields = props.customerFields,
     initialSetting = props.initialSetting,
-    pageType = props.pageType;
+    pageType = props.pageType,
+    _props$detailTablesSe = props.detailTablesSetting,
+    detailTablesSetting = _props$detailTablesSe === void 0 ? [] : _props$detailTablesSe,
+    saveTableCallBack = props.saveTableCallBack;
   var codeFilter = {};
   if (codeProps.columns) {
     // table
@@ -29827,7 +29838,6 @@ 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),
@@ -29849,6 +29859,18 @@ 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),
@@ -29872,6 +29894,56 @@ 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 {
@@ -29881,6 +29953,40 @@ 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]);
@@ -29902,9 +30008,7 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
       return setVisible(false);
     },
     className: 'customFieldsDrawer'
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: styleRef
-  }), isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
+  }, detailTablesSetting.length == 0 && /*#__PURE__*/React.createElement(Fragment, null, isEmpty(moduleParams) ? /*#__PURE__*/React.createElement("div", {
     style: {
       padding: "10px 0",
       fontSize: "16px",
@@ -29915,7 +30019,42 @@ var JsonQueryTable = /*#__PURE__*/React.memo(function (props) {
     onRun: onClickRun,
     value: jsonEditorVal,
     shallowHeight: height
-  })), !visible && isAdmin() && /*#__PURE__*/React.createElement(ConfigButton, {
+  })), 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", {
+    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
+  })), 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, {
     type: 'primary',
     onClick: function onClick() {
       return setVisible(true);

package/dist/index.js

@@ -17070,8 +17070,10 @@ var SearchItemTable = /*#__PURE__*/function (_React$Component) {
     };
     _this.setInitValue = function () {
       var _this$props = _this.props,
-        datasource = _this$props.datasource,
-        showSearchFields = _this$props.showSearchFields;
+        _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,
@@ -17611,7 +17613,8 @@ var BsSulaQueryTable = (function (props) {
   };
   var setInitialSearchFieldsInfo = function setInitialSearchFieldsInfo() {
     //获取搜索字段的缓存配置
-    var fields = props.fields;
+    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) {
@@ -29497,7 +29500,9 @@ var FieldsSettingsTable = (function (props) {
     _props$codeProps = props.codeProps,
     codeProps = _props$codeProps === void 0 ? '' : _props$codeProps,
     moduleType = props.moduleType,
-    moduleRelationId = props.moduleRelationId;
+    moduleRelationId = props.moduleRelationId,
+    _props$tableFlag = props.tableFlag,
+    tableFlag = _props$tableFlag === void 0 ? false : _props$tableFlag;
   var ref = React.useRef(null);
   var _useState = React.useState({
       visible: false,
@@ -29586,6 +29591,9 @@ var FieldsSettingsTable = (function (props) {
       render: function render(_ref2) {
         var text = _ref2.text,
           record = _ref2.record;
+        if (tableFlag) {
+          return /*#__PURE__*/React__default['default'].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__default['default'].createElement("div", null, "\u8868\u5355\uFF1A", "{\"name\": \"extensionFields,".concat(record.code, "\",\"label\": \"").concat(record.name, "\"},"));
         }
@@ -29821,7 +29829,10 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     codeProps = props.codeProps,
     customerFields = props.customerFields,
     initialSetting = props.initialSetting,
-    pageType = props.pageType;
+    pageType = props.pageType,
+    _props$detailTablesSe = props.detailTablesSetting,
+    detailTablesSetting = _props$detailTablesSe === void 0 ? [] : _props$detailTablesSe,
+    saveTableCallBack = props.saveTableCallBack;
   var codeFilter = {};
   if (codeProps.columns) {
     // table
@@ -29845,7 +29856,6 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       fields: codeProps.fields
     }).fields;
   }
-  console.log('codeFilter', codeFilter);
   var styleRef = React.useRef(null);
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -29867,6 +29877,18 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     _useState10 = _slicedToArray(_useState9, 2),
     moduleParams = _useState10[0],
     setModuleParams = _useState10[1];
+  var _useState11 = React.useState('main'),
+    _useState12 = _slicedToArray(_useState11, 2),
+    activeKey = _useState12[0],
+    setActiveKey = _useState12[1]; //默认详情页配置
+  var _useState13 = React.useState({}),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tablesConfigParams = _useState14[0],
+    setTablesConfigParams = _useState14[1];
+  var _useState15 = React.useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    tableJsonEditorValsArr = _useState16[0],
+    setTableJsonEditorValsArr = _useState16[1];
   React.useEffect(function () {
     Promise.all([axios__default['default'].get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
@@ -29890,6 +29912,56 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       }
     });
   }, []);
+  React.useEffect(function () {
+    //明细表的配置数据
+    var axiosArr = detailTablesSetting.map(function (item) {
+      return axios__default['default'].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 {
@@ -29899,6 +29971,40 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       antd.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) {
+      antd.message.error(e);
+    }
+  };
   React__default['default'].useEffect(function () {
     localStorage.setItem('jsonEditorVal', JSON.stringify(jsonEditorVal || {}));
   }, [jsonEditorVal]);
@@ -29920,9 +30026,7 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
       return setVisible(false);
     },
     className: 'customFieldsDrawer'
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
-    ref: styleRef
-  }), _.isEmpty(moduleParams) ? /*#__PURE__*/React__default['default'].createElement("div", {
+  }, detailTablesSetting.length == 0 && /*#__PURE__*/React__default['default'].createElement(React.Fragment, null, _.isEmpty(moduleParams) ? /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       padding: "10px 0",
       fontSize: "16px",
@@ -29933,7 +30037,42 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     onRun: onClickRun,
     value: jsonEditorVal,
     shallowHeight: height
-  })), !visible && isAdmin() && /*#__PURE__*/React__default['default'].createElement(ConfigButton, {
+  })), detailTablesSetting.length > 0 && /*#__PURE__*/React__default['default'].createElement(antd.Tabs, {
+    defaultActiveKey: activeKey,
+    onChange: function onChange(v) {
+      return setActiveKey(v);
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Tabs.TabPane, {
+    tab: "\u8BE6\u60C5\u9875\u914D\u7F6E",
+    key: "main"
+  }, _.isEmpty(moduleParams) ? /*#__PURE__*/React__default['default'].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__default['default'].createElement(FieldsSettingsTable, _objectSpread2({}, tableParams)), /*#__PURE__*/React__default['default'].createElement(Editor, {
+    type: "table",
+    onRun: onClickRun,
+    value: jsonEditorVal,
+    shallowHeight: height
+  })), tableJsonEditorValsArr.map(function (k) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Tabs.TabPane, {
+      tab: k.title,
+      key: k.tableCode
+    }, !tablesConfigParams[k.tableCode] ? /*#__PURE__*/React__default['default'].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__default['default'].createElement(FieldsSettingsTable, _objectSpread2({}, tablesConfigParams[k.tableCode])), /*#__PURE__*/React__default['default'].createElement(Editor, {
+      type: "table",
+      onRun: onClickRunDetailTables,
+      value: k.columns,
+      shallowHeight: height
+    }));
+  }))), !visible && isAdmin() && /*#__PURE__*/React__default['default'].createElement(ConfigButton, {
     type: 'primary',
     onClick: function onClick() {
       return setVisible(true);

package/package.json

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

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

@@ -101,7 +101,7 @@ class SearchItemTable extends React.Component {
   };
 
   setInitValue = (isClick = false) => {
-    const { datasource, showSearchFields }: any =
+    const { datasource = [], showSearchFields =[] }: any =
       this.props;
     let config = this.getConfigFromlocalstorage();
     this.setState({

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

@@ -195,7 +195,7 @@ export default (props: any) => {
 
   const setInitialSearchFieldsInfo = () =>{
     //获取搜索字段的缓存配置
-    const { fields } = props;
+    const { fields = [] } = props;
     let searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
     let showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map((item) => {
       let inner = fields.filter(

package/src/components/Business/JsonQueryTable/components/FieldsSettingsTable.tsx

@@ -12,6 +12,7 @@ export default (props:any)=>{
     codeProps='', 
     moduleType, 
     moduleRelationId, 
+    tableFlag = false
   } = props;
   
   const ref = useRef(null);
@@ -108,6 +109,9 @@ export default (props:any)=>{
         key: 'code',
         title: '代码片段',
         render: ({text,record}:any) => {
+          if(tableFlag){
+            return <div> 列表：{`{"key": "extensionFields,${record.code}","dataIndex": "extensionFields,${record.code}","title": "${record.name}"},`}</div>
+          }
           if (!codeProps.columns) {
             return <div>表单：{`{"name": "extensionFields,${record.code}","label": "${record.name}"},`}</div>
           }

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

@@ -1,6 +1,6 @@
 // @ts-nocheck
-import React, { useState, useRef, useEffect } from 'react';
-import { message, Button, Table } from 'antd';
+import React, { useState, useRef, useEffect, Fragment } from 'react';
+import { message, Button, Table, Tabs } from 'antd';
 import Drawer from './drawer';
 import ConfigButton from './configButton';
 import Editor from './jsonEditor';
@@ -205,11 +205,13 @@ const tableStyleList = [
 ];
 const JsonQueryTable = React.memo(props => {
   const {
-    callBack,
-    codeProps,
-    customerFields,
-    initialSetting,
-    pageType
+    callBack, // 主保存函数回调
+    codeProps, // 整体的配置数据
+    customerFields, //可选的配置字段
+    initialSetting, //上一次添加自定义字段后保存的数据
+    pageType, //页面权限code
+    detailTablesSetting = [], //详情明细表格列配置数据
+    saveTableCallBack, //详情明细保存函数回调
   } = props;
 
   let codeFilter = {};
@@ -229,7 +231,6 @@ const JsonQueryTable = React.memo(props => {
   }  else {
     codeFilter.fields = iterFileds({fields: codeProps.fields}).fields
   }
-  console.log('codeFilter',codeFilter)
 
   const styleRef = useRef(null);
 
@@ -238,6 +239,9 @@ const JsonQueryTable = React.memo(props => {
   const [init, setInit] = useState(true);
   const [jsonEditorVal, setJsonEditorVal] = useState(initialSetting || codeFilter);
   const [moduleParams, setModuleParams] = useState({});
+  const [activeKey, setActiveKey] = useState('main'); //默认详情页配置
+  const [tablesConfigParams, setTablesConfigParams] = useState({});
+  const [tableJsonEditorValsArr, setTableJsonEditorValsArr] = useState([]);
 
   useEffect(()=>{
     Promise.all([
@@ -258,6 +262,52 @@ const JsonQueryTable = React.memo(props => {
     })
   },[]);
 
+  useEffect(()=>{
+    //明细表的配置数据
+    const axiosArr = detailTablesSetting.map((item:any) => axios.get(`/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=${item.tableCode}`));
+    Promise.all(axiosArr).then(([...resArr])=> {
+      detailTablesSetting.map((item:any, index:number)=>{
+        const { code, data } = resArr[index]?.data || {};
+        if(data){
+          const { businessType, code:fieldGroup, moduleType } = data;
+          setTablesConfigParams({
+            ...tablesConfigParams,
+            [item.tableCode]: {
+              businessType,
+              fieldGroup,
+              moduleType,
+              tableFlag: true
+            }
+          });
+        }
+      })
+    })
+
+    const detailTableCodeFilter = detailTablesSetting.map(item => {
+      if(item?.initialSetting && item?.initialSetting.length){
+        return {
+          ...item,
+          columns: item?.initialSetting
+        }
+      }
+      return {
+        ...item,
+        columns: item?.columns.map(childItem => ({
+          key: childItem.key || childItem.dataIndex,
+          dataIndex: childItem.dataIndex || childItem.key,
+          isStaticCode: true,
+          title: childItem.title
+        }))
+      }
+    });
+    setTableJsonEditorValsArr([...detailTableCodeFilter]);
+    detailTableCodeFilter.map(item => {
+      if(item?.initialSetting && item?.initialSetting.length){
+        onClickRunDetailTables(item.initialSetting, false, item.tableCode, detailTableCodeFilter);
+      }
+    })
+  },[detailTablesSetting.length]);
+  
   const onClickRun = (value, isSave) => {
     setJsonEditorVal(value);
 
@@ -269,6 +319,38 @@ const JsonQueryTable = React.memo(props => {
     }
   };
 
+  //明细表保存
+  const onClickRunDetailTables = (value, isSave, tableCode, tableSouce) =>{
+    const targetCode = tableCode || activeKey;
+    const targetTableSource = tableSouce || tableJsonEditorValsArr;
+    const newArr = targetTableSource.map(item => {
+      if(item.tableCode == targetCode){
+        return {
+          ...item,
+          columns: value
+        }
+      }
+      return item
+    });
+    setTableJsonEditorValsArr([...newArr]);
+
+    try {
+      const target = targetTableSource.find(item=>item.tableCode == targetCode);
+      const codeProps = {
+        fields: [],
+        columns: target?.columns,
+      };
+      const newValue = {
+        fields: [],
+        columns: value
+      };
+      const result = hanleCallbackValue(codeProps, newValue, target?.customerFields);
+      saveTableCallBack({ columns: result.columns, tableCode: targetCode }, isSave, value);
+    } catch (e) {
+      message.error(e);
+    }
+  }
+  
   React.useEffect(() => {
     localStorage.setItem('jsonEditorVal',JSON.stringify(jsonEditorVal||{}))
   }, [jsonEditorVal]);
@@ -292,24 +374,71 @@ const JsonQueryTable = React.memo(props => {
   return (
     <div>
       <Drawer visible={visible} width={800} onClose={() => setVisible(false)} className={'customFieldsDrawer'}>
-        <div ref={styleRef}>
-        
-        </div>
+      {
+          detailTablesSetting.length == 0 &&(
+            <Fragment>
+              {
+                isEmpty(moduleParams)?(
+                  <div style={{padding:"10px 0", fontSize:"16px", fontWeight:"bolder"}}>
+                    提示：业务对象未维护，请在通用单据对应业务类型下维护业务对象
+                  </div>
+                ):(
+                  <FieldsSettingsTable {...tableParams}/>
+                )
+              }
+              <Editor
+                type="table"
+                onRun={onClickRun}
+                value={jsonEditorVal}
+                shallowHeight={height}
+              />
+            </Fragment>
+          )
+        }
         {
-          isEmpty(moduleParams)?(
-            <div style={{padding:"10px 0", fontSize:"16px", fontWeight:"bolder"}}>
-              提示：业务对象未维护，请在通用单据对应业务类型下维护业务对象
-            </div>
-          ):(
-            <FieldsSettingsTable {...tableParams}/>
+          detailTablesSetting.length > 0 && (
+            <Tabs defaultActiveKey={activeKey} onChange={(v: any) => setActiveKey(v)}>
+              <Tabs.TabPane tab="详情页配置" key="main">
+                {
+                  isEmpty(moduleParams)?(
+                    <div style={{padding:"10px 0", fontSize:"16px", fontWeight:"bolder"}}>
+                      提示：业务对象未维护，请在通用单据对应业务类型下维护业务对象
+                    </div>
+                  ):(
+                    <FieldsSettingsTable {...tableParams}/>
+                  )
+                }
+                <Editor
+                  type="table"
+                  onRun={onClickRun}
+                  value={jsonEditorVal}
+                  shallowHeight={height}
+                />
+              </Tabs.TabPane>
+              {
+                tableJsonEditorValsArr.map((k:any)=>(
+                  <Tabs.TabPane tab={k.title} key={k.tableCode}>
+                    {
+                      !tablesConfigParams[k.tableCode]?(
+                        <div style={{padding:"10px 0", fontSize:"16px", fontWeight:"bolder"}}>
+                          提示：业务对象未维护，请在通用单据对应业务类型下维护业务对象
+                        </div>
+                      ):(
+                        <FieldsSettingsTable {...tablesConfigParams[k.tableCode]}/>
+                      )
+                    }
+                    <Editor
+                      type="table"
+                      onRun={onClickRunDetailTables}
+                      value={k.columns}
+                      shallowHeight={height}
+                    />
+                  </Tabs.TabPane>
+                ))
+              }
+            </Tabs>
           )
         }
-        <Editor
-          type="table"
-          onRun={onClickRun}
-          value={jsonEditorVal}
-          shallowHeight={height}
-        />
       </Drawer>
 
       {!visible && isAdmin() && <ConfigButton type='primary' onClick={() => setVisible(true)}>setting</ConfigButton>}