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

package/dist/index.js

@@ -5346,7 +5346,9 @@ var SearchSelect = /*#__PURE__*/React$1.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,
@@ -5909,6 +5911,16 @@ var SearchSelect = /*#__PURE__*/React$1.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) {
+        antd.message.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -6203,7 +6215,26 @@ var SearchSelect = /*#__PURE__*/React$1.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)");
@@ -10478,7 +10509,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10497,7 +10528,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10516,7 +10547,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
       field: {
         type: 'select',
         props: {
@@ -10606,7 +10637,6 @@ function commonFun(type, prefixUrl, parentProps) {
       tableSearchForm: tableSearchForm,
       isHorizontally: true,
       tableSearchColSpan: 6,
-      visibleFieldsCount: 13,
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
@@ -11366,14 +11396,25 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).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',
@@ -11388,17 +11429,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
-    }, {
-      name: 'belongArea',
-      field: {
-        type: 'select',
-        props: {
-          mode: 'multiple'
-        }
-      },
-      label: '管理大区',
-      initialSource: getDictionarySource$1('BUSINESS_belongArea')
-    }, {
+    },
+    // { name: 'belongArea', field: {type: 'select', props: {mode: 'multiple',}}, label: '管理大区', initialSource: getDictionarySource('BUSINESS_belongArea'),   },
+    {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
       label: '战区',
@@ -11499,7 +11532,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11580,11 +11613,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: [],
@@ -11600,7 +11633,8 @@ function commonFun(type, prefixUrl, parentProps) {
           },
           showCheckedStrategy: 'TreeSelect.SHOW_ALL'
         }
-      }
+      },
+      initialSource: getDictionarySource$1('BASIC_OPS_WH_TYPE')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
@@ -11618,11 +11652,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).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);
+      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: '选择运营仓',
@@ -11894,18 +11933,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;
@@ -12280,26 +12319,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: '战区',
@@ -12383,24 +12417,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,
@@ -12420,7 +12530,18 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth')), 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';
       }; // 所属销售渠道 树节点不能点判断
@@ -12431,6 +12552,46 @@ function commonFun(type, prefixUrl, parentProps) {
       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']);
+      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[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[12] = _objectSpread2(_objectSpread2({}, tableSearchForm[12]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/package.json

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