@bit-sun/business-component 2.4.31-alpha.9 → 2.4.31

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

@@ -17,36 +17,10 @@ import { getEmployeeId } from '@/utils/LocalstorageUtils';
 
 function handleSelectColumn(c: any, parentProps: any) {
   let result = c;
-  const showColumns = parentProps?.showColumns || parentProps?.showSelectColumns || [];
-  const exceptColumns = parentProps?.exceptColumns || parentProps?.exceptSelectColumns || [];
-  const coverColumns = parentProps?.coverColumns || parentProps?.coverSelectColumns  || [];
-  const additionColumns = parentProps?.additionColumns || parentProps?.additionSelectColumns  || [];
-  // 仅展示内容
-  if(showColumns?.length) {
-    result = result.filter((i: any) => showColumns.includes(i.dataIndex))
-  }
-  // 过滤不需要展示内容
-  if(exceptColumns?.length) {
-    result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex))
-  }
-  // 追加(最好不用这个，当组件不固定时候会有影响)
-  if(additionColumns?.length) {
-    additionColumns.forEach((i: any) => {
-      result.splice(i.position,0,i.column)
-    })
-  }
-  // 覆盖内容
-  if(coverColumns?.length) {
-    result = coverColumns;
-  }
-  return result
-}
-function handleTableColumn(c: any, parentProps: any) {
-  let result = c;
-  const showColumns = parentProps?.showColumns || parentProps?.showTableColumns || [];
-  const exceptColumns = parentProps?.exceptColumns || parentProps?.exceptTableColumns || [];
-  const coverColumns = parentProps?.coverColumns || parentProps?.coverTableColumns || [];
-  const additionColumns = parentProps?.additionColumns || parentProps?.additionTableColumns || [];
+  const showColumns = parentProps?.showColumns || [];
+  const exceptColumns = parentProps?.exceptColumns || [];
+  const coverColumns = parentProps?.coverColumns || [];
+  const additionColumns = parentProps?.additionColumns || [];
   // 仅展示内容
   if(showColumns?.length) {
     result = result.filter((i: any) => showColumns.includes(i.dataIndex))
@@ -356,7 +330,7 @@ export const AddSkuSelect = (parProps: any) => {
       dataIndex: 'brandName',
     },
   ]
-  const mTpTableColumn = handleTableColumn(initialTableColumn, parProps);
+  const mTpTableColumn = handleSelectColumn(initialTableColumn, parProps);
   const initialTableSearchForm = [
     {
       name: 'qp-skuCode-like', label: 'SKU编码'
@@ -429,7 +403,6 @@ export const AddSkuSelect = (parProps: any) => {
     },
   ]
   const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
-  
   const props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -461,7 +434,7 @@ export const AddSkuSelect = (parProps: any) => {
     isAllowRepeatedSelect: !!parProps?.isAllowRepeatedSelect,
   };
   const modalTableProps = {
-    modalTableTitle: parProps.modalTableTitle || '选择商品',
+    modalTableTitle: '选择商品',
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
@@ -546,158 +519,6 @@ export const AddSkcSelect = (parProps: any) => {
     },
   ]
   const mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps)
-  const initialTableColumn = [
-    {
-      title: 'SKC编码',
-      width: 150,
-      dataIndex: 'code',
-    },
-    {
-      title: 'SKC名称',
-      width: 200,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'name',
-    },
-    {
-      title: '商品名称',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      dataIndex: 'itemName',
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-    },
-    {
-      title: '颜色',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'colorName',
-    },
-    {
-      title: '类目',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'categoryName',
-    },
-    {
-      title: '品类',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'className',
-    },
-    {
-      title: '品牌',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'brandName',
-    },
-  ]
-  const mTpTableColumn = handleTableColumn(initialTableColumn, parProps);
-  const initialTableSearchForm = [
-    { name: 'qp-code-like', label: 'SKC编码' },
-    { name: 'qp-skcName-like', label: 'SKC名称' },
-    { name: 'qp-itemName-like', label: '商品名称' },
-    { name: 'qp-colorName-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-categoryId-in', type: 'treeSelect', label: '类目', field: {
-        type: 'treeSelect',
-        props: {
-          treeData: [],
-          treeCheckable: true,
-          showSearch: true,
-          allowClear: true,
-          showArrow: true,
-          treeNodeFilterProp: 'title',
-          treeDefaultExpandAll: true,
-          maxTagCount: 1,
-          placeholder: '请选择',
-          style: {
-            width: '100%',
-          },
-          dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
-        },
-      } },
-    { name: 'qp-classId-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-brandId-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,
-        },
-      } },
-  ];
-  const mTpTableSearchForm = handleSearchForm(initialTableSearchForm, parProps);
   const initialPromiseLoadList = [
     {
       url: `/items/item/propertyValue/sizeBySkcConfig`,
@@ -741,7 +562,6 @@ export const AddSkcSelect = (parProps: any) => {
       resKeyValue: ['id','name']
     },
   ]
-  const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   const props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -770,11 +590,159 @@ export const AddSkcSelect = (parProps: any) => {
     isAllowRepeatedSelect: parProps?.isAllowRepeatedSelect!==undefined ? !!parProps?.isAllowRepeatedSelect : true, // 默认开启一行选多次
   };
   const modalTableProps = {
-    modalTableTitle: parProps.modalTableTitle || '选择商品',
-    tableSearchForm: mTpTableSearchForm,
-    tableColumns: mTpTableColumn,
+    modalTableTitle: '选择商品',
+    tableSearchForm: [
+      { name: 'qp-code-like', label: 'SKC编码' },
+      { name: 'qp-skcName-like', label: 'SKC名称' },
+      { name: 'qp-itemName-like', label: '商品名称' },
+      { name: 'qp-colorName-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-categoryId-in', type: 'treeSelect', label: '类目', field: {
+          type: 'treeSelect',
+          props: {
+            treeData: [],
+            treeCheckable: true,
+            showSearch: true,
+            allowClear: true,
+            showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
+            maxTagCount: 1,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+          },
+        } },
+      { name: 'qp-classId-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-brandId-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,
+          },
+        } },
+    ],
+    tableColumns: [
+      {
+        title: 'SKC编码',
+        width: 150,
+        dataIndex: 'code',
+      },
+      {
+        title: 'SKC名称',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'name',
+      },
+      {
+        title: '商品名称',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'itemName',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: '颜色',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'colorName',
+      },
+      {
+        title: '类目',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'categoryName',
+      },
+      {
+        title: '品类',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'className',
+      },
+      {
+        title: '品牌',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'brandName',
+      },
+    ],
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList,
+    promiseLoadList: initialPromiseLoadList
   }
 
   return (
@@ -869,144 +837,6 @@ export const AddSpuSelect = (parProps: any) => {
     },
   ]
   const mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps)
-  const initialTableColumn =  [
-    {
-      title: '商品编码',
-      width: 150,
-      dataIndex: 'itemCode',
-    },
-    {
-      title: '商品名称',
-      width: 200,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'name',
-    },
-    {
-      title: '所属组织',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'ownOrgSignName',
-    },
-    {
-      title: '品牌',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'brandName',
-    },
-    {
-      title: '类目',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'categoryName',
-    },
-    {
-      title: '品类',
-      width: 100,
-      ellipsis: {
-        showTitle: false,
-      },
-      render: (text: any) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
-        </Tooltip>
-      ),
-      dataIndex: 'className',
-    },
-  ]
-  const mTpTableColumn = handleTableColumn(initialTableColumn, parProps);
-  const initialTableSearchForm = [
-    { name: 'qp-itemCode-like', label: '商品编码' },
-    { name: 'qp-name-like', label: '商品名称' },
-    { name: 'qp-ownOrgSign-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-brandId-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-categoryId-in', type: 'treeSelect', label: '类目', field: {
-        type: 'treeSelect',
-        props: {
-          treeData: [],
-          treeCheckable: true,
-          showSearch: true,
-          allowClear: true,
-          showArrow: true,
-          treeNodeFilterProp: 'title',
-          treeDefaultExpandAll: true,
-          maxTagCount: 1,
-          placeholder: '请选择',
-          style: {
-            width: '100%',
-          },
-          dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
-        },
-      } },
-    { name: 'qp-classId-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,
-        },
-      } },
-  ]
-  const mTpTableSearchForm = handleSearchForm(initialTableSearchForm, parProps);
   const initialPromiseLoadList = [
     {
       url: `/user/orgViewNode/listNoPage`,
@@ -1050,7 +880,6 @@ export const AddSpuSelect = (parProps: any) => {
       resKeyValue: ['id','name']
     },
   ]
-  const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   const props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -1081,11 +910,145 @@ export const AddSpuSelect = (parProps: any) => {
     isAllowRepeatedSelect: !!parProps?.isAllowRepeatedSelect,
   };
   const modalTableProps = {
-    modalTableTitle: parProps.modalTableTitle || '选择商品',
-    tableSearchForm: mTpTableSearchForm,
-    tableColumns: mTpTableColumn,
+    modalTableTitle: '选择商品',
+    tableSearchForm: [
+      { name: 'qp-itemCode-like', label: '商品编码' },
+      { name: 'qp-name-like', label: '商品名称' },
+      { name: 'qp-ownOrgSign-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-brandId-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-categoryId-in', type: 'treeSelect', label: '类目', field: {
+          type: 'treeSelect',
+          props: {
+            treeData: [],
+            treeCheckable: true,
+            showSearch: true,
+            allowClear: true,
+            showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
+            maxTagCount: 1,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+          },
+        } },
+      { name: 'qp-classId-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,
+          },
+        } },
+    ],
+    tableColumns: [
+      {
+        title: '商品编码',
+        width: 150,
+        dataIndex: 'itemCode',
+      },
+      {
+        title: '商品名称',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'name',
+      },
+      {
+        title: '所属组织',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'ownOrgSignName',
+      },
+      {
+        title: '品牌',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'brandName',
+      },
+      {
+        title: '类目',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'categoryName',
+      },
+      {
+        title: '品类',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'className',
+      },
+    ],
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList,
+    promiseLoadList: initialPromiseLoadList
   }
 
   return (

package/src/components/Business/BsLayouts/Components/GlobalHeader/index.tsx

@@ -50,6 +50,7 @@ const GlobalHeaderCom = (props: any) => {
             (name
               ? formatMessage({ id: `menu.${item.name}` }).indexOf(name) !== -1
               : true)
+              && btnAuth.find((d: any) => d === item.code)
           ) {
             resultList.push({
               ...item,