@bit-sun/business-component 4.2.1-alpha.2-aiwei → 4.2.1-alpha.20-aiwei

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import request$1 from 'umi-request';
 import cookie from 'js-cookie';
 import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, ConfigProvider, Tag, Select, Spin, Form, Table, Empty, Row, Col, Tabs, TreeSelect, DatePicker, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Result, Affix, Cascader, TimePicker, Divider, Switch, Collapse } from 'antd';
-import _, { omit, uniqBy, escapeRegExp, isNil, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
+import _, { omit, uniqBy, escapeRegExp, isNil, trim, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl, request as request$3 } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -5323,7 +5323,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     viewShowValueStr = _ref.viewShowValueStr,
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
-    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
+    _ref$requireSearchCon = _ref.requireSearchCondition,
+    requireSearchCondition = _ref$requireSearchCon === void 0 ? false : _ref$requireSearchCon;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5886,6 +5888,16 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // 必须选择一个值
+    if (requireSearchCondition) {
+      var hasValidValue = Object.values(params).some(function (value) {
+        return Array.isArray(value) && value.length > 0 || typeof value === 'string' && value.trim().length > 0;
+      });
+      if (!hasValidValue) {
+        message$1.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -6180,7 +6192,26 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var renderShowTable = function renderShowTable(tableList, type) {
-    var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
+    var _modalTableProps$tabl;
+    var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
+    var canExpand = hasMoreQueryFields(modalTableProps);
+    var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
+    var baseHeight = getTableHeigth(collapsedList);
+    var rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan).totalRows;
+    var rowsExpandedData = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan);
+    var rowsExpanded = rowsExpandedData.totalRows;
+    var isMoreAction = false;
+    if (24 / (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan) - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++;
+      isMoreAction = true;
+    }
+    var extraRows = !collapsed && canExpand ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    var tableBoxHeighth = baseHeight;
+    if (isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + (extraRows - 1 ? extraRows - 1 : 0) * 34 + 32;
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34;
+    }
     var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28; // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
     var mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
@@ -10455,7 +10486,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10474,7 +10505,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10493,7 +10524,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
       field: {
         type: 'select',
         props: {
@@ -10583,7 +10614,6 @@ function commonFun(type, prefixUrl, parentProps) {
       tableSearchForm: tableSearchForm,
       isHorizontally: true,
       tableSearchColSpan: 6,
-      visibleFieldsCount: 13,
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
@@ -11338,19 +11368,34 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
-      'qp-isMain-eq': 1,
+      // 'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$, _x$$data$, _x$$data$$channelInfo;
+      debugger;
+      // 战区限制一级数据
+      var newData1 = [];
+      (_x$ = x[0]) === null || _x$ === void 0 ? void 0 : (_x$$data$ = _x$.data[0]) === null || _x$$data$ === void 0 ? void 0 : (_x$$data$$channelInfo = _x$$data$.channelInfoSon) === null || _x$$data$$channelInfo === void 0 ? void 0 : _x$$data$$channelInfo.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[0].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
-      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
@@ -11468,7 +11513,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11549,11 +11594,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }, {
-      name: 'qp-channelCode-in',
-      type: 'treeSelect',
-      label: '销售渠道',
+      name: 'qp-operationWarehouseClassification-in',
+      type: 'select',
+      label: '分类',
       field: {
-        type: 'treeSelect',
+        type: 'select',
         props: {
           multiple: true,
           treeData: [],
@@ -11582,16 +11627,28 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/stock/ownerWarehouse/operationWarehouseClassificationList", {}, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$2, _x$2$data$, _x$2$data$$channelInf;
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
-      var channelDisabledJude = function channelDisabledJude(data) {
-        return data['parentCode'] === '0';
-      }; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatSource(x, 2, 3, tableSearchForm, ['operationWarehouseClassification', 'operationWarehouseClassificationName']);
+      var newData1 = [];
+      (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11863,18 +11920,18 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-code-like',
       label: '客户编码'
     }, {
-      name: 'qp-createOrgCode-eq',
+      name: 'qp-createOrgCode-in',
       type: 'select',
       label: '创建组织',
       field: {
         type: 'select',
         props: {
-          // mode: 'multiple',
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          // maxTagCount: 1,
+          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -12249,26 +12306,21 @@ function commonFun(type, prefixUrl, parentProps) {
       initialSource: shopFile2Type
     },
     // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    // { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {
+    //     type: 'select',
+    //     props: {
+    //       mode: 'multiple',
+    //       notFoundContent: '暂无数据',
+    //       allowClear: true,
+    //       showSearch: true,
+    //       showArrow: true,
+    //       maxTagCount: 1,
+    //       optionFilterProp: 'children',
+    //       filterOption: (input: string, option: { props: { children: string } }) =>
+    //         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+    //     },
+    //   } },
     {
-      name: 'qp-orgCode-in',
-      type: 'select',
-      label: '所属销售组织',
-      field: {
-        type: 'select',
-        props: {
-          mode: 'multiple',
-          notFoundContent: '暂无数据',
-          allowClear: true,
-          showSearch: true,
-          showArrow: true,
-          maxTagCount: 1,
-          optionFilterProp: 'children',
-          filterOption: function filterOption(input, option) {
-            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-          }
-        }
-      }
-    }, {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
       label: '战区',
@@ -12352,24 +12404,100 @@ function commonFun(type, prefixUrl, parentProps) {
       }
     }, {
       name: 'qp-manageSupervisor-like',
+      type: 'select',
       label: '管理督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value;
+            debugger;
+            return ((_option$value = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value !== void 0 ? _option$value : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-directSupervisor-like',
+      type: 'select',
       label: '直接督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value2;
+            return ((_option$value2 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value2 !== void 0 ? _option$value2 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-distributionItem-like',
+      type: 'select',
       label: '分销商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value3;
+            return ((_option$value3 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value3 !== void 0 ? _option$value3 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-headItem-like',
+      type: 'select',
       label: '总部商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value4;
+            return ((_option$value4 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value4 !== void 0 ? _option$value4 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-storeChannelName-like',
+      type: 'select',
       label: '管理模式',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value5;
+            return ((_option$value5 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value5 !== void 0 ? _option$value5 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12379,27 +12507,86 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/store/selectStoreOperationalInfo", {}, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf, _x$4, _opList, _opList$, _opList2, _opList3, _opList4, _opList5, _opList6;
+      var newData1 = [];
+      (_x$3 = x[1]) === null || _x$3 === void 0 ? void 0 : (_x$3$data$ = _x$3.data[0]) === null || _x$3$data$ === void 0 ? void 0 : (_x$3$data$$channelInf = _x$3$data$.channelInfoSon) === null || _x$3$data$$channelInf === void 0 ? void 0 : _x$3$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatSource(x, 0, 3, tableSearchForm);
-      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
-      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
-      formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
+      // formatSource(x,0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatSource(x, 3, 6, tableSearchForm, ['brandCode', 'name']);
+      var opRaw = (_x$4 = x[4]) === null || _x$4 === void 0 ? void 0 : _x$4.data;
+      // 新增label属性
+      (_opList = opList) === null || _opList === void 0 ? void 0 : _opList.forEach(function (r) {
+        r.label = r === null || r === void 0 ? void 0 : r.value;
+      });
+      var opList = Array.isArray(opRaw) ? opRaw : (opRaw === null || opRaw === void 0 ? void 0 : opRaw.items) || (opRaw === null || opRaw === void 0 ? void 0 : opRaw.list) || [];
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !((_opList$ = opList[0]) === null || _opList$ === void 0 ? void 0 : _opList$.field)) {
+        opList = opList[0];
+      }
+      var m1 = (_opList2 = opList) === null || _opList2 === void 0 ? void 0 : _opList2.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'manage_supervisor' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m2 = (_opList3 = opList) === null || _opList3 === void 0 ? void 0 : _opList3.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'direct_supervisor' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m3 = (_opList4 = opList) === null || _opList4 === void 0 ? void 0 : _opList4.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'distribution_item' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      debugger;
+      var m4 = (_opList5 = opList) === null || _opList5 === void 0 ? void 0 : _opList5.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'head_item' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m5 = (_opList6 = opList) === null || _opList6 === void 0 ? void 0 : _opList6.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'store_channel_name' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      tableSearchForm[7] = _objectSpread2(_objectSpread2({}, tableSearchForm[7]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -19486,7 +19673,8 @@ var BsSulaQueryTable = (function (props) {
     setPagePath = _useState0[1];
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname,
-    _useLocation$state = _useLocation.state;
+    _useLocation$state = _useLocation.state,
+    state = _useLocation$state === void 0 ? {} : _useLocation$state;
   var _useState1 = useState(false),
     _useState10 = _slicedToArray(_useState1, 2),
     isFullScreen = _useState10[0],
@@ -19962,16 +20150,17 @@ var BsSulaQueryTable = (function (props) {
     isFullScreen: isFullScreen
   });
   useEffect(function () {
-    // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
-    //   if (pagePath === pathname) {
-    //     // @ts-ignore
-    //     config.ref?.current?.tableRef?.current?.refreshTable();
-    //   }
-    // }
-    // setTimeout(() => {
-    //   // 处理页面刷新两面
-    //   localStorage.removeItem('isTabChange');
-    // }, 0);
+    if (!localStorage.getItem('isTabChange') || (state === null || state === void 0 ? void 0 : state.updateCurrentPage)) {
+      if (pagePath === pathname) {
+        var _config$ref, _config$ref$current, _config$ref$current$t, _config$ref$current$t2;
+        // @ts-ignore
+        (_config$ref = config.ref) === null || _config$ref === void 0 ? void 0 : (_config$ref$current = _config$ref.current) === null || _config$ref$current === void 0 ? void 0 : (_config$ref$current$t = _config$ref$current.tableRef) === null || _config$ref$current$t === void 0 ? void 0 : (_config$ref$current$t2 = _config$ref$current$t.current) === null || _config$ref$current$t2 === void 0 ? void 0 : _config$ref$current$t2.refreshTable();
+      }
+    }
+    setTimeout(function () {
+      // 处理页面刷新两面
+      localStorage.removeItem('isTabChange');
+    }, 0);
   }, [pathname]);
   var expandedRowKeys = props === null || props === void 0 ? void 0 : (_props$expandable = props.expandable) === null || _props$expandable === void 0 ? void 0 : _props$expandable.expandedRowKeys;
   //todo  summary属性已经被使用，为了兼容之前的，现在使用 summaryList
@@ -34396,11 +34585,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
         itemDetail = _this$props2$itemDeta === void 0 ? {} : _this$props2$itemDeta,
         _this$props2$others = _this$props2.others,
         others = _this$props2$others === void 0 ? {} : _this$props2$others,
-        propertyCode = _this$props2.propertyCode;
+        propertyCode = _this$props2.propertyCode,
+        isQueryParams = _this$props2.isQueryParams;
       var thresholdList = _this.state.thresholdList;
       var styleCommon = {
         width: customerWidth || '180px'
       };
+      if (isQueryParams) {
+        return /*#__PURE__*/React$1.createElement(Input, {
+          defaultValue: values.join(','),
+          disabled: disabled,
+          style: styleCommon,
+          onBlur: function onBlur(e) {
+            values = e.target.value.split(',');
+            valueNames = e.target.value.split(',');
+            callback(values, valueNames);
+          }
+        });
+      }
       if (!selectOperation) return /*#__PURE__*/React$1.createElement(Input, {
         disabled: true,
         style: styleCommon
@@ -36926,7 +37128,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
       fieldValues: [],
       thresholdQuery: {},
       thresholdList: [],
-      options: []
+      options: [],
+      isQueryParams: false
     };
     return _this;
   }
@@ -36946,13 +37149,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3.initialThresholdQuery,
         queryIdentify = _this$props3.queryIdentify,
         propertyCode = _this$props3.propertyCode,
-        queryIdentifyType = _this$props3.queryIdentifyType;
+        queryIdentifyType = _this$props3.queryIdentifyType,
+        isQueryParams = _this$props3.isQueryParams;
       this.setState({
         selectOperation: selectOperation,
         thresholdQuery: initialThresholdQuery ? _objectSpread2({}, initialThresholdQuery) : {},
         dataTypeCode: dataTypeCode,
         dataChoiceBusinessType: dataChoiceBusinessType,
         dataInputBusinessType: dataInputBusinessType,
+        isQueryParams: isQueryParams,
         others: others,
         fieldValues: _toConsumableArray(values),
         options: options
@@ -38159,6 +38364,18 @@ function RenderCompItem(props) {
 }
 
 var RangePicker$2 = DatePicker.RangePicker;
+var FIXED_DATA_TYPES = {
+  10: '字符串',
+  20: '短整数',
+  21: '长整数',
+  22: '小数',
+  40: '数组',
+  41: '布尔值',
+  12: '富文本',
+  30: '日期',
+  31: '时间',
+  32: '日期时间'
+};
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
   function RuleObjectComponent(props) {
     var _this;
@@ -38202,6 +38419,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
               value: element.id,
               id: element.id,
               dataTypeCode: element.valueType,
+              entityValueType: element.entityValueType,
+              entityInputType: element.entityInputType,
               dataChoiceBusinessType: element.choiceType,
               dataInputBusinessType: element.inputType,
               info: element.info,
@@ -38223,6 +38442,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           metaObjectCode: _this.props.metaObjectCode || item.code
         }, item), {}, {
           dataTypeCode: item.valueType,
+          entityValueType: item.entityValueType,
+          entityInputType: item.entityInputType,
           dataChoiceBusinessType: item.choiceType,
           dataInputBusinessType: item.inputType
         }));
@@ -38256,6 +38477,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: element.id,
           id: element.id,
           dataTypeCode: element.valueType,
+          entityValueType: element.entityValueType,
+          entityInputType: element.entityInputType,
           dataChoiceBusinessType: element.choiceType,
           dataInputBusinessType: element.inputType,
           info: element.info,
@@ -38625,7 +38848,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3$initialT === void 0 ? {} : _this$props3$initialT,
         disabled = _this$props3.disabled,
         systemVariableList = _this$props3.systemVariableList,
-        needShowInsertSQL = _this$props3.needShowInsertSQL;
+        needShowInsertSQL = _this$props3.needShowInsertSQL,
+        needShowReqCondition = _this$props3.needShowReqCondition;
       var thresholdQuery = _objectSpread2(_objectSpread2({}, initialThresholdQuery), relateDatas);
       var finalIndex = floorIndex + 1;
       var queryIdentify = '';
@@ -38716,6 +38940,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           itemDetail.elementId = nodeInfo.triggerNode.props.id;
           itemDetail.elementName = nodeInfo.triggerNode.props.title;
           itemDetail.dataTypeCode = nodeInfo.triggerNode.props.dataTypeCode;
+          itemDetail.entityValueType = nodeInfo.triggerNode.props.entityValueType;
+          itemDetail.entityInputType = nodeInfo.triggerNode.props.entityInputType;
           itemDetail.metaObjectCode = nodeInfo.triggerNode.props.metaObjectCode;
           itemDetail.isInsertParam = false;
           if (needShowInsertSQL) {
@@ -38902,7 +39128,99 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           fontSize: '14px',
           marginRight: '5px'
         }
-      }), "\u6DFB\u52A0\u6761\u4EF6"))));
+      }), "\u6DFB\u52A0\u6761\u4EF6"), needShowReqCondition && /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          marginLeft: 10
+        }
+      }, /*#__PURE__*/React$1.createElement(Button, {
+        type: "link",
+        style: {
+          padding: 0,
+          height: 'auto'
+        },
+        onClick: function onClick() {
+          return _this.handleReqConditionToggle(itemDetail);
+        }
+      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), itemDetail.isReqCondition && itemDetail.reqConditionData && /*#__PURE__*/React$1.createElement("div", {
+        style: {
+          marginTop: 10,
+          display: 'flex',
+          alignItems: 'center',
+          background: '#f5f5f5',
+          padding: '10px',
+          borderRadius: '4px'
+        }
+      }, /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          marginRight: 8,
+          flexShrink: 0
+        }
+      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0:"), /*#__PURE__*/React$1.createElement(Input, {
+        style: {
+          width: 150,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.reqParamName,
+        onChange: function onChange(e) {
+          return _this.handleReqDataChange(itemDetail, 'reqParamName', e.target.value);
+        }
+      }), /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          marginRight: 8,
+          flexShrink: 0
+        }
+      }, "\u7C7B\u578B:"), /*#__PURE__*/React$1.createElement(Select, {
+        style: {
+          width: 120,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.dataTypeCode,
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'dataTypeCode', val);
+        }
+      }, Object.keys(FIXED_DATA_TYPES).map(function (code) {
+        return /*#__PURE__*/React$1.createElement(Select.Option, {
+          key: code,
+          value: code
+        }, FIXED_DATA_TYPES[code]);
+      })), /*#__PURE__*/React$1.createElement(Select, {
+        style: {
+          width: 120,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.operationCode,
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'operationCode', val);
+        }
+      }, [{
+        'code': 'eq',
+        'name': '等于'
+      }, {
+        'code': 'cn',
+        'name': '包含'
+      }, {
+        code: 'gt',
+        name: '大于'
+      }, {
+        code: 'lt',
+        name: '小于'
+      }].map(function (op) {
+        return /*#__PURE__*/React$1.createElement(Select.Option, {
+          key: op.code,
+          value: op.code
+        }, op.name);
+      })), /*#__PURE__*/React$1.createElement(RuleField, {
+        customerWidth: '180px',
+        isQueryParams: true,
+        selectOperation: itemDetail.reqConditionData.operationCode,
+        dataTypeCode: itemDetail.reqConditionData.dataTypeCode,
+        values: itemDetail.reqConditionData.params || [],
+        valueNames: itemDetail.reqConditionData.paramNames || [],
+        callback: function callback(newValues, newValueNames) {
+          return _this.handleReqDataChange(itemDetail, 'params', newValues, newValueNames);
+        },
+        disabled: disabled
+      })))));
     };
     _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex, key) {
       var ruleClassData = _this.state.ruleClassData;
@@ -39218,6 +39536,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       delete itemDetail.params;
       delete itemDetail.paramNames;
       delete itemDetail.dataTypeCode;
+      delete itemDetail.entityValueType;
+      delete itemDetail.entityInputType;
       delete itemDetail.elementId;
       delete itemDetail.elementName;
       delete itemDetail.metaObjectCode;
@@ -39268,6 +39588,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             parentDetail.elementId = parentDetail.subExpression[0].elementId;
             parentDetail.elementName = parentDetail.subExpression[0].elementName;
             parentDetail.dataTypeCode = parentDetail.subExpression[0].dataTypeCode;
+            parentDetail.entityValueType = parentDetail.subExpression[0].entityValueType;
+            parentDetail.entityInputType = parentDetail.subExpression[0].entityInputType;
             delete parentDetail.subExpression;
           }
         }
@@ -39341,6 +39663,55 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    _this.handleReqConditionToggle = function (itemDetail) {
+      var ruleClassData = _this.state.ruleClassData;
+      var callBack = _this.props.callBack;
+      itemDetail.isReqCondition = !itemDetail.isReqCondition;
+      if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
+        itemDetail.reqConditionData = {
+          operationType: 'relation',
+          dataTypeCode: '21',
+          entityInputType: '21',
+          entityValueType: '21',
+          operationCode: '',
+          reqParamName: '',
+          params: [],
+          paramNames: []
+        };
+      }
+      _this.setState({
+        ruleClassData: ruleClassData
+      }, function () {
+        callBack(ruleClassData);
+      });
+    };
+    _this.handleReqDataChange = function (itemDetail, field, value, valueNames) {
+      var ruleClassData = _this.state.ruleClassData;
+      var callBack = _this.props.callBack;
+      if (!itemDetail.reqConditionData) return;
+      if (field === 'dataTypeCode') {
+        itemDetail.reqConditionData.dataTypeCode = value;
+        itemDetail.reqConditionData.entityInputType = value;
+        itemDetail.reqConditionData.entityValueType = value;
+        itemDetail.reqConditionData.operationCode = '';
+        itemDetail.reqConditionData.params = [];
+        itemDetail.reqConditionData.paramNames = [];
+      } else if (field === 'operationCode') {
+        itemDetail.reqConditionData.operationCode = value;
+      } else if (field === 'reqParamName') {
+        itemDetail.reqConditionData.reqParamName = value;
+      } else if (field === 'params') {
+        itemDetail.reqConditionData.params = value;
+        if (valueNames) {
+          itemDetail.reqConditionData.paramNames = valueNames;
+        }
+      }
+      _this.setState({
+        ruleClassData: ruleClassData
+      }, function () {
+        callBack(ruleClassData);
+      });
+    };
     _this.state = {
       editNameIndex: 0,
       isEdit: false,