wt-enjoy-link-antd-repack 4.1.57 → 4.1.58

package/dist/esm/component/BiuField/component/DepartOrgSelect/hooks/useConvertUnSubValue.d.ts

@@ -1,2 +1,2 @@
-declare const _default: ({ value, onChange }: any, { defaultValue, multiple }: any) => (((data: any) => void) | undefined)[];
+declare const _default: ({ value, onChange }: any, { defaultValue, multiple, treeData }: any) => any[];
 export default _default;

package/dist/esm/component/BiuField/component/DepartOrgSelect/hooks/useConvertUnSubValue.js

@@ -1,16 +1,34 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { unionBy } from 'lodash';
 import { useCallback, useEffect, useState } from 'react';
+var filterCurrentNodeWithSubNode = function filterCurrentNodeWithSubNode() {
+  var treeDataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var currentNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var subNode = [];
+  var currentSubNode = treeDataSource.filter(function (n) {
+    return currentNodes.some(function (cn) {
+      return n.pId === cn.id;
+    });
+  });
+  subNode = [].concat(_toConsumableArray(subNode), _toConsumableArray(currentNodes), _toConsumableArray(currentSubNode), _toConsumableArray(currentSubNode.length > 0 ? filterCurrentNodeWithSubNode(treeDataSource, currentSubNode) : []));
+  return unionBy(subNode, 'id');
+};
 export default (function (_ref, _ref2) {
   var value = _ref.value,
     onChange = _ref.onChange;
   var defaultValue = _ref2.defaultValue,
-    multiple = _ref2.multiple;
+    multiple = _ref2.multiple,
+    treeData = _ref2.treeData;
   /**
    * 机构树组件的数据绑定值，如果是多选，那么就是一个数组，如果是单选，那么就是一个数字
    */
@@ -20,13 +38,11 @@ export default (function (_ref, _ref2) {
     setState = _useState2[1];
   var InChangeTrigger = useCallback(function (data) {
     if (!data) return data;
-    if (multiple) {
-      return "".concat(data).split(',').map(function (n) {
-        return {
-          value: !Number.isNaN(+n) ? +n : undefined
-        };
-      });
-    }
+    if (multiple) return "".concat(data).split(',').map(function (n) {
+      return {
+        value: !Number.isNaN(+n) ? +n : undefined
+      };
+    });
     if (!Number.isNaN(+data)) return +data;
     return undefined;
   }, [multiple]);
@@ -58,15 +74,15 @@ export default (function (_ref, _ref2) {
       /**
        * 内部初始化默认值，需要给外面一份
        */
-      if (Array.isArray(inValue) && ((_inValue$ = inValue[0]) === null || _inValue$ === void 0 ? void 0 : _inValue$.value) === +defaultValue && onChange) {
-        onChange(OutChangeTrigger(inValue));
+      if (Array.isArray(inValue) && ((_inValue$ = inValue[0]) === null || _inValue$ === void 0 ? void 0 : _inValue$.value) === +defaultValue) {
+        if (onChange) onChange(OutChangeTrigger(inValue));
       }
     } else {
       /**
        * 同上
        */
-      if (inValue === +defaultValue && onChange) {
-        onChange(OutChangeTrigger(inValue));
+      if (inValue === +defaultValue) {
+        if (onChange) onChange(OutChangeTrigger(inValue));
       }
     }
     setState(function (ss) {
@@ -92,9 +108,39 @@ export default (function (_ref, _ref2) {
       return inValue;
     });
   }, [InChangeTrigger, OutChangeTrigger, defaultValue, multiple, onChange, value]);
-  var changeTrigger = useCallback(function (data) {
-    setState(data);
-    if (onChange) onChange(OutChangeTrigger(data));
-  }, [OutChangeTrigger, onChange]);
+  var changeTrigger = useCallback(function (_data, _label, _ref3) {
+    var checked = _ref3.checked,
+      triggerValue = _ref3.triggerValue;
+    setState(function () {
+      var currentState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      if (multiple) {
+        var mergeDepartData = [];
+        var currentTriggerNode = treeData === null || treeData === void 0 ? void 0 : treeData.filter(function (n) {
+          return n.id === triggerValue;
+        });
+        var filterSubNodeData = (filterCurrentNodeWithSubNode(treeData, currentTriggerNode) || []).map(function (n) {
+          return {
+            value: n.id,
+            label: n.title
+          };
+        });
+        if (checked) {
+          mergeDepartData = unionBy([].concat(_toConsumableArray(currentState), _toConsumableArray(filterSubNodeData)), 'value') || [];
+        }
+        if (!checked) {
+          mergeDepartData = currentState === null || currentState === void 0 ? void 0 : currentState.filter(function (n) {
+            return !filterSubNodeData.some(function (sn) {
+              return sn.value === n.value;
+            });
+          });
+        }
+        if (onChange) onChange(OutChangeTrigger(mergeDepartData));
+        return mergeDepartData;
+      } else {
+        if (onChange) onChange(OutChangeTrigger(_data));
+        return _data;
+      }
+    });
+  }, [OutChangeTrigger, multiple, onChange, treeData]);
   return [state, changeTrigger];
 });

package/dist/esm/component/BiuField/component/DepartOrgSelect/index.js

@@ -68,7 +68,8 @@ var UnSubDepartSelect = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(functio
     }, {
       defaultValue: defaultActiveCurrentOrg ? userDepartID : undefined,
       multiple: multiple,
-      treeCheckStrictly: treeCheckStrictly
+      treeCheckStrictly: treeCheckStrictly,
+      treeData: treeData
     }),
     _useConvertUnSubValue2 = _slicedToArray(_useConvertUnSubValue, 2),
     state = _useConvertUnSubValue2[0],

package/dist/esm/component/BiuField/component/TableSelectLocal/addressSelect.d.ts

@@ -15,7 +15,7 @@ declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponen
     initialValue?: number | undefined;
     searchTimes?: number | undefined;
     rowLabel?: string | undefined;
-    addresstype?: "2" | "1" | undefined;
+    addresstype?: "1" | "2" | undefined;
     clientidNull?: string | undefined;
     addresstypeStr?: string | undefined;
     addressAttrStr?: string | undefined;

package/dist/esm/component/BiuField/component/orderTypeSelect.d.ts

@@ -9,7 +9,7 @@ declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponen
     /**
      * 0:入库 1:出库  2:移库  3:冻结  4:调整  5:属性变更
      */
-    orderType: 0 | 2 | 1 | 4 | 3 | 5;
+    orderType: 0 | 2 | 1 | 3 | 4 | 5;
     isFirstLoad: boolean;
 } & SelectProps<any, import("antd/lib/select").DefaultOptionType> & React.RefAttributes<unknown>>>;
 export default _default;

package/dist/esm/component/BiuTableSelect/index.d.ts

@@ -46,4 +46,4 @@ export declare const BiuTableSelect: React.MemoExoticComponent<React.ForwardRefE
      * 转换下绑定到组件上的数据源
      */
     dataOption?: ((value: Record<string, any>) => Record<string, any>[]) | undefined;
-} & Pick<SelectProps<any, import("antd/lib/select").DefaultOptionType>, "showSearch" | "allowClear"> & Pick<TableProps<any>, "onRow" | "dataSource"> & React.RefAttributes<unknown>>>;
+} & Pick<SelectProps<any, import("antd/lib/select").DefaultOptionType>, "allowClear" | "showSearch"> & Pick<TableProps<any>, "dataSource" | "onRow"> & React.RefAttributes<unknown>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wt-enjoy-link-antd-repack",
-  "version": "4.1.57",
+  "version": "4.1.58",
   "description": "万通业务组件",
   "sideEffects": false,
   "main": "dist/esm/index.js",