@bit-sun/business-component 1.1.11 → 1.1.14

package/dist/index.esm.js

@@ -1738,10 +1738,14 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 cell.m = cell.v = cell.m.trim();
               }
 
-              if (typeof cell.v === 'number') {
+              if (cell && cell.m && cell.m.indexOf('E+') !== -1) {
                 cell.v = cell.v.toString();
                 cell.m = cell.v;
               }
+
+              if (typeof cell.v === 'number') {
+                cell.v = cell.m;
+              }
             } // console.log(postion);
 
           },
@@ -2645,6 +2649,7 @@ var SearchSelect = function SearchSelect(props) {
       if (type === 1) {
         var _ctx$form;
 
+        console.log(sourceName, 'sourceName');
         ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(sourceName, source);
         setItems(source);
         setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
@@ -3522,6 +3527,142 @@ function commonFun(type, prefixUrl) {
     };
   } // 仓库选择器
 
+
+  if (type === 'physicalWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'physicalWarehouseName',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-physicalWarehouseName-like',
+      label: '物理仓名称'
+    }, {
+      name: 'qp-physicalWarehouseCode-like',
+      label: '物理仓编码'
+    }, {
+      name: 'qp-physicalWarehouseType-eq',
+      type: 'select',
+      label: '物理仓类型',
+      initialSource: getDictionarySource('SC00002')
+    }, {
+      name: 'qp-companyCode-eq',
+      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-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'qp-companyType-eq': 20
+    })]).then(function (x) {
+      formatSource(x, 0, 3, tableSearchForm);
+    });
+    modalTableProps = {
+      modalTableTitle: '选择物理仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '物理仓编码',
+        dataIndex: 'physicalWarehouseCode'
+      }, {
+        title: '物理仓名称',
+        dataIndex: 'physicalWarehouseName'
+      }, {
+        title: '物理仓类型',
+        dataIndex: 'physicalWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00002', text);
+        }
+      }, {
+        title: '物理仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }, {
+        title: '所属公司',
+        dataIndex: 'companyName'
+      }]
+    };
+  }
+
+  if (type === 'realWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'realWarehouseName',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-realWarehouseName-like',
+      label: '逻辑仓名称'
+    }, {
+      name: 'qp-realWarehouseCode-like',
+      label: '逻辑仓编码'
+    }, {
+      name: 'qp-realWarehouseType-eq',
+      type: 'select',
+      label: '逻辑仓类型',
+      initialSource: getDictionarySource('SC00004')
+    }, {
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    modalTableProps = {
+      modalTableTitle: '选择逻辑仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '逻辑仓编码',
+        dataIndex: 'realWarehouseCode'
+      }, {
+        title: '逻辑仓名称',
+        dataIndex: 'realWarehouseName'
+      }, {
+        title: '逻辑仓类型',
+        dataIndex: 'realWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00004', text);
+        }
+      }, {
+        title: '逻辑仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }]
+    };
+  }
+
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig

package/dist/index.js

@@ -1749,10 +1749,14 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 cell.m = cell.v = cell.m.trim();
               }
 
-              if (typeof cell.v === 'number') {
+              if (cell && cell.m && cell.m.indexOf('E+') !== -1) {
                 cell.v = cell.v.toString();
                 cell.m = cell.v;
               }
+
+              if (typeof cell.v === 'number') {
+                cell.v = cell.m;
+              }
             } // console.log(postion);
 
           },
@@ -2656,6 +2660,7 @@ var SearchSelect = function SearchSelect(props) {
       if (type === 1) {
         var _ctx$form;
 
+        console.log(sourceName, 'sourceName');
         ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(sourceName, source);
         setItems(source);
         setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
@@ -3533,6 +3538,142 @@ function commonFun(type, prefixUrl) {
     };
   } // 仓库选择器
 
+
+  if (type === 'physicalWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'physicalWarehouseName',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-physicalWarehouseName-like',
+      label: '物理仓名称'
+    }, {
+      name: 'qp-physicalWarehouseCode-like',
+      label: '物理仓编码'
+    }, {
+      name: 'qp-physicalWarehouseType-eq',
+      type: 'select',
+      label: '物理仓类型',
+      initialSource: getDictionarySource('SC00002')
+    }, {
+      name: 'qp-companyCode-eq',
+      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-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'qp-companyType-eq': 20
+    })]).then(function (x) {
+      formatSource(x, 0, 3, tableSearchForm);
+    });
+    modalTableProps = {
+      modalTableTitle: '选择物理仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '物理仓编码',
+        dataIndex: 'physicalWarehouseCode'
+      }, {
+        title: '物理仓名称',
+        dataIndex: 'physicalWarehouseName'
+      }, {
+        title: '物理仓类型',
+        dataIndex: 'physicalWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00002', text);
+        }
+      }, {
+        title: '物理仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }, {
+        title: '所属公司',
+        dataIndex: 'companyName'
+      }]
+    };
+  }
+
+  if (type === 'realWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'realWarehouseName',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-realWarehouseName-like',
+      label: '逻辑仓名称'
+    }, {
+      name: 'qp-realWarehouseCode-like',
+      label: '逻辑仓编码'
+    }, {
+      name: 'qp-realWarehouseType-eq',
+      type: 'select',
+      label: '逻辑仓类型',
+      initialSource: getDictionarySource('SC00004')
+    }, {
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    modalTableProps = {
+      modalTableTitle: '选择逻辑仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '逻辑仓编码',
+        dataIndex: 'realWarehouseCode'
+      }, {
+        title: '逻辑仓名称',
+        dataIndex: 'realWarehouseName'
+      }, {
+        title: '逻辑仓类型',
+        dataIndex: 'realWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00004', text);
+        }
+      }, {
+        title: '逻辑仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }]
+    };
+  }
+
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.1.11",
+  "version": "1.1.14",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/DataValidation/index.tsx

@@ -174,13 +174,17 @@ class DataValidation extends React.Component {
           if (cell) {
             cell.fs = 10;
 
+
             if (typeof cell.v === 'string') {
               cell.m = cell.v = cell.m.trim();
             }
-            if (typeof cell.v === 'number') {
+            if (cell && cell.m && cell.m.indexOf('E+') !== -1) {
               cell.v = cell.v.toString()
               cell.m = cell.v
             }
+            if (typeof cell.v === 'number') {
+              cell.v = cell.m
+            }
           }
           // console.log(postion);
         },

package/src/components/SearchSelect/business/BusinessUtils.ts

@@ -346,10 +346,117 @@ export function commonFun (type?: string, prefixUrl: any) {
   }
 
   // 仓库选择器
-  if(type === 'warehouse') {
-
+  if(type === 'physicalWarehouse') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
+      filter: 'qp-nameAndCode-like', // 过滤参数
+      mappingTextField: 'physicalWarehouseName',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'warehouseIds',
+    }
+    tableSearchForm = [
+      { name: 'qp-physicalWarehouseName-like', label: '物理仓名称' },
+      { name: 'qp-physicalWarehouseCode-like', label: '物理仓编码' },
+      { name: 'qp-physicalWarehouseType-eq', type: 'select', label: '物理仓类型', initialSource: getDictionarySource('SC00002')  },
+      { name: 'qp-companyCode-eq', 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-isEnable-eq', type: 'select', label: '物理仓状态', initialSource: getDictionarySource('SC00001') },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'qp-companyType-eq': 20,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 3, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择物理仓',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '物理仓编码',
+          dataIndex: 'physicalWarehouseCode',
+        },
+        {
+          title: '物理仓名称',
+          dataIndex: 'physicalWarehouseName',
+        },
+        {
+          title: '物理仓类型',
+          dataIndex: 'physicalWarehouseType',
+          render: (text: number) => getDictionaryTextByValue('SC00002', text),
+        },
+        {
+          title: '物理仓状态',
+          dataIndex: 'isEnable',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        },
+        {
+          title: '所属公司',
+          dataIndex: 'companyName',
+        },
+      ]
+    }
+  }
+  if(type === 'realWarehouse') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/realWarehouse`,
+      filter: 'qp-nameAndCode-like', // 过滤参数
+      mappingTextField: 'realWarehouseName',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'warehouseIds',
+    }
+    tableSearchForm = [
+      { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
+      { name: 'qp-realWarehouseCode-like', label: '逻辑仓编码' },
+      { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
+      { name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001') },
+    ]
+    modalTableProps = {
+      modalTableTitle: '选择逻辑仓',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '逻辑仓编码',
+          dataIndex: 'realWarehouseCode',
+        },
+        {
+          title: '逻辑仓名称',
+          dataIndex: 'realWarehouseName',
+        },
+        {
+          title: '逻辑仓类型',
+          dataIndex: 'realWarehouseType',
+          render: (text: number) => getDictionaryTextByValue('SC00004', text),
+        },
+        {
+          title: '逻辑仓状态',
+          dataIndex: 'isEnable',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        },
+      ]
+    }
   }
 
-  console.log(requestConfig, 'requestConfig')
   return { modalTableProps, requestConfig };
 }

package/src/components/SearchSelect/business/index.md

@@ -36,7 +36,7 @@ export default () => {
     //   mappingTextField: 'name',
     //   mappingValueField: 'code',
     // },   // 非必传，业务字段已根据业务默认默认
-    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' }, // 非必传，下拉框和tableForm下拉框接口前缀，默认为bop的接口
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' }, // 非必传，下拉框和tableForm下拉框接口前缀，默认为bop的接口
     selectProps, // 非必传
     onChange: (value: any) => {
       console.log(value)
@@ -73,15 +73,16 @@ export default () => {
       console.log(value)
       setValue(value)
     },
-    requestConfig: {
-      url: `/bop/api/sku`,
-      filter: 'qp-nameAndCode-like',
-      mappingValueField: 'skuCode',
-      otherParams: {
-        sorter: 'desc-id'
-      }, // 默认参数
-      sourceName: 'skuCode',
-    },
+    // requestConfig: {
+    //   url: `http://test.i-baby.net/bop/api/sku`,
+    //   filter: 'qp-nameAndCode-like',
+    //   mappingValueField: 'skuCode',
+    //   otherParams: {
+    //     sorter: 'desc-id'
+    //   }, // 默认参数
+    //   sourceName: 'skuCode',
+    // },
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' },
     selectProps,
     selectBusinessType: 'skuCommodity',
   };
@@ -93,4 +94,88 @@ export default () => {
   );
 };
 ```
+
+仓库选择器(物理仓) Select-Warehouse-001:
+
+```tsx
+import React, { useState } from 'react';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+export default () => {
+  const selectProps = {
+    mode: 'multiple',
+    maxTagCount: 1,
+    // disabled: true
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    // requestConfig: {
+    //   url: `http://test.i-baby.net/bop/api/physicalWarehouse`,
+    //   filter: 'qp-nameAndCode-like',
+    //   mappingTextField: 'physicalWarehouseName',
+    //   mappingValueField: 'physicalWarehouseCode',
+    //   otherParams: {
+    //     sorter: 'desc-id'
+    //   }, // 默认参数
+    //   sourceName: 'warehouseIds',
+    // },
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' },
+    selectProps,
+    selectBusinessType: 'physicalWarehouse',
+  };
+  
+  return (
+    <div>
+      <BusinessSearchSelect {...props} />
+    </div>
+  );
+};
+```
+
+仓库选择器(逻辑仓) Select-Warehouse-002:
+
+```tsx
+import React, { useState } from 'react';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+export default () => {
+  const selectProps = {
+    mode: 'multiple',
+    maxTagCount: 1,
+    // disabled: true
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    // requestConfig: {
+    //   url: `http://test.i-baby.net/bop/api/realWarehouse`,
+    //   filter: 'qp-nameAndCode-like',
+    //   mappingTextField: 'realWarehouseName',
+    //   mappingValueField: 'realWarehouseCode',
+    //   otherParams: {
+    //     sorter: 'desc-id'
+    //   }, // 默认参数
+    //   sourceName: 'warehouseIds',
+    // },
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' },
+    selectProps,
+    selectBusinessType: 'realWarehouse',
+  };
+  
+  return (
+    <div>
+      <BusinessSearchSelect {...props} />
+    </div>
+  );
+};
+```
 More skills for writing demo: https://d.umijs.org/guide/demo-principle