@chaoswise/ui 2.5.4 → 2.5.6

package/lib/ColorPicker/index.js

@@ -21,10 +21,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; }
 import React, { useEffect, useState } from "react";
-import { SketchPicker } from "react-color";
+import SketchPicker from "./SketchPicker/components/sketch";
 import classnames from "classnames";
 import { formatRgbaObj, hexToRgba } from "./utils";
-import langConfig from './locale';
+import langConfig from "./locale";
 import { formatMessage } from "../utils";
 import PropTypes from "prop-types";
 import "./index.less";
@@ -98,7 +98,6 @@ var ColorPicker = function ColorPicker(_ref) {
   }, [_value]);
   //颜色变化触发值改变
   var onChangeColor = function onChangeColor(colorObj) {
-    console.log(colorObj, "colorObj");
     var rgbColor = typeof colorObj.rgb == "string" ? colorObj.rgb : formatRgbaObj(colorObj.rgb);
     if (colorType === "single") {
       setColorInfo(_objectSpread(_objectSpread({}, colorInfo), {}, {

package/lib/ErrorBoundary/history.js

@@ -5,28 +5,33 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var Dep = /*#__PURE__*/function () {
-  // 订阅池
-  function Dep(name) {
+  function Dep() {
     _classCallCheck(this, Dep);
-    this.subs = []; //该事件下被订阅对象的集合
+    this.subs = []; // 存放所有订阅者
   }
+  // 添加订阅者
   _createClass(Dep, [{
-    key: "defined",
-    value: function defined(watch) {
-      this.subs.push(watch);
+    key: "addSub",
+    value: function addSub(watch) {
+      if (watch && this.subs.indexOf(watch) < 0) {
+        this.subs.push(watch);
+      }
     }
+    // 移除订阅者
+  }, {
+    key: "removeSub",
+    value: function removeSub(watch) {
+      var index = this.subs.indexOf(watch);
+      if (index > -1) {
+        this.subs.splice(index, 1);
+      }
+    }
+    // 通知所有订阅者
   }, {
     key: "notify",
     value: function notify() {
-      //通知订阅者有变化
-      this.subs.forEach(function (e, i) {
-        if (typeof e.update === 'function') {
-          try {
-            e.update.apply(e); //触发订阅者更新函数
-          } catch (err) {
-            console.error(err);
-          }
-        }
+      this.subs.forEach(function (sub) {
+        return sub.update();
       });
     }
   }]);
@@ -35,49 +40,44 @@ var Dep = /*#__PURE__*/function () {
 var Watch = /*#__PURE__*/function () {
   function Watch(name, fn) {
     _classCallCheck(this, Watch);
-    this.name = name; //订阅消息的名称
-    this.callBack = fn; //订阅消息发送改变时->订阅者执行的回调函数
+    this.name = name;
+    this.callBack = fn;
   }
   _createClass(Watch, [{
-    key: "add",
-    value: function add(dep) {
-      //将订阅者放入dep订阅池
-      dep.subs.push(this);
-    }
-  }, {
     key: "update",
     value: function update() {
-      //将订阅者更新方法
-      var cb = this.callBack; //赋值为了不改变函数内调用的this
-      cb(this.name);
+      if (typeof this.callBack === 'function') {
+        this.callBack(this.name);
+      }
     }
   }]);
   return Watch;
 }();
-function addMethod() {
-  var historyDep = new Dep();
-  return function (name) {
-    if (name === 'historychange') {
-      return function (name, fn) {
-        var event = new Watch(name, fn);
-        historyDep.defined(event);
-      };
-    } else if (name === 'pushState') {
-      var method = history[name];
-      return function () {
-        method.apply(history, arguments);
-        historyDep.notify();
-      };
-    } else if (name === 'replaceState') {
-      var _method = history[name];
-      return function () {
-        _method.apply(history, arguments);
-        historyDep.notify();
-      };
+var historyDep = new Dep(); // 单例订阅池
+
+// 修改history方法
+var modifyHistoryMethod = function modifyHistoryMethod(methodName) {
+  var original = history[methodName];
+  history[methodName] = function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
+    var result = original.apply(this, args);
+    historyDep.notify(); // 通知变动
+    return result;
+  };
+};
+
+// 添加订阅者
+window.addHistoryListener = function (name, fn) {
+  var watcher = new Watch(name, fn);
+  historyDep.addSub(watcher);
+  // 返回取消订阅的函数
+  return function removeHistoryListener() {
+    historyDep.removeSub(watcher);
   };
-}
-var addHistoryMethod = new addMethod();
-window.addHistoryListener = addHistoryMethod('historychange');
-history.pushState = addHistoryMethod('pushState');
-history.replaceState = addHistoryMethod('replaceState');
+};
+
+// 修改pushState和replaceState以便通知订阅者
+modifyHistoryMethod('pushState');
+modifyHistoryMethod('replaceState');

package/lib/ErrorBoundary/index.js

@@ -56,7 +56,7 @@ var ErrorBoundary = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(ErrorBoundary, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      window.addHistoryListener('history', this.historyChange);
+      this.removeListener = window.addHistoryListener('history', this.historyChange);
       window.addEventListener('hashchange', this.historyChange);
       this.timer = setTimeout(function () {
         localStorage.setItem('ChunkLoadError', '');
@@ -65,8 +65,9 @@ var ErrorBoundary = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      window.removeEventListener('history', this.historyChange);
+      this.removeListener();
       window.removeEventListener('hashchange', this.historyChange);
+      clearTimeout(this.timer);
     }
   }, {
     key: "componentDidCatch",

package/lib/QuickTransfer/Drag.js

@@ -16,7 +16,8 @@ var Drag = function Drag(props) {
     render = props.render,
     renderColumns = props.renderColumns,
     dragList = props.dragList,
-    useDndProvider = props.useDndProvider;
+    useDndProvider = props.useDndProvider,
+    isHoverSwitching = props.isHoverSwitching;
   var moveList = function moveList(dragIndex, hoverIndex) {
     var tmp = checkValue[dragIndex]; //临时储存文件
     checkValue.splice(dragIndex, 1); //移除拖拽项
@@ -40,7 +41,8 @@ var Drag = function Drag(props) {
       handleDelete: handleDelete,
       moveList: moveList,
       dragList: dragList,
-      hasPrefixIcon: hasPrefixIcon
+      hasPrefixIcon: hasPrefixIcon,
+      isHoverSwitching: isHoverSwitching
     });
   };
   return /*#__PURE__*/React.createElement(Fragment, null, useDndProvider ? /*#__PURE__*/React.createElement(DndProvider, {

package/lib/QuickTransfer/DragList.js

@@ -1,8 +1,12 @@
+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); }
 import _Icon from "@chaoswise/ui/lib/Icon";
 import "@chaoswise/ui/lib/Tooltip/index.less";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _useLocale2 from "@chaoswise/ui/lib/useLocale";
 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 _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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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); }
@@ -14,7 +18,7 @@ import { useDrag, useDrop } from "react-dnd";
 import classnames from "classnames";
 import LockSvg from "./assets/LockSvg";
 import DragSvg from "./assets/DragSvg";
-import langConfig from './locale';
+import langConfig from "./locale";
 import { formatMessage } from "../utils";
 var DragList = function DragList(_ref) {
   var index = _ref.index,
@@ -25,7 +29,8 @@ var DragList = function DragList(_ref) {
     handleDelete = _ref.handleDelete,
     moveList = _ref.moveList,
     dragList = _ref.dragList,
-    hasPrefixIcon = _ref.hasPrefixIcon;
+    hasPrefixIcon = _ref.hasPrefixIcon,
+    isHoverSwitching = _ref.isHoverSwitching;
   var title = listItem.title,
     disabled = listItem.disabled;
   // 获取当前语言
@@ -43,6 +48,7 @@ var DragList = function DragList(_ref) {
   var _useDrop = useDrop({
       accept: "transferDrag",
       hover: function hover(item) {
+        if (!isHoverSwitching) return;
         //拖拽目标的Index
         var dragIndex = item.index;
         //放置目标Index
@@ -53,10 +59,27 @@ var DragList = function DragList(_ref) {
         }
         moveList(dragIndex, hoverIndex); //调用方法完成交换
         item.index = hoverIndex; //重新赋值index，否则会出现无限交换情况
+      },
+      collect: function collect(monitor) {
+        var _ref2 = monitor.getItem() || {},
+          dragIndex = _ref2.index;
+        if (dragIndex === index) {
+          return {};
+        }
+        return {
+          isOver: monitor.isOver(),
+          dropClassName: dragIndex < index ? "drop-over-downward" : "drop-over-upward"
+        };
+      },
+      drop: function drop(item) {
+        if (isHoverSwitching) return;
+        moveList(item.index, index);
       }
     }),
     _useDrop2 = _slicedToArray(_useDrop, 2),
-    _ = _useDrop2[0],
+    _useDrop2$ = _useDrop2[0],
+    isOver = _useDrop2$.isOver,
+    dropClassName = _useDrop2$.dropClassName,
     drop = _useDrop2[1];
   var renderTable = function renderTable(listItem) {
     return /*#__PURE__*/React.createElement("div", null, renderColumns.map(function (item, index) {
@@ -91,7 +114,7 @@ var DragList = function DragList(_ref) {
     }
   } : {};
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", _extends({
-    className: classnames("cw-transfer-right-content-main")
+    className: classnames("cw-transfer-right-content-main", _defineProperty({}, dropClassName, isOver && !isHoverSwitching))
   }, dragProps), renderItemContent));
 };
 export default DragList;

package/lib/QuickTransfer/index.js

@@ -100,7 +100,9 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$searchOption = props.searchOption,
     searchOption = _props$searchOption === void 0 ? {} : _props$searchOption,
     _props$caseSensitive = props.caseSensitive,
-    caseSensitive = _props$caseSensitive === void 0 ? false : _props$caseSensitive;
+    caseSensitive = _props$caseSensitive === void 0 ? false : _props$caseSensitive,
+    _props$isHoverSwitchi = props.isHoverSwitching,
+    isHoverSwitching = _props$isHoverSwitchi === void 0 ? true : _props$isHoverSwitchi;
   var _searchOption$leftSea = searchOption.leftSearchOption,
     _searchOption$leftSea2 = _searchOption$leftSea === void 0 ? {} : _searchOption$leftSea,
     _searchOption$leftSea3 = _searchOption$leftSea2.onChange,
@@ -323,10 +325,10 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     return newCheckedValue;
   };
   var searchCheckedValue = useMemo(function () {
-    return type === "tree" ? handleRightSearch(saveSearchValueRight).filter(function (i) {
+    return type === "tree" && treeSelect === "leafNode" ? handleRightSearch(saveSearchValueRight).filter(function (i) {
       return Boolean(i.isLeaf);
     }) : handleRightSearch(saveSearchValueRight);
-  }, [checkValue, saveSearchValueRight, type]);
+  }, [checkValue, saveSearchValueRight, type, treeSelect]);
   // type为list下全选框按钮的样式统一处理
   var setListCheckedStyle = function setListCheckedStyle(listCheckedKeys, dataSource) {
     // 设置列表左侧判断全选状态实际选中的key,重新搜索之后会改变
@@ -719,7 +721,8 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     renderColumns: renderColumns ? renderColumns : newRenderColumns,
     dragList: dragList,
     handlePreviewList: handlePreviewList,
-    useDndProvider: useDndProvider
+    useDndProvider: useDndProvider,
+    isHoverSwitching: isHoverSwitching
   }) : /*#__PURE__*/React.createElement(NoDrag, {
     checkValue: searchCheckedValue,
     handleDelete: handleDelete,
@@ -928,6 +931,10 @@ QuickTransfer.propTypes = {
    *  allSelectedTextRender(listCheckedKeys,data)
    * }
    */
-  caseSensitive: PropTypes.bool
+  caseSensitive: PropTypes.bool,
+  /**
+   * 开启拖拽后的交互模式，默认为true(true为悬停即交换，false为鼠标松开再交换)
+   */
+  isHoverSwitching: PropTypes.bool
 };
 export default QuickTransfer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -102,7 +102,6 @@
     "rc-tree-cascader": "npm:rc-tree@5.7.12",
     "rc-util": "^5.20.0",
     "re-resizable": "^6.9.0",
-    "react-color": "^2.19.3",
     "react-custom-scrollbars": "^4.2.1",
     "react-dnd": "^13.1.1",
     "react-dnd-html5-backend": "^12.1.1",