@bit-sun/business-component 2.1.1-alpha.21 → 2.1.1-alpha.22

package/src/components/Business/JsonQueryTable/static.ts

@@ -0,0 +1,356 @@
+const normalSingleSelectProps = {
+  placeholder: '请选择',
+  allowClear: true,
+  sourceName: 'defaultValue',
+};
+
+const normalMultipleSelectProps = {
+  placeholder: '请选择',
+  allowClear: true,
+  sourceName: 'defaultValue',
+  selectProps: {
+    mode: 'multiple',
+  },
+};
+// inputType显示类型 10输入框 20单选 30多选 40公式 |||||  valueType字段类型
+export const inputTypes:any = {
+  20: {
+    10: {
+      type: 'select',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    20: {
+      type: 'select',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    30: {
+      type: 'select',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    110: {
+      type: 'bs-physicalWarehouseSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: {
+          mappingValueField: 'physicalWarehouseCode',
+        },
+      },
+    },
+    120: {
+      type: 'bs-realWarehouseSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: {
+          mappingValueField: 'realWarehouseCode',
+        },
+      },
+    },
+    130: {
+      type: 'bs-virtualWarehouseSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: {
+          mappingValueField: 'virtualWarehouseCode',
+        },
+      },
+    },
+    140: {
+      type: 'bs-channelWarehouseSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: {
+          mappingValueField: 'channelWarehouseCode',
+        },
+      },
+    },
+    150: {
+      type: 'bs-spuCommoditySearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    160: {
+      type: 'bs-skuCommoditySearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+
+    210: {
+      // 行政组织
+      type: 'bs-departmentOrgSelect',
+      props: {
+        treeCheckable: false,
+        ...normalSingleSelectProps,
+      },
+    },
+    220: {
+      // 采购组织
+      type: 'bs-purchaseOrgSelect',
+      props: {
+        treeCheckable: false,
+        ...normalSingleSelectProps,
+      },
+    },
+    230: {
+      // 销售组织
+      type: 'bs-salesOrgSelect',
+      props: {
+        treeCheckable: false,
+        ...normalSingleSelectProps,
+      },
+    },
+    240: {
+      type: 'bs-supplierSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    250: {
+      type: 'bs-customerSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    260: {
+      type: 'bs-shopFileSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+    270: {
+      type: 'bs-employeeSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+        requestConfig: { mappingValueField: 'employeeNumber' },
+      },
+    },
+    280: {
+      // 库存组织
+      type: 'bs-stockOrgSelect',
+      props: {
+        treeCheckable: false,
+        ...normalSingleSelectProps,
+      },
+    },
+    310: {
+      type: 'bs-deliveryModeSearchSelect',
+      props: {
+        ...normalSingleSelectProps,
+      },
+    },
+  },
+  30: {
+    10: {
+      type: 'select',
+      props: {
+        mode: 'multiple',
+        ...normalMultipleSelectProps,
+      },
+    },
+    20: {
+      type: 'select',
+      props: {
+        mode: 'multiple',
+        ...normalMultipleSelectProps,
+      },
+    },
+    30: {
+      type: 'select',
+      props: {
+        mode: 'multiple',
+        ...normalSingleSelectProps,
+      },
+    },
+    110: {
+      type: 'bs-physicalWarehouseSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          mappingValueField: 'physicalWarehouseCode',
+          filter: 'qp-physicalWarehouseName,physicalWarehouseCode-orGroup,in',
+        },
+      },
+    },
+    120: {
+      type: 'bs-realWarehouseSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          mappingValueField: 'realWarehouseCode',
+          filter: 'qp-realWarehouseName,realWarehouseCode-orGroup,in',
+        },
+      },
+    },
+    130: {
+      type: 'bs-virtualWarehouseSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          mappingValueField: 'virtualWarehouseCode',
+          filter: 'qp-virtualWarehouseName,virtualWarehouseCode-orGroup,in',
+        },
+      },
+    },
+    140: {
+      type: 'bs-channelWarehouseSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          mappingValueField: 'channelWarehouseCode',
+          filter: 'qp-channelWarehouseName,channelWarehouseCode-orGroup,in',
+        },
+      },
+    },
+    150: {
+      type: 'bs-spuCommoditySearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          filter: 'qp-itemCode,name-orGroup,in',
+        },
+      },
+    },
+    160: {
+      type: 'bs-skuCommoditySearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+      },
+    },
+
+    210: {
+      // 行政组织
+      type: 'bs-departmentOrgSelect',
+      props: {
+        treeCheckable: true,
+        ...normalMultipleSelectProps,
+      },
+    },
+    220: {
+      // 采购组织
+      type: 'bs-purchaseOrgSelect',
+      props: {
+        treeCheckable: true,
+        ...normalMultipleSelectProps,
+      },
+    },
+    230: {
+      // 销售组织
+      type: 'bs-salesOrgSelect',
+      props: {
+        treeCheckable: true,
+        ...normalMultipleSelectProps,
+      },
+    },
+    240: {
+      type: 'bs-supplierSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          filter: 'qp-name,code-orGroup,in',
+        },
+      },
+    },
+    250: {
+      type: 'bs-customerSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: { filter: 'qp-name,code-orGroup,in' },
+      },
+    },
+    260: {
+      type: 'bs-shopFileSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: { filter: 'qp-name,code-orGroup,in' },
+      },
+    },
+    270: {
+      type: 'bs-employeeSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: { mappingValueField: 'employeeNumber' },
+      },
+    },
+    280: {
+      // 库存组织
+      type: 'bs-stockOrgSelect',
+      props: {
+        treeCheckable: true,
+        ...normalMultipleSelectProps,
+      },
+    },
+    310: {
+      type: 'bs-deliveryModeSearchSelect',
+      props: {
+        ...normalMultipleSelectProps,
+        requestConfig: {
+          filter: 'qp-name,code-orGroup,in',
+        },
+      },
+    },
+  },
+};
+
+export const PARAMS_VALUE_TYPE_ENUM = {
+  FIXED_VALUE: 'fixed',
+  EXPRESSION: 'expression',
+  CONFIGURATION_VALUES: 'config'
+}
+
+export const paramsValueType = Object.freeze({
+  fixed: '固定值',
+  expression: '表达式',
+  config: '配置值',
+});
+
+export const choiceType = Object.freeze({
+  10: '自定义',
+  20: '数据字典',
+  30: '动态数据字典',
+  110: '仓库选择器（物理仓）',
+  120: '仓库选择器（逻辑仓）',
+  130: '仓库选择器（虚拟仓）',
+  140: '仓库选择器（渠道仓）',
+  150: '商品SPU选择器',
+  160: '商品SKU选择器',
+  190: '省市区',
+
+  210: '行政组织选择器',
+  220: '采购组织选择器',
+  230: '销售组织选择器',
+  240: '供应商选择器',
+  250: '客户选择器',
+  260: '店铺选择器',
+  270: '员工选择器',
+  280: '库存组织选择器',
+
+  310: '配送方式选择器',
+  330: '变量'
+});
+export const inputType:any ={
+  10: '输入',
+  20: '单选',
+  30: '多选',
+  40: '公式',
+};
+export const valueType:any = {
+  10: '文本',
+  20: '短整数',
+  21: '长整数',
+  22: '小数',
+  30: '日期',
+  31: '时间',
+  32: '日期时间',
+};
+
+export const moduleType = [
+  { text: '计划模型', value: 1 },
+  { text: '元数据对象', value: 2 },
+]

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

@@ -626,7 +626,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     needModalTable = false
   }
 
-  // 仓库选择器（物理、逻辑仓）
+  // 仓库选择器（物理、逻辑仓、运营仓）
   if(type === 'physicalWarehouse') {
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
@@ -734,6 +734,63 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       ...modalTableBusProps,
     }
   }
+  if(type === 'ownerWarehouse') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/ownerWarehouse`,
+      filter: 'qp-name,operationWarehouseCode-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'operationWarehouseCode',
+      mappingValueField: 'operationWarehouseCode',
+      otherParams: {
+        'qp-status-eq': 1,
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'qp-operationWarehouseCode-in',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '运营仓名称' },
+      { name: 'qp-operationWarehouseCode-like', label: '运营仓编码' },
+      { name: 'qp-groupCode-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,
+          },
+        } },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择运营仓',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '运营仓编码',
+          dataIndex: 'operationWarehouseCode',
+        },
+        {
+          title: '运营仓名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '运营组',
+          dataIndex: 'groupName',
+        },
+      ],
+      ...modalTableBusProps,
+    }
+  }
 
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
   if(type === 'virtualWarehouse') {
@@ -1474,5 +1531,56 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+  // 规则场景选择器
+  if(type === 'ruleTemplate') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/ruleTemplate`,
+      filter: 'qp-name,code-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'ruleTemplateCode',
+      ...requestConfigProp
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '规则场景名称' },
+      { name: 'qp-code-like', label: '规则场景编码' },
+    ]
+    modalTableProps = {
+      modalTableTitle: '选择规则场景',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '规则场景编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '规则场景名称',
+          dataIndex: 'name',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          title: '条件对象',
+          dataIndex: 'objectName',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'extName',
+          title: '条件扩展',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'actionName',
+          title: '执行动作',
+          render: (text: any) => handleTextOverflow(text),
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   return { modalTableProps, requestConfig, needModalTable };
 }

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

@@ -464,6 +464,63 @@ export default () => {
 };
 ```
 
+## 仓库选择器(运营仓) Select-Warehouse-005
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+const { TabPane } = Tabs;
+
+export default () => {
+  const selectProps = {
+    // mode: 'multiple',
+    // maxTagCount: 1,
+    // disabled: true
+  }
+  const selectPropsMultiple = {
+    mode: 'multiple',
+    maxTagCount: 1,
+  }
+
+  const [ tabKey, setTabKey ] = useState('single')
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    selectProps,
+    selectBusinessType: 'ownerWarehouse',
+  };
+
+  const onTabChange = (key) => {
+    setTabKey(key)
+    setValue(key === 'single' ? null: [])
+  }
+  
+  return (
+    <div>
+      <Tabs onChange={onTabChange} activeKey={tabKey}>
+        <TabPane tab='单选' key='single'>
+          {tabKey === 'single' && (
+            <BusinessSearchSelect {...props} />
+          )}
+        </TabPane>
+        <TabPane tab='多选' key='multiple'>
+          {tabKey === 'multiple' && (
+            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+          )}
+        </TabPane>
+      </Tabs>
+    </div>
+  );
+};
+```
+
 ## 仓库选择器(虚拟仓) Select-Warehouse-003
 
 ```tsx
@@ -1135,3 +1192,63 @@ export default () => {
 ```
 
 More skills for writing demo: https://d.umijs.org/guide/demo-principle
+
+
+## 规则场景选择器 Select-GZCJ-001
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+const { TabPane } = Tabs;
+
+export default () => {
+  const selectProps = {
+    // mode: 'multiple',
+    // maxTagCount: 1,
+    // disabled: true
+  }
+  const selectPropsMultiple = {
+    mode: 'multiple',
+    maxTagCount: 1,
+  }
+
+  const [ tabKey, setTabKey ] = useState('single')
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    selectProps,
+    selectBusinessType: 'ruleTemplate',
+  };
+
+  const onTabChange = (key) => {
+    setTabKey(key)
+    setValue(key === 'single' ? null: [])
+  }
+  
+  return (
+    <div>
+      <Tabs onChange={onTabChange} activeKey={tabKey}>
+        <TabPane tab='单选' key='single'>
+          {tabKey === 'single' && (
+            <BusinessSearchSelect {...props} />
+          )}
+        </TabPane>
+        <TabPane tab='多选' key='multiple'>
+          {tabKey === 'multiple' && (
+            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+          )}
+        </TabPane>
+      </Tabs>
+    </div>
+  );
+};
+```
+
+More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/Business/SearchSelect/utils.ts

@@ -81,13 +81,13 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity':
       result =  '/items';
       break;
-    case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse':
+    case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse': case 'ownerWarehouse':
       result =  '/stock';
       break;
     case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2':
       result =  '/user';
       break;
-    case 'deliveryMode':
+    case 'deliveryMode': case 'ruleTemplate':
       result =  '/basic';
       break;
     default:

package/src/components/Functional/AddSelect/index.md

@@ -53,6 +53,38 @@ export default () => {
     tableSearchForm: [
       { name: 'qp-name-like', label: 'SKU名称' }, // field: { type: 'input', props: { placeholder: '8888'}}
       { name: 'qp-code-like', label: 'SKU编码' },
+      { 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' }
+          },
+        } }
     ],
     tableColumns: [
       {

package/src/components/Functional/BillEntry/index.tsx

@@ -319,7 +319,6 @@ const InputElement = ({
               dom = null
             }
             if (e.keyCode === 40) {  // 向下
-              debugger
               e.stopPropagation();
               e.preventDefault();
               let dom = e.nativeEvent.path[3].children[index + 2]?.getElementsByTagName('input')[currentIndex]

package/src/index.ts

@@ -29,4 +29,6 @@ export { default as DetailPageWrapper } from './components/Business/DetailPageWr
 export { default as HomePageWrapper } from './components/Business/HomePageWrapper';
 export { default as BsSulaQueryTable } from './components/Business/BsSulaQueryTable';
 export { default as BsLayout } from './components/Business/BsLayouts';
-export { default as MoreTreeTable } from './components/Business/moreTreeTable';
+export { default as MoreTreeTable } from './components/Business/moreTreeTable';;
+export { default as JsonQueryTable } from './components/Business/JsonQueryTable';
+

package/src/utils/getFormMode.js

@@ -0,0 +1,12 @@
+const getFormMode = props => {
+  let mode = 'create';
+  const { path } = props.match;
+  if (path.includes('edit')) {
+    mode = 'edit';
+  } else if (path.includes('view') || path.includes('detail')) {
+    mode = 'view';
+  }
+  return mode;
+};
+
+export default getFormMode;

package/src/utils/serialize.js

@@ -0,0 +1,7 @@
+import serialize from 'serialize-javascript';
+
+export default serialize;
+
+export const deserialize = data => {
+  return eval('(' + data + ')');
+};