@bit-sun/business-component 4.2.0-alpha.2 → 4.2.0-alpha.4

package/dist/components/Functional/SearchSelect/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const SearchSelect: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+declare const SearchSelect: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default SearchSelect;

package/dist/components/Functional/SearchSelect/utils.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="lodash" />
-/// <reference types="react" />
+import React from 'react';
 export declare const columnsPerRow = 4;
 export declare const ColSpan = 6;
 export declare const handleSourceName: (sName: any) => any;
@@ -24,7 +24,7 @@ export declare const convertUrlQueryParams: (params: any) => string;
 export declare const convertBodyParams: (params: any) => any;
 export declare const convertResData: (requestConfig: any, res: any, selectProps: any) => any;
 export declare const handleSelectOptionsShowValue: (specialBracket: boolean, noNeedSplit: boolean, item: any) => any;
-export declare const LightHeightOption: (props: any) => JSX.Element;
-export declare const maxTagPlaceholder: (selectedValues: any, { selectProps, onChange, value, setIsMaxTagsOpen }: any) => JSX.Element;
+export declare const LightHeightOption: (props: any) => React.JSX.Element;
+export declare const maxTagPlaceholder: (selectedValues: any, { selectProps, onChange, value, setIsMaxTagsOpen }: any) => React.JSX.Element;
 export declare const handleTableColumns: (tableColumns: any) => any;
 export declare const getShowStr: ({ viewShowValueStr, labelInValue, selectMode, value, items }: any) => any;

package/dist/components/Functional/TreeSearchSelect/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const TreeSearchSelect: (props: any) => JSX.Element;
+import React from 'react';
+declare const TreeSearchSelect: (props: any) => React.JSX.Element;
 export default TreeSearchSelect;

package/dist/components/Solution/RuleComponent/CustomPlugin/CustomSelector/CustomSelectorModal.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/Solution/RuleComponent/CustomPlugin/CustomSelector/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const _default: (props: any) => JSX.Element;
+import React from 'react';
+declare const _default: (props: any) => React.JSX.Element;
 export default _default;

package/dist/components/Solution/RuleComponent/Formula.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from 'react';
 declare const App: ({ setValue, formula, record, sourceData, disabled }: {
     setValue: any;
     record: any;
     sourceData: any;
     formula?: any;
     disabled?: boolean | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default App;

package/dist/components/Solution/RuleComponent/InnerSelect.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 interface Iprops {
     disabled: boolean;
     inputType: number;
@@ -8,5 +8,5 @@ interface Iprops {
     onChange: any;
     dictionaryCode?: string;
 }
-declare const _default: (props: Iprops) => JSX.Element;
+declare const _default: (props: Iprops) => React.JSX.Element;
 export default _default;

package/dist/components/Solution/RuleComponent/RenderCompItem.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export default function RenderCompItem(props: any): JSX.Element | undefined;
+import React from 'react';
+export default function RenderCompItem(props: any): React.JSX.Element | undefined;

package/dist/components/Solution/RuleSetter/RuleInstance.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const _default: (props: any) => JSX.Element;
+import React from 'react';
+declare const _default: (props: any) => React.JSX.Element;
 export default _default;

package/dist/components/Solution/RuleSetter/baseRule.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/Solution/RuleSetter/index.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/dist/index.esm.js

@@ -188,8 +188,8 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -197,7 +197,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -4594,11 +4594,13 @@ var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
 };
 // 弹窗数据表头处理
 var handleTableColumns = function handleTableColumns(tableColumns) {
+  var _showTableColumns, _showTableColumns2;
   // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
   var showTableColumns = (tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter(function (s) {
     return typeof s.defaultSort == 'number';
   })) || tableColumns || [];
-  return (showTableColumns === null || showTableColumns === void 0 ? void 0 : showTableColumns.sort(function (a, b) {
+  showTableColumns = ((_showTableColumns = showTableColumns) === null || _showTableColumns === void 0 ? void 0 : _showTableColumns.length) ? showTableColumns : tableColumns;
+  return ((_showTableColumns2 = showTableColumns) === null || _showTableColumns2 === void 0 ? void 0 : _showTableColumns2.sort(function (a, b) {
     return a.defaultSort - b.defaultSort;
   })) || [];
 };
@@ -5513,7 +5515,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1
+    current: 1,
+    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
   });
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
@@ -9991,8 +9994,8 @@ function commonFun(type, prefixUrl, parentProps) {
     });
   };
   // 格式化树选择器数据源
-  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge, childrenKey) {
+    var haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
@@ -10000,14 +10003,15 @@ function commonFun(type, prefixUrl, parentProps) {
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
       disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map(function (i) {
-        return _mapSearchTree(i, resKeyValue, disabledJudge);
+      children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
+        return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
     };
   };
   var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+    var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
@@ -10015,7 +10019,7 @@ function commonFun(type, prefixUrl, parentProps) {
       disabledJudge = false;
     }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return _mapSearchTree(ites, resKeyValue, disabledJudge);
+      return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -11852,7 +11856,8 @@ function commonFun(type, prefixUrl, parentProps) {
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: _objectSpread2({
-        sorter: 'desc-id'
+        sorter: 'desc-id',
+        'qp-status-in': 10
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'code'
     }, requestConfigProp);
@@ -11869,12 +11874,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
-    }, {
-      name: 'qp-status-in',
-      type: 'select',
-      label: '商店状态',
-      initialSource: shopFile2Status
-    }, {
+    },
+    // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    {
       name: 'qp-orgCode-in',
       type: 'select',
       label: '所属销售组织',
@@ -11893,6 +11895,76 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '所属销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          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;
+          },
+          disabledJude: function disabledJude(data) {
+            return data['parentCode'] === '0';
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-commonRelationAreaCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          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;
+          },
+          disabledJude: function disabledJude(data) {
+            return data['parent'] === '0';
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-businessType-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;
+          }
+        }
+      },
+      initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }];
     var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -11902,8 +11974,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+      'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
-      formatSource(x, 0, 4, tableSearchForm);
+      formatSource(x, 0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id', 'name'], 'channelInfoSon');
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children');
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -11911,19 +11991,23 @@ function commonFun(type, prefixUrl, parentProps) {
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
-        defaultSort: 0
+        defaultSort: 0,
+        width: 60
       }, {
         title: '商店编码',
         dataIndex: 'code',
-        defaultSort: 1
+        defaultSort: 1,
+        width: 100
       }, {
         title: '商店名称',
         dataIndex: 'name',
-        defaultSort: 2
+        defaultSort: 2,
+        width: 120
       }, {
         title: '商店类型',
         dataIndex: 'type',
         defaultSort: 3,
+        width: 100,
         render: function render(text) {
           var _shopFile2Type$find;
           return (_shopFile2Type$find = shopFile2Type.find(function (i) {
@@ -11933,6 +12017,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '启用状态',
         dataIndex: 'status',
+        width: 80,
         render: function render(text) {
           var _shopFile2Status$find;
           return (_shopFile2Status$find = shopFile2Status.find(function (i) {
@@ -11942,8 +12027,28 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName',
-        defaultSort: 4
-      }]
+        defaultSort: 4,
+        width: 95
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'businessType',
+        defaultSort: 7,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
+      }],
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   // 核算主体选择器（无弹窗）

package/dist/index.js

@@ -211,8 +211,8 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -220,7 +220,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -4617,11 +4617,13 @@ var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
 };
 // 弹窗数据表头处理
 var handleTableColumns = function handleTableColumns(tableColumns) {
+  var _showTableColumns, _showTableColumns2;
   // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
   var showTableColumns = (tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter(function (s) {
     return typeof s.defaultSort == 'number';
   })) || tableColumns || [];
-  return (showTableColumns === null || showTableColumns === void 0 ? void 0 : showTableColumns.sort(function (a, b) {
+  showTableColumns = ((_showTableColumns = showTableColumns) === null || _showTableColumns === void 0 ? void 0 : _showTableColumns.length) ? showTableColumns : tableColumns;
+  return ((_showTableColumns2 = showTableColumns) === null || _showTableColumns2 === void 0 ? void 0 : _showTableColumns2.sort(function (a, b) {
     return a.defaultSort - b.defaultSort;
   })) || [];
 };
@@ -5536,7 +5538,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1
+    current: 1,
+    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
   });
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
@@ -10014,8 +10017,8 @@ function commonFun(type, prefixUrl, parentProps) {
     });
   };
   // 格式化树选择器数据源
-  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge, childrenKey) {
+    var haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
@@ -10023,14 +10026,15 @@ function commonFun(type, prefixUrl, parentProps) {
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
       disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map(function (i) {
-        return _mapSearchTree(i, resKeyValue, disabledJudge);
+      children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
+        return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
     };
   };
   var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+    var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
@@ -10038,7 +10042,7 @@ function commonFun(type, prefixUrl, parentProps) {
       disabledJudge = false;
     }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return _mapSearchTree(ites, resKeyValue, disabledJudge);
+      return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -11875,7 +11879,8 @@ function commonFun(type, prefixUrl, parentProps) {
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: _objectSpread2({
-        sorter: 'desc-id'
+        sorter: 'desc-id',
+        'qp-status-in': 10
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'code'
     }, requestConfigProp);
@@ -11892,12 +11897,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
-    }, {
-      name: 'qp-status-in',
-      type: 'select',
-      label: '商店状态',
-      initialSource: shopFile2Status
-    }, {
+    },
+    // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    {
       name: 'qp-orgCode-in',
       type: 'select',
       label: '所属销售组织',
@@ -11916,6 +11918,76 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '所属销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          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;
+          },
+          disabledJude: function disabledJude(data) {
+            return data['parentCode'] === '0';
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-commonRelationAreaCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          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;
+          },
+          disabledJude: function disabledJude(data) {
+            return data['parent'] === '0';
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-businessType-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;
+          }
+        }
+      },
+      initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }];
     var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -11925,8 +11997,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+      'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
-      formatSource(x, 0, 4, tableSearchForm);
+      formatSource(x, 0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['id', 'name'], 'channelInfoSon');
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children');
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -11934,19 +12014,23 @@ function commonFun(type, prefixUrl, parentProps) {
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
-        defaultSort: 0
+        defaultSort: 0,
+        width: 60
       }, {
         title: '商店编码',
         dataIndex: 'code',
-        defaultSort: 1
+        defaultSort: 1,
+        width: 100
       }, {
         title: '商店名称',
         dataIndex: 'name',
-        defaultSort: 2
+        defaultSort: 2,
+        width: 120
       }, {
         title: '商店类型',
         dataIndex: 'type',
         defaultSort: 3,
+        width: 100,
         render: function render(text) {
           var _shopFile2Type$find;
           return (_shopFile2Type$find = shopFile2Type.find(function (i) {
@@ -11956,6 +12040,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '启用状态',
         dataIndex: 'status',
+        width: 80,
         render: function render(text) {
           var _shopFile2Status$find;
           return (_shopFile2Status$find = shopFile2Status.find(function (i) {
@@ -11965,8 +12050,28 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName',
-        defaultSort: 4
-      }]
+        defaultSort: 4,
+        width: 95
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'businessType',
+        defaultSort: 7,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
+      }],
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   // 核算主体选择器（无弹窗）

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => JSX.Element;
+        render: (text: any, record: any) => React.JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => JSX.Element;
+        render: () => React.JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,13 +53,13 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
+    DraggableContainer: (props: any) => React.JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export default TableColumnSetting;