@chaoswise/ui 2.3.4 → 2.3.5

package/lib/CWRangePicker/utils/index.js

@@ -125,9 +125,10 @@ export var echoRecentlyTimeTitle = function echoRecentlyTimeTitle(locale, captur
 };
 export var echoAbsoluteTimeTitle = function echoAbsoluteTimeTitle(value, format) {
   var hasTimeSpan = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var timeSpanBoundary = arguments.length > 3 ? arguments[3] : undefined;
   var formatDate1 = value[0].format(format);
   var formatDate2 = value[1].format(format);
-  var finalEchoValue = computeTimeSpan(value) && hasTimeSpan ? "[".concat(computeTimeSpan(value), "] ").concat(formatDate1, " - ").concat(formatDate2) : "".concat(formatDate1, " - ").concat(formatDate2);
+  var finalEchoValue = computeTimeSpan(value, timeSpanBoundary) && hasTimeSpan ? "[".concat(computeTimeSpan(value, timeSpanBoundary), "] ").concat(formatDate1, " - ").concat(formatDate2) : "".concat(formatDate1, " - ").concat(formatDate2);
   return finalEchoValue;
 };
 // 根据时间类型输入框按照格式回显
@@ -138,6 +139,7 @@ export var echoInputValue = function echoInputValue() {
   var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "YYYY/MM/DD HH:mm:ss";
   var forceRenderTitle = arguments.length > 4 ? arguments[4] : undefined;
   var isAutoRefresh = arguments.length > 5 ? arguments[5] : undefined;
+  var timeSpanBoundary = arguments.length > 6 ? arguments[6] : undefined;
   var values = recordDateValue.value,
     title = recordDateValue.title;
   var _judgeType = judgeType(recordDateValue),
@@ -156,7 +158,7 @@ export var echoInputValue = function echoInputValue() {
       return echoRecentlyTimeTitle(locale, captureUnit);
     }
     if (Array.isArray(value) && (_value2 = value) !== null && _value2 !== void 0 && _value2.length) {
-      return echoAbsoluteTimeTitle(value, format);
+      return echoAbsoluteTimeTitle(value, format, true, timeSpanBoundary);
     }
     return "";
   }
@@ -170,7 +172,7 @@ export var echoInputValue = function echoInputValue() {
       return echoRecentlyTimeTitle(locale, captureUnit);
     }
     if (Array.isArray(value) && (_value3 = value) !== null && _value3 !== void 0 && _value3.length) {
-      return echoAbsoluteTimeTitle(value, format);
+      return echoAbsoluteTimeTitle(value, format, true, timeSpanBoundary);
     }
   } else {
     var _value4;
@@ -181,31 +183,29 @@ export var echoInputValue = function echoInputValue() {
       return echoRecentlyTimeTitle(locale, captureUnit);
     }
     if (Array.isArray(value) && (_value4 = value) !== null && _value4 !== void 0 && _value4.length) {
-      return echoAbsoluteTimeTitle(value, format);
+      return echoAbsoluteTimeTitle(value, format, true, timeSpanBoundary);
     }
   }
 };
 
 // 计算两个moment日期的时间差(时间戳)
 export var computeTimeDiff = function computeTimeDiff(value) {
-  return value[1].diff(value[0]);
+  var unit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "ms";
+  return value[1].diff(value[0], unit);
+};
+export var getYears = function getYears(seconds) {
+  var yearInSeconds = 31536000; // 一年有 365 天 * 24 小时 * 60 分钟 * 60 秒 = 31536000 秒
+  var years = Math.floor(seconds / yearInSeconds);
+  return years;
 };
-
 // 计算输入框时间跨度
-export var computeTimeSpan = function computeTimeSpan(value) {
-  var getMilliseconds0 = moment(value[0].milliseconds())._i;
-  var getMilliseconds1 = moment(value[1].milliseconds())._i;
+export var computeTimeSpan = function computeTimeSpan(value, timeSpanBoundary) {
   // 当前传入日期的时间
-  var timeDiff = computeTimeDiff(value);
-  if (getMilliseconds0 > getMilliseconds1) {
-    // 特殊情况处理忽略掉毫秒级别的变化影响时间跨度取值
-    var diffMilliseconds = getMilliseconds0 - getMilliseconds1;
-    timeDiff = Number(timeDiff + diffMilliseconds);
+  var timeDiff = computeTimeDiff(value, "s");
+  if (timeDiff >= 60) {
+    timeDiff = Number(timeDiff + 1);
   }
-  if (timeDiff >= 60000) {
-    timeDiff = Number(timeDiff + 1000);
-  }
-  var duration = moment.duration(timeDiff);
+  var duration = moment.duration(timeDiff, "s");
   var _duration$_data = duration._data,
     years = _duration$_data.years,
     months = _duration$_data.months,
@@ -213,7 +213,13 @@ export var computeTimeSpan = function computeTimeSpan(value) {
     hours = _duration$_data.hours,
     minutes = _duration$_data.minutes,
     seconds = _duration$_data.seconds;
-  if (years) return "".concat(years, "y");
+  if (years) {
+    // todo：目前只处理了边界为年的跨度
+    if (timeDiff >= timeSpanBoundary) {
+      return "".concat(getYears(timeSpanBoundary), "y");
+    }
+    return "".concat(years, "y");
+  }
   if (months) return "".concat(months, "mo");
   if (days) return "".concat(days, "d");
   if (hours) return "".concat(hours, "h");
@@ -227,8 +233,8 @@ export var computeTimeSpan = function computeTimeSpan(value) {
  * @param {*} value date日期
  * @returns 根据日期获取时间跨度，最近时间返回内容
  */
-export var getTimeSpanFromValue = function getTimeSpanFromValue(value) {
-  var timeDomain = computeTimeSpan(value);
+export var getTimeSpanFromValue = function getTimeSpanFromValue(value, timeSpanBoundary) {
+  var timeDomain = computeTimeSpan(value, timeSpanBoundary);
   var _getUnit3 = getUnit(timeDomain),
     captureUnit = _getUnit3.captureUnit;
   return {
@@ -257,10 +263,10 @@ export var computedRecentlyValue = function computedRecentlyValue(value) {
  *
  *  @returns 根据当前克隆时间返回变化之后的时间
  */
-export var cloneChangeDate = function cloneChangeDate(currentDate_0, currentDate_1, direction, growSize, duration) {
+export var cloneChangeDate = function cloneChangeDate(currentDate_0, currentDate_1, direction, growSize, duration, timeSpanBoundary) {
   var cloneCurrentDate_0 = currentDate_0.clone();
   var cloneCurrentDate_1 = currentDate_1.clone();
-  // 是否回到初始值
+  // 是否切换到最近时间
   var switchInitial = false;
   if (direction == "left") {
     cloneCurrentDate_0.subtract(duration);
@@ -279,13 +285,34 @@ export var cloneChangeDate = function cloneChangeDate(currentDate_0, currentDate
   } else {
     cloneCurrentDate_0.subtract(duration * ((growSize - 1) / 2));
     cloneCurrentDate_1.add(duration * ((growSize - 1) / 2));
+    // 先要计算二者的时间跨度
+    var isExceedMaxTime = isExceedMaxTimeSpan([cloneCurrentDate_0, cloneCurrentDate_1], timeSpanBoundary);
     // 计算最大值的时间差
     var _maxTimeDiff = computeTimeDiff([cloneCurrentDate_1, moment()]);
-    if (_maxTimeDiff <= 0) {
-      switchInitial = true;
-      var _finalValue = computedRecentlyValue([cloneCurrentDate_0, cloneCurrentDate_1]);
-      cloneCurrentDate_0 = _finalValue[0];
-      cloneCurrentDate_1 = _finalValue[1];
+    if (isExceedMaxTime) {
+      if (_maxTimeDiff <= 0) {
+        // 当前时间已经是极限了
+        // 已经是极限直接当前时间向前推进timeSpanBoundary即可
+        cloneCurrentDate_0 = moment().subtract(moment.duration(timeSpanBoundary, "s"));
+        cloneCurrentDate_1 = moment();
+        switchInitial = true;
+      } else {
+        // 非极限时间，但是超过最大的时间边界跨度
+        // 先将currentDate_0和currentDate_1二者进行相减在这个基础上增加(timeSpanBoundary - 二者相减） / 2 ,左右各增加减少这个数值
+        var initialTimeDiff = computeTimeDiff([cloneCurrentDate_0, cloneCurrentDate_1], "s");
+        var needChangeTimeDiff = Math.ceil(initialTimeDiff - timeSpanBoundary) / 2;
+        var clone0 = currentDate_0.clone();
+        var clone1 = currentDate_1.clone();
+        cloneCurrentDate_0 = clone0.subtract(moment.duration(needChangeTimeDiff, "s"));
+        cloneCurrentDate_1 = clone1.add(moment.duration(needChangeTimeDiff, "s"));
+      }
+    } else {
+      if (_maxTimeDiff <= 0) {
+        switchInitial = true;
+        var _finalValue = computedRecentlyValue([cloneCurrentDate_0, cloneCurrentDate_1]);
+        cloneCurrentDate_0 = _finalValue[0];
+        cloneCurrentDate_1 = _finalValue[1];
+      }
     }
   }
   return {
@@ -319,6 +346,7 @@ export var getChangeUnitDate = function getChangeUnitDate(unitFigure, unit) {
  */
 export var getChangeDate = function getChangeDate(recordDateValue, direction) {
   var growSize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3;
+  var timeSpanBoundary = arguments.length > 3 ? arguments[3] : undefined;
   var key = recordDateValue.key,
     values = recordDateValue.value;
   var _getUnit4 = getUnit(key),
@@ -328,12 +356,12 @@ export var getChangeDate = function getChangeDate(recordDateValue, direction) {
   if (values) {
     value = funcValueChangeArrayValue(values);
   }
-  if (isRule) {
+  if (isRule && !values) {
     value = getChangeUnitDate(captureUnit[0], ENUM_TimeUnit[captureUnit[1]][3]);
   }
   var timeDiff = value[1].diff(value[0]);
   var duration = moment.duration(timeDiff);
-  var _cloneChangeDate = cloneChangeDate(value[0], value[1], direction, growSize, duration),
+  var _cloneChangeDate = cloneChangeDate(value[0], value[1], direction, growSize, duration, timeSpanBoundary),
     _value = _cloneChangeDate.value,
     switchInitial = _cloneChangeDate.switchInitial;
   var returnValue = {
@@ -341,7 +369,7 @@ export var getChangeDate = function getChangeDate(recordDateValue, direction) {
     isRecently: false
   };
   if (switchInitial) {
-    returnValue = _objectSpread(_objectSpread(_objectSpread({}, returnValue), getTimeSpanFromValue(_value)), {}, {
+    returnValue = _objectSpread(_objectSpread(_objectSpread({}, returnValue), getTimeSpanFromValue(_value, timeSpanBoundary)), {}, {
       isRecently: true
     });
   }
@@ -410,7 +438,7 @@ export var getCorrectValue = function getCorrectValue(value) {
  * @param {Object} value
  * @returns
  */
-export var getHistoryInfo = function getHistoryInfo(recordValue, historyList, locale, format) {
+export var getHistoryInfo = function getHistoryInfo(recordValue, historyList, locale, format, timeSpanBoundary) {
   var key = recordValue.key,
     value = recordValue.value,
     _recordValue$title = recordValue.title,
@@ -422,7 +450,7 @@ export var getHistoryInfo = function getHistoryInfo(recordValue, historyList, lo
   var values = funcValueChangeArrayValue(value);
   var _title = title;
   if (values && !_title) {
-    _title = echoAbsoluteTimeTitle(values, format, false);
+    _title = echoAbsoluteTimeTitle(values, format, false, timeSpanBoundary);
   }
   if (isRule) {
     if (!title) {
@@ -649,4 +677,11 @@ export function getFinalDateOption(inputStr) {
     }
   }
   return finalDateOption;
-}
+}
+
+/**
+ * 是否超过了最大的时间跨度
+ */
+export var isExceedMaxTimeSpan = function isExceedMaxTimeSpan(value, timeSpanBoundary) {
+  return computeTimeDiff(value, "s") > timeSpanBoundary;
+};

package/lib/CWSelect/DragTag/index.js

@@ -0,0 +1,52 @@
+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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useRef } from "react";
+import Tag from "../Tag";
+import { useDrag, useDrop } from "react-dnd";
+var type = "dragableTag";
+var DragTag = function DragTag(props) {
+  var maxTagTextLength = props.maxTagTextLength,
+    tagTooltipRender = props.tagTooltipRender,
+    tagLabelRender = props.tagLabelRender,
+    moveNode = props.moveNode,
+    propsItem = props.propsItem,
+    showTooltip = props.showTooltip,
+    disabled = props.disabled;
+  var index = propsItem.index;
+  var dragRef = useRef(null);
+  var _useDrop = useDrop({
+      accept: type,
+      drop: function drop(item) {
+        moveNode(item.index, index);
+      }
+    }, [index, moveNode]),
+    _useDrop2 = _slicedToArray(_useDrop, 2),
+    drop = _useDrop2[1];
+  var _useDrag = useDrag({
+      item: {
+        type: type,
+        index: index
+      }
+    }),
+    _useDrag2 = _slicedToArray(_useDrag, 2),
+    drag = _useDrag2[1];
+  return /*#__PURE__*/React.createElement("div", {
+    ref: drag(drop(dragRef)),
+    onMouseDown: function onMouseDown(e) {
+      e.stopPropagation();
+    }
+  }, /*#__PURE__*/React.createElement(Tag, {
+    key: index,
+    maxTagTextLength: maxTagTextLength,
+    tagTooltipRender: tagTooltipRender,
+    tagLabelRender: tagLabelRender,
+    showTooltip: showTooltip,
+    props: propsItem,
+    disabled: disabled
+  }));
+};
+export default DragTag;

package/lib/CWSelect/Tag.js

@@ -1,12 +1,4 @@
 import _Icon from "@chaoswise/ui/lib/Antd/Icon";
-/*
- * @Author: andrew.qiao andrew.qiao@cloudwise.com
- * @Date: 2022-09-13 17:59:38
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2023-03-14 17:57:33
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/CWSelect/Tag.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React from 'react';
 function Tag(_ref) {
   var props = _ref.props,
@@ -19,14 +11,14 @@ function Tag(_ref) {
   if (typeof props.label === 'string') {
     tooltipLabel = props.label;
   } else {
-    var _props$label, _props$label$props;
-    tooltipLabel = props !== null && props !== void 0 && (_props$label = props.label) !== null && _props$label !== void 0 && (_props$label$props = _props$label.props) !== null && _props$label$props !== void 0 && _props$label$props.children ? props.label.props.children : '';
+    var _props$label;
+    tooltipLabel = props !== null && props !== void 0 && (_props$label = props.label) !== null && _props$label !== void 0 && (_props$label = _props$label.props) !== null && _props$label !== void 0 && _props$label.children ? props.label.props.children : '';
   }
   return /*#__PURE__*/React.createElement("span", {
     className: "cw-select-selection-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "cw-select-selection-item-content"
-  }, tagLabelRender ? tagLabelRender(props.label, props) : maxTagTextLength && tooltipLabel.length > maxTagTextLength ? tooltipLabel.slice(0, maxTagTextLength) + "…" : props.label), !disabled && /*#__PURE__*/React.createElement("span", {
+  }, tagLabelRender ? tagLabelRender(props.label, props) : maxTagTextLength && tooltipLabel.length > maxTagTextLength ? tooltipLabel.slice(0, maxTagTextLength) + "…" : props.label), !(disabled || props.disabled) && /*#__PURE__*/React.createElement("span", {
     className: "cw-select-selection-item-remove"
   }, /*#__PURE__*/React.createElement(_Icon, {
     type: "close",

package/lib/CWSelect/index.js

@@ -17,14 +17,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useEffect, useState, forwardRef, useRef, useCallback } from "react";
 import ReactDom from 'react-dom';
 import RCSelect from "./antd-select";
@@ -37,48 +37,9 @@ import update from 'immutability-helper';
 import { getLocale } from "./locale";
 import { getDefaultPaddingLeft } from './utils';
 import useConfigContext from '../useConfigContext';
+import DragTag from './DragTag';
 var Option = RCSelect.Option,
   OptGroup = RCSelect.OptGroup;
-var type = 'dragableTag';
-var RenderTag = function RenderTag(props) {
-  var maxTagTextLength = props.maxTagTextLength,
-    tagTooltipRender = props.tagTooltipRender,
-    tagLabelRender = props.tagLabelRender,
-    moveNode = props.moveNode,
-    propsItem = props.propsItem,
-    showTooltip = props.showTooltip;
-  var index = propsItem.index;
-  var dragRef = useRef(null);
-  var _useDrop = useDrop({
-      accept: type,
-      drop: function drop(item) {
-        moveNode(item.index, index);
-      }
-    }, [index, moveNode]),
-    _useDrop2 = _slicedToArray(_useDrop, 2),
-    drop = _useDrop2[1];
-  var _useDrag = useDrag({
-      item: {
-        type: type,
-        index: index
-      }
-    }),
-    _useDrag2 = _slicedToArray(_useDrag, 2),
-    drag = _useDrag2[1];
-  return /*#__PURE__*/React.createElement("div", {
-    ref: drag(drop(dragRef)),
-    onMouseDown: function onMouseDown(e) {
-      e.stopPropagation();
-    }
-  }, /*#__PURE__*/React.createElement(Tag, {
-    key: index,
-    maxTagTextLength: maxTagTextLength,
-    tagTooltipRender: tagTooltipRender,
-    tagLabelRender: tagLabelRender,
-    showTooltip: showTooltip,
-    props: propsItem
-  }));
-};
 /**
  * 使用方法同Select组件基本相同，在multiple和tag模式下对多tag展示不下的情况下进行了定制化开发，符合UE交互规范
  */
@@ -253,7 +214,8 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         maxTagTextLength: maxTagTextLength,
         tagTooltipRender: tagTooltipRender,
         showTooltip: showTooltip,
-        tagLabelRender: tagLabelRender
+        tagLabelRender: tagLabelRender,
+        disabled: rest.disabled
       });
     }));
   }
@@ -320,14 +282,15 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
           if (!finalProps) {
             return null;
           }
-          return /*#__PURE__*/React.createElement(RenderTag, {
+          return /*#__PURE__*/React.createElement(DragTag, {
             key: key,
             maxTagTextLength: maxTagTextLength,
             tagTooltipRender: tagTooltipRender,
             tagLabelRender: tagLabelRender,
             moveNode: moveNode,
             propsItem: finalProps,
-            showTooltip: showTooltip
+            showTooltip: showTooltip,
+            disabled: rest.disabled
           });
         }));
       } else {

package/lib/CWTable/EditLine.js

@@ -101,7 +101,7 @@ var EditableRowCell = function EditableRowCell(props) {
     _useState2 = _slicedToArray(_useState, 2),
     editing = _useState2[0],
     setEditing = _useState2[1];
-  var editMode = column === null || column === void 0 ? void 0 : (_column$form = column.form) === null || _column$form === void 0 ? void 0 : _column$form.editMode;
+  var editMode = column === null || column === void 0 || (_column$form = column.form) === null || _column$form === void 0 ? void 0 : _column$form.editMode;
   var _useConfigContext2 = useConfigContext(),
     getPrefixCls = _useConfigContext2.getPrefixCls;
   var prefixCls = getPrefixCls();

package/lib/CWTree/index.js

@@ -105,9 +105,9 @@ function CWTree(_ref) {
       });
     });
   }
-  treeData = addRoot(treeData, "/");
-  treeData = useMemo(function () {
-    if (!searchHighlight) return treeData;
+  var _treeData = useMemo(function () {
+    var addRootTreeData = addRoot(treeData, "/");
+    if (!searchHighlight) return addRootTreeData;
     var loop = function loop(treeData) {
       return treeData.map(function (item) {
         var index = 0;
@@ -128,8 +128,13 @@ function CWTree(_ref) {
         return !!item.title;
       });
     };
-    return loop(treeData);
-  }, [searchHighlight, treeData, searchValue]);
+    addRootTreeData = loop(addRootTreeData);
+    return rest.checkable ? treeData.filter(function (i) {
+      return addRootTreeData.find(function (item) {
+        return item.key === i.key;
+      });
+    }) : addRootTreeData;
+  }, [searchHighlight, treeData, searchValue, rest.checkable]);
   function buildMenu(array) {
     // 递归构建菜单解构
     return array.map(function (item) {
@@ -288,7 +293,7 @@ function CWTree(_ref) {
       return hideExtend(e);
     },
     draggable: draggable
-  }, rest), children ? children : creatTreeNode(treeData))))), /*#__PURE__*/React.createElement("div", {
+  }, rest), children ? children : creatTreeNode(_treeData))))), /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-footer"
   }, extraFooter));
 }

package/lib/Input/InputComponent.js

@@ -64,10 +64,10 @@ var InputComponent = /*#__PURE__*/forwardRef(function (props, inputRef) {
   var inputLabelRef = useRef(null);
   useEffect(function () {
     if (label || inputLabel) {
-      var _inputLabelRef$curren, _ref$current, _ref$current$input, _ref$current2;
+      var _inputLabelRef$curren, _ref$current, _ref$current2;
       var defaultPaddingLeft = getDefaultPaddingLeft(resProps.size);
       var paddingLeftWidth = ((_inputLabelRef$curren = inputLabelRef.current) === null || _inputLabelRef$curren === void 0 ? void 0 : _inputLabelRef$curren.clientWidth) + defaultPaddingLeft;
-      var inputDom = componentType === "Search" ? (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : (_ref$current$input = _ref$current.input) === null || _ref$current$input === void 0 ? void 0 : _ref$current$input.input : (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.input;
+      var inputDom = componentType === "Search" ? (_ref$current = ref.current) === null || _ref$current === void 0 || (_ref$current = _ref$current.input) === null || _ref$current === void 0 ? void 0 : _ref$current.input : (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.input;
       if (inputDom) {
         inputDom.style.paddingLeft = "".concat(paddingLeftWidth, "px");
       }

package/lib/Pagination/index.js

@@ -10,7 +10,7 @@ import _Input from "@chaoswise/ui/lib/Input";
 import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
 import "@chaoswise/ui/lib/CWSelect/index.less";
 import _CWSelect from "@chaoswise/ui/lib/CWSelect";
-var _excluded = ["form", "total", "simple", "current", "size", "onShowSizeChange", "defaultCurrent", "pageSize", "defaultPageSize", "showTotal", "pageSizeOptions", "showQuickJumper", "showSizeChanger", "onChange", "disabled", "className", "itemRender", "hideOnSinglePage", "newLayout"];
+var _excluded = ["form", "total", "simple", "current", "size", "onShowSizeChange", "defaultCurrent", "pageSize", "defaultPageSize", "showTotal", "pageSizeOptions", "showQuickJumper", "showSizeChanger", "onChange", "disabled", "className", "itemRender", "hideOnSinglePage", "newLayout", "getPopupContainer"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -67,6 +67,7 @@ function CWPagination(props) {
     hideOnSinglePage = _props$hideOnSinglePa === void 0 ? false : _props$hideOnSinglePa,
     _props$newLayout = props.newLayout,
     newLayout = _props$newLayout === void 0 ? false : _props$newLayout,
+    getPopupContainer = props.getPopupContainer,
     rest = _objectWithoutProperties(props, _excluded);
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
@@ -229,7 +230,8 @@ function CWPagination(props) {
     size: size === "small" ? "small" : "default",
     onChange: function onChange(pageSize) {
       return handleChangePageSize(pageSize);
-    }
+    },
+    getPopupContainer: getPopupContainer
   }, pageSizeOptions.map(function (value) {
     return /*#__PURE__*/React.createElement(Option, {
       value: value,
@@ -372,6 +374,10 @@ CWPagination.propTypes = {
   /**
    * 每页条数改变的回调，参数是页码和改变后的每页条数 Function(current,pageSize)
    */
-  onShowSizeChange: PropTypes.func
+  onShowSizeChange: PropTypes.func,
+  /**
+   * getPopupContainer分页选择器菜单渲染父节点，默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。
+   */
+  getPopupContainer: PropTypes.func
 };
 export default _Form.create()(CWPagination);

package/lib/QuickTransfer/CheckList.js

@@ -25,7 +25,7 @@ var CheckList = function CheckList(props) {
     handlePreviewList(_toConsumableArray(checkValue)); //更新修改后的列表
   };
 
-  var isLockSort = type === "list" && checkValue.filter(function (item) {
+  var isLockSort = checkValue.filter(function (item) {
     return item.disabled;
   }).length;
   var renderList = function renderList(item, index) {

package/lib/QuickTransfer/NoDrag.js

@@ -23,7 +23,7 @@ var NoDrag = function NoDrag(props) {
     handlePreviewList(_toConsumableArray(checkValue)); //更新修改后的列表
   };
 
-  var isLockSort = type === "list" && checkValue.filter(function (item) {
+  var isLockSort = checkValue.filter(function (item) {
     return item.disabled;
   }).length;
   var renderList = function renderList(item, index) {

package/lib/QuickTransfer/NotDragList.js

@@ -2,7 +2,7 @@ import _Icon from "@chaoswise/ui/lib/Antd/Icon";
 import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
-var _excluded = ["label", "value", "index", "handleDelete", "labelValue", "moveList", "type", "renderColumns", "render", "dragList", "disabled", "isLockSort"];
+var _excluded = ["label", "value", "index", "handleDelete", "labelValue", "type", "renderColumns", "render", "dragList", "disabled", "isLockSort"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -17,7 +17,6 @@ var NotDragList = function NotDragList(_ref) {
     index = _ref.index,
     handleDelete = _ref.handleDelete,
     labelValue = _ref.labelValue,
-    moveList = _ref.moveList,
     type = _ref.type,
     renderColumns = _ref.renderColumns,
     render = _ref.render,
@@ -48,7 +47,7 @@ var NotDragList = function NotDragList(_ref) {
       cursor: "move"
     }
   } : {};
-  var listLockSortContent = /*#__PURE__*/React.createElement("div", {
+  var lockSortContent = /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item"
   }, /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item-drag-wrapper"
@@ -56,14 +55,14 @@ var NotDragList = function NotDragList(_ref) {
     title: localeObj["dragAndDrop"]
   }, /*#__PURE__*/React.createElement(DragSvg, null))), /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item-text-wrapper"
-  }, render(value)), !disabled && /*#__PURE__*/React.createElement(_Icon, {
+  }, type === "table" ? renderTable(labelValue) : render(value)), !disabled && /*#__PURE__*/React.createElement(_Icon, {
     type: "close",
     className: "cw-transfer-right-content-del",
     onClick: function onClick() {
       return handleDeleted(labelValue);
     }
   }));
-  var renderItemContent = type == "list" && isLockSort ? listLockSortContent : /*#__PURE__*/React.createElement(Fragment, null, dragList && /*#__PURE__*/React.createElement(_Tooltip, {
+  var renderItemContent = isLockSort ? lockSortContent : /*#__PURE__*/React.createElement(Fragment, null, dragList && /*#__PURE__*/React.createElement(_Tooltip, {
     title: localeObj["dragAndDrop"]
   }, /*#__PURE__*/React.createElement(DragSvg, {
     className: "cw-transfer-right-content-drag"

package/lib/QuickTransfer/TopicList.js

@@ -120,7 +120,7 @@ var TopicList = function TopicList(_ref) {
       cursor: "move"
     }
   } : {};
-  var listLockSortContent = /*#__PURE__*/React.createElement("div", {
+  var lockSortContent = /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item"
   }, /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item-drag-wrapper"
@@ -128,14 +128,14 @@ var TopicList = function TopicList(_ref) {
     title: localeObj["dragAndDrop"]
   }, /*#__PURE__*/React.createElement(DragSvg, null))), /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item-text-wrapper"
-  }, render(value)), !disabled && /*#__PURE__*/React.createElement(_Icon, {
+  }, type === "table" ? renderTable(labelValue) : render(value)), !disabled && /*#__PURE__*/React.createElement(_Icon, {
     type: "close",
     className: "cw-transfer-right-content-del",
     onClick: function onClick() {
       return handleDeleted(labelValue);
     }
   }));
-  var renderItemContent = type == "list" && isLockSort ? listLockSortContent : /*#__PURE__*/React.createElement(Fragment, null, dragList && /*#__PURE__*/React.createElement(_Tooltip, {
+  var renderItemContent = isLockSort ? lockSortContent : /*#__PURE__*/React.createElement(Fragment, null, dragList && /*#__PURE__*/React.createElement(_Tooltip, {
     title: localeObj["dragAndDrop"]
   }, /*#__PURE__*/React.createElement(DragSvg, {
     className: "cw-transfer-right-content-drag"

package/lib/QuickTransfer/index.js

@@ -251,6 +251,11 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
           });
           findValue && finalCheckValue.push(findValue);
         });
+        finalCheckValue = finalCheckValue.filter(function (i) {
+          return i.disabled;
+        }).concat(finalCheckValue.filter(function (i) {
+          return !i.disabled;
+        }));
         setCheckValue(finalCheckValue);
       }
       //回显table
@@ -684,7 +689,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       }, treeRest));
     }
   };
-  var list = searchCheckedValue.length === 0 ? /*#__PURE__*/React.createElement(_Empty, {
+  var renderRightList = searchCheckedValue.length === 0 ? /*#__PURE__*/React.createElement(_Empty, {
     description: localeObj["pleaseSelectFromLeft"]
   }) : useDndProvider ? /*#__PURE__*/React.createElement(CheckList, {
     checkValue: searchCheckedValue,
@@ -754,7 +759,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "cw-transfer-right-header-clear"
   }, localeObj.clear)) : /*#__PURE__*/React.createElement(Fragment, null, rightHeader)), /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-main-wrapper"
-  }, list)), rightFooter && /*#__PURE__*/React.createElement("div", {
+  }, renderRightList)), rightFooter && /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-footer"
   }, rightFooter))));
 });