@bit-sun/business-component 2.1.6 → 2.1.7

package/dist/index.esm.js

@@ -11447,7 +11447,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
   }; // 格式化树选择器数据源
 
 
-  var mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue) {
+  var mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
     var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -11455,9 +11455,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: haveChildren,
+      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
       children: haveChildren ? treeDataItem.children.map(function (i) {
-        return mapSearchTree(i, resKeyValue);
+        return mapSearchTree(i, resKeyValue, disabledJudge);
       }) : []
     };
   };
@@ -11467,8 +11467,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
 
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
+    var disabledJudge;
+
+    if (Object.keys(data).length) {
+      data = [data];
+      disabledJudge = false;
+    }
+
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return mapSearchTree(ites, resKeyValue);
+      return mapSearchTree(ites, resKeyValue, disabledJudge);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -12839,20 +12846,29 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }, // { name: 'qp-employeeNumber-like', label: '员工编码' },
     {
       name: 'qp-code-in',
-      type: 'select',
+      type: 'treeSelect',
       label: '所属组织机构',
       field: {
-        type: 'select',
+        type: 'treeSelect',
         props: {
-          mode: 'multiple',
-          notFoundContent: '暂无数据',
-          allowClear: true,
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
           showSearch: true,
+          allowClear: true,
           showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
           maxTagCount: 1,
-          optionFilterProp: 'children',
-          filterOption: function filterOption(input, option) {
-            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
           }
         }
       }
@@ -12863,10 +12879,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/listNoPage"), {
-      'qp-orgViewCode-eq': 'administrative-organization-view'
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
+      'orgViewCode': 'administrative-organization-view'
     })]).then(function (x) {
-      formatSource(x, 0, 2, tableSearchForm);
+      formatTreeDataSource(x, 0, 2, tableSearchForm, ['code', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '添加员工',

package/dist/index.js

@@ -11461,7 +11461,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
   }; // 格式化树选择器数据源
 
 
-  var mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue) {
+  var mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
     var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -11469,9 +11469,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: haveChildren,
+      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
       children: haveChildren ? treeDataItem.children.map(function (i) {
-        return mapSearchTree(i, resKeyValue);
+        return mapSearchTree(i, resKeyValue, disabledJudge);
       }) : []
     };
   };
@@ -11481,8 +11481,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
 
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
+    var disabledJudge;
+
+    if (Object.keys(data).length) {
+      data = [data];
+      disabledJudge = false;
+    }
+
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return mapSearchTree(ites, resKeyValue);
+      return mapSearchTree(ites, resKeyValue, disabledJudge);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -12853,20 +12860,29 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }, // { name: 'qp-employeeNumber-like', label: '员工编码' },
     {
       name: 'qp-code-in',
-      type: 'select',
+      type: 'treeSelect',
       label: '所属组织机构',
       field: {
-        type: 'select',
+        type: 'treeSelect',
         props: {
-          mode: 'multiple',
-          notFoundContent: '暂无数据',
-          allowClear: true,
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
           showSearch: true,
+          allowClear: true,
           showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
           maxTagCount: 1,
-          optionFilterProp: 'children',
-          filterOption: function filterOption(input, option) {
-            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
           }
         }
       }
@@ -12877,10 +12893,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/listNoPage"), {
-      'qp-orgViewCode-eq': 'administrative-organization-view'
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
+      'orgViewCode': 'administrative-organization-view'
     })]).then(function (x) {
-      formatSource(x, 0, 2, tableSearchForm);
+      formatTreeDataSource(x, 0, 2, tableSearchForm, ['code', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '添加员工',

package/package.json

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

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

@@ -35,7 +35,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
 
   // 格式化树选择器数据源
-  const mapSearchTree = (treeDataItem: any, resKeyValue: any) => {
+  const mapSearchTree = (treeDataItem: any, resKeyValue: any, disabledJudge?: any) => {
     const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
@@ -43,16 +43,21 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: haveChildren,
-      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue)) : [],
+      disabled: disabledJudge!==undefined? disabledJudge : haveChildren,
+      children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i, resKeyValue, disabledJudge)) : [],
     };
   };
   const formatTreeDataSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['id', 'name']) => {
-    const data = reData && reData[position]?.data;
+    let data = reData && reData[position]?.data;
+    let disabledJudge;
+    if(Object.keys(data).length) {
+      data = [data];
+      disabledJudge=false
+    }
     const formatData = (data &&
       Array.isArray(data) &&
       data.length &&
-      data.map((ites: any) => mapSearchTree(ites, resKeyValue))) ||
+      data.map((ites: any) => mapSearchTree(ites, resKeyValue, disabledJudge))) ||
     []
     changeSearchForm[changePosition].field.props.treeData = formatData;
   }
@@ -1296,27 +1301,33 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       { name: 'qp-username-like', label: '账户名称' },
       { name: 'qp-name-like', label: '显示名称' },
         // { name: 'qp-employeeNumber-like', label: '员工编码' },
-      { name: 'qp-code-in', type: 'select', label: '所属组织机构', field: {
-          type: 'select',
+      { name: 'qp-code-in', type: 'treeSelect', label: '所属组织机构', field: {
+          type: 'treeSelect',
           props: {
-            mode: 'multiple',
-            notFoundContent: '暂无数据',
-            allowClear: true,
+            multiple: true,
+            treeData: [],
+            treeCheckable: false,
             showSearch: true,
+            allowClear: true,
             showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
             maxTagCount: 1,
-            optionFilterProp: 'children',
-            filterOption: (input: string, option: { props: { children: string } }) =>
-              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            showCheckedStrategy: 'TreeSelect.SHOW_ALL',
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
       { name: 'qp-email-like', label: '邮箱' },
       { name: 'qp-officeTelephone-like', label: '手机号' },
     ]
     Promise.all([
-      loadSelectSource(`${prefixUrl.formSelectFix}/orgViewNode/listNoPage`, { 'qp-orgViewCode-eq': 'administrative-organization-view' }),
+      loadSelectSource(`${prefixUrl.formSelectFix}/orgViewNode/common/getTreeForOrgViewAndTenant`, { 'orgViewCode': 'administrative-organization-view' }),
     ]).then((x: any)=>{
-      formatSource(x,0, 2, tableSearchForm);
+      formatTreeDataSource(x,0, 2, tableSearchForm,['code', 'name']);
     })
     modalTableProps = {
       modalTableTitle: '添加员工',