@bit-sun/business-component 2.1.23 → 2.2.0-alpha.1

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

@@ -1,6 +1,3 @@
-export const handleSourceName = (sName: any) => {
-  if(Array.isArray(sName) && sName.length===2 && sName[0]==='extensionFields') {
-    return sName[1]
-  }
-  return sName
-}
+export const handleSourceName = (sName: any) => {
+  return sName
+}

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

@@ -1,47 +1,47 @@
----
-nav:
-  title: '组件'
-  order: 1
-group:
-  title: 功能组件
-  order: 0
-title: 树型选择器
-order: 4
----
-
-## TreeSearchSelect
-
-部门选择器Demo:
-
-```tsx
-import React, { useState } from 'react';
-import { TreeSearchSelect } from '../../../index';
-
-export default () => {
-
-  const [value, setValue] = useState();
-  
-  const props = {
-    mode: 'create',
-    remoteSource: {
-      url: `/user/orgViewNode/common/getTreeForOrgViewAndTenant`,
-      initialParams: { 'orgViewCode': 'administrative-organization-view' },
-      resKeyValue: ['code', 'name'],
-    },
-    value,
-    isChoose: false, // 控制是否父节点可选中，默认不可选中
-    treeCheckable: true,
-    onChange: (v) => {
-      setValue(v)
-    }
-  };
-
-  return (
-    <div>
-      <TreeSearchSelect {...props} />
-    </div>
-  );
-};
-```
-
-More skills for writing demo: https://d.umijs.org/guide/demo-principle
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 功能组件
+  order: 0
+title: 树型选择器
+order: 4
+---
+
+## TreeSearchSelect
+
+部门选择器Demo:
+
+```tsx
+import React, { useState } from 'react';
+import { TreeSearchSelect } from '../../../index';
+
+export default () => {
+
+  const [value, setValue] = useState();
+  
+  const props = {
+    mode: 'create',
+    remoteSource: {
+      url: `/user/orgViewNode/common/getTreeForOrgViewAndTenant`,
+      initialParams: { 'orgViewCode': 'administrative-organization-view' },
+      resKeyValue: ['code', 'name'],
+    },
+    value,
+    isChoose: false, // 控制是否父节点可选中，默认不可选中
+    treeCheckable: true,
+    onChange: (v) => {
+      setValue(v)
+    }
+  };
+
+  return (
+    <div>
+      <TreeSearchSelect {...props} />
+    </div>
+  );
+};
+```
+
+More skills for writing demo: https://d.umijs.org/guide/demo-principle

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

@@ -1,149 +1,160 @@
-import React, { useState, useEffect } from 'react';
-import { TreeSelect, Tooltip, Tag } from 'antd';
-import axios from 'axios';
-import { stringify } from 'querystring';
-
-const TreeSearchSelect = (props: any) => {
-  const [treeData, setTreeData] = useState([]);
-  const {
-    ctx,                      // ctx中有自己的name
-    value,
-    valueName,   // 当labelInValue为true时，值为null
-    onChange,
-    onChangeName, // 当labelInValue为true时，此函数无意义，故无需传
-    placeholder,
-    remoteSource,
-    initialValue,
-    treeCheckable = false,
-    showSearch = true,
-    maxTagCount = 1,
-    multiple = false,
-    isChoose = false,
-    mode,
-    getPopupContainer,
-    labelInValue = false,
-    showArrow = true,
-    allowClear = true,
-    showCheckedStrategy = TreeSelect.SHOW_PARENT,
-    style = { width: '100%' },
-    getTreeData,
-    disabled
-  } = props;
-
-  const {
-    url,
-    paramsKey = 'qp-name-like',
-    resKeyValue = ['id', 'name'],
-    initialParams = {},
-  } = remoteSource;
-
-  const mapSearchTree = (treeDataItem: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
-    return {
-      title: treeDataItem[resKeyValue[1]],
-      key: treeDataItem[resKeyValue[0]],
-      value: treeDataItem[resKeyValue[0]],
-      parentId: treeDataItem.parent,
-      data: { ...treeDataItem },
-      isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren),
-      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i)) : [],
-    };
-  };
-
-  const isDisabled = (children: any) => {
-    if (isChoose) {
-      return false;
-    }
-    return children;
-  }
-
-  /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
-  const handleSearch = (q: string) => {
-    const paramsData = {
-      [`${paramsKey}`]: q,
-      ...initialParams,
-    }
-    axios.get(`${url}?${stringify(paramsData)}`).then(async (res: any) => {
-      const resData = res?.data || [];
-      let coverData;
-
-      if(resData.status === '0') {
-        const { data } = resData;
-        if (remoteSource.converter) {
-          coverData = await remoteSource.converter({ data: [data] })
-        } else {
-          const dataList = (data && Array.isArray(data)) ? data : (data && [data] || []);
-          coverData = dataList.length && dataList.map((ites: any) => mapSearchTree(ites)) || [];
-        }
-      } else {
-        coverData = []
-      }
-
-      setTreeData(coverData);
-      ctx?.form?.setFieldSource(ctx.name, coverData);
-    });
-  };
-
-  const handleChange = (data: any, dataName: any) => {
-    onChange(data);
-    onChangeName && onChangeName(dataName);
-    getTreeData && getTreeData(treeData); // 把树节点暴露出去
-    ctx?.form?.setFieldValue(ctx.name, data);
-  };
-
-  useEffect(() => {
-    handleSearch(initialValue);
-  }, []);
-
-  const maxTagPlaceholder = (selectedValues: any) => {
-    const onClose = (e: any,item: any) => {
-      e.preventDefault();
-      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value): JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
-      const newValueName = labelInValue ? null: JSON.parse(JSON.stringify(valueName)).filter((i: any) => i !== item.label)
-      handleChange(newValue, newValueName);
-    }
-    return (
-      <Tooltip title={selectedValues.map((i: any) => (
-        <Tag
-          closable={true}
-          onClose={(e) => onClose(e,i)}
-          style={{ marginRight: 3, background: '#f5f5f5', height: '24px', border: '1px solid #f0f0f0' }}
-        >
-          {i.label}
-        </Tag>
-      ))}>
-        {`+ ${selectedValues?.length}`}
-      </Tooltip>
-    )
-  }
-
-  return (
-    <div className={'tree_search_select'}>
-      <TreeSelect
-        treeCheckable={treeCheckable}
-        maxTagCount={maxTagCount}
-        showSearch={showSearch}
-        style={style}
-        value={value}
-        dropdownStyle={{ maxHeight: 400, maxWidth: 100, overflow: 'auto' }}
-        treeData={treeData}
-        placeholder={placeholder}
-        allowClear={allowClear}
-        labelInValue={labelInValue}
-        showArrow={showArrow}
-        showCheckedStrategy={showCheckedStrategy}
-        treeNodeFilterProp={'title'}
-        treeDefaultExpandAll
-        multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
-        maxTagPlaceholder={maxTagPlaceholder}
-        onChange={handleChange}
-        disabled={disabled || mode==='view' || ctx?.mode === 'view'}
-        getPopupContainer={() => (getPopupContainer && getPopupContainer()) || document.body}
-      >
-      </TreeSelect>
-    </div>
-  );
-};
-
-export default TreeSearchSelect;
+import React, { useState, useEffect } from 'react';
+import { TreeSelect, Tooltip, Tag } from 'antd';
+import axios from 'axios';
+import { stringify } from 'querystring';
+import _ from "lodash"
+
+const TreeSearchSelect = (props: any) => {
+  const [treeData, setTreeData] = useState([]);
+  const {
+    ctx,                      // ctx中有自己的name
+    value,
+    valueName,   // 当labelInValue为true时，值为null
+    onChange,
+    onChangeName, // 当labelInValue为true时，此函数无意义，故无需传
+    placeholder,
+    remoteSource,
+    initialValue,
+    treeCheckable = false,
+    showSearch = true,
+    maxTagCount = 1,
+    multiple = false,
+    isChoose = false,
+    mode,
+    getPopupContainer,
+    labelInValue = false,
+    showArrow = true,
+    allowClear = true,
+    showCheckedStrategy = TreeSelect.SHOW_PARENT,
+    style = { width: '100%' },
+    getTreeData,
+    disabled
+  } = props;
+
+  const {
+    url,
+    paramsKey = 'qp-name-like',
+    resKeyValue = ['id', 'name'],
+    initialParams = {},
+  } = remoteSource;
+
+  const mapSearchTree = (treeDataItem: any) => {
+    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    return {
+      title: treeDataItem[resKeyValue[1]],
+      key: treeDataItem[resKeyValue[0]],
+      value: treeDataItem[resKeyValue[0]],
+      parentId: treeDataItem.parent,
+      data: { ...treeDataItem },
+      isLeaf: !haveChildren,
+      disabled: isDisabled(haveChildren),
+      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i)) : [],
+    };
+  };
+
+  const isDisabled = (children: any) => {
+    if (isChoose) {
+      return false;
+    }
+    return children;
+  }
+
+  /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
+  const handleSearch = (q: string) => {
+    const paramsData = {
+      [`${paramsKey}`]: q,
+      ...initialParams,
+    }
+    axios.get(`${url}?${stringify(paramsData)}`).then(async (res: any) => {
+      const resData = res?.data || [];
+      let coverData;
+
+      if(resData.status === '0') {
+        const { data } = resData;
+        if (remoteSource.converter) {
+          coverData = await remoteSource.converter({ data: [data] })
+        } else {
+          const dataList = (data && Array.isArray(data)) ? data : (data && [data] || []);
+          coverData = dataList.length && dataList.map((ites: any) => mapSearchTree(ites)) || [];
+        }
+      } else {
+        coverData = []
+      }
+
+      setTreeData(coverData);
+      ctx?.form?.setFieldSource(ctx.name, coverData);
+    });
+  };
+
+  const formatData = (value: any) => {
+    if (labelInValue) {
+      const formatResult = multiple ? value.map((i: any) => ({...i, key: i.value})) : { ...value, key: value?.value };
+      return formatResult
+    } else {
+      const formatResult = multiple ? value.map((i: any) => (i?.value || i)) : (_.get(value[0], 'value') || value)
+      return formatResult
+    }
+  }
+  const handleChange = (data: any, dataName: any) => {
+    const handleData = formatData(data);
+    onChange(handleData,data);
+    onChangeName && onChangeName(dataName);
+    getTreeData && getTreeData(treeData); // 把树节点暴露出去
+    ctx?.form?.setFieldValue(ctx.name, handleData);
+  };
+
+  useEffect(() => {
+    handleSearch(initialValue);
+  }, []);
+
+  const maxTagPlaceholder = (selectedValues: any) => {
+    const onClose = (e: any,item: any) => {
+      e.preventDefault();
+      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value): JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
+      const newValueName = labelInValue ? null: JSON.parse(JSON.stringify(valueName)).filter((i: any) => i !== item.label)
+      handleChange(newValue, newValueName);
+    }
+    return (
+      <Tooltip title={selectedValues.map((i: any) => (
+        <Tag
+          closable={true}
+          onClose={(e) => onClose(e,i)}
+          style={{ marginRight: 3, background: '#f5f5f5', height: '24px', border: '1px solid #f0f0f0' }}
+        >
+          {i.label}
+        </Tag>
+      ))}>
+        {`+ ${selectedValues?.length}`}
+      </Tooltip>
+    )
+  }
+
+  return (
+    <div className={'tree_search_select'}>
+      <TreeSelect
+        treeCheckable={treeCheckable}
+        maxTagCount={maxTagCount}
+        showSearch={showSearch}
+        style={style}
+        value={value}
+        dropdownStyle={{ maxHeight: 400, maxWidth: 100, overflow: 'auto' }}
+        treeData={treeData}
+        placeholder={placeholder}
+        allowClear={allowClear}
+        labelInValue={labelInValue}
+        showArrow={showArrow}
+        showCheckedStrategy={showCheckedStrategy}
+        treeNodeFilterProp={'title'}
+        treeDefaultExpandAll
+        multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
+        maxTagPlaceholder={maxTagPlaceholder}
+        onChange={handleChange}
+        disabled={disabled || mode==='view' || ctx?.mode === 'view'}
+        getPopupContainer={() => (getPopupContainer && getPopupContainer()) || document.body}
+      >
+      </TreeSelect>
+    </div>
+  );
+};
+
+export default TreeSearchSelect;

package/src/index.ts

@@ -1,32 +1,34 @@
-/*
- * @Description:
- * @Author: rodchen
- * @Date: 2021-11-30 22:59:39
- * @LastEditTime: 2022-01-14 16:10:27
- * @LastEditors: rodchen
- */
-// import 'antd/dist/antd.css';
-import './utils/index';
-
-export { default as DataValidation } from './components/Functional/DataValidation';
-export { default as DataImport } from './components/Functional/DataImport';
-export { default as QueryMutipleInput } from './components/Functional/QueryMutipleInput';
-export { default as SearchSelect } from './components/Functional/SearchSelect';
-export { default as AddSelect } from './components/Functional/AddSelect';
-export { default as BillEntry } from './components/Functional/BillEntry';
-export { default as BusinessSearchSelect } from './components/Business/SearchSelect';
-export * from './components/Business/AddSelectBusiness';
-export { default as CommodityEntry } from './components/Business/CommodityEntry';
-export { default as CheckOneUser } from './utils/CheckOneUser';
-export { default as TreeSearchSelect } from './components/Functional/TreeSearchSelect';
-export { default as BusinessTreeSearchSelect } from './components/Business/TreeSearchSelect';
-export { default as StateFlow } from './components/Business/StateFlow';
-export { default as GuideWrapper } from './components/Business/CommonGuideWrapper';
-export { default as ExportIcon } from './components/Functional/ExportFunctions/ExportIcon';
-export { default as SulaColumnSettingTable} from './components/Business/columnSettingTable/sulaSettingTable';
-export { default as ColumnSettingTable} from './components/Business/columnSettingTable';
-export { default as DetailPageWrapper } from './components/Business/DetailPageWrapper';
-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';
+/*
+ * @Description:
+ * @Author: rodchen
+ * @Date: 2021-11-30 22:59:39
+ * @LastEditTime: 2022-01-14 16:10:27
+ * @LastEditors: rodchen
+ */
+// import 'antd/dist/antd.css';
+import './utils/index';
+
+export { default as DataValidation } from './components/Functional/DataValidation';
+export { default as DataImport } from './components/Functional/DataImport';
+export { default as QueryMutipleInput } from './components/Functional/QueryMutipleInput';
+export { default as SearchSelect } from './components/Functional/SearchSelect';
+export { default as AddSelect } from './components/Functional/AddSelect';
+export { default as BillEntry } from './components/Functional/BillEntry';
+export { default as BusinessSearchSelect } from './components/Business/SearchSelect';
+export * from './components/Business/AddSelectBusiness';
+export { default as CommodityEntry } from './components/Business/CommodityEntry';
+export { default as CheckOneUser } from './utils/CheckOneUser';
+export { default as TreeSearchSelect } from './components/Functional/TreeSearchSelect';
+export { default as BusinessTreeSearchSelect } from './components/Business/TreeSearchSelect';
+export { default as StateFlow } from './components/Business/StateFlow';
+export { default as GuideWrapper } from './components/Business/CommonGuideWrapper';
+export { default as ExportIcon } from './components/Functional/ExportFunctions/ExportIcon';
+export { default as SulaColumnSettingTable} from './components/Business/columnSettingTable/sulaSettingTable';
+export { default as ColumnSettingTable} from './components/Business/columnSettingTable';
+export { default as DetailPageWrapper } from './components/Business/DetailPageWrapper';
+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 JsonQueryTable } from './components/Business/JsonQueryTable';
+export { default as TableColumnSetting} from './plugin/TableColumnSetting';