@chaoswise/ui 2.5.5 → 2.5.7

package/lib/ColorPicker/SketchPicker/helpers/color.js

@@ -0,0 +1,86 @@
+import each from 'lodash/each';
+import tinycolor from 'tinycolor2';
+export var simpleCheckForValidColor = function simpleCheckForValidColor(data) {
+  var keysToCheck = ['r', 'g', 'b', 'a', 'h', 's', 'l', 'v'];
+  var checked = 0;
+  var passed = 0;
+  each(keysToCheck, function (letter) {
+    if (data[letter]) {
+      checked += 1;
+      if (!isNaN(data[letter])) {
+        passed += 1;
+      }
+      if (letter === 's' || letter === 'l') {
+        var percentPatt = /^\d+%$/;
+        if (percentPatt.test(data[letter])) {
+          passed += 1;
+        }
+      }
+    }
+  });
+  return checked === passed ? data : false;
+};
+export var toState = function toState(data, oldHue) {
+  var color = data.hex ? tinycolor(data.hex) : tinycolor(data);
+  var hsl = color.toHsl();
+  var hsv = color.toHsv();
+  var rgb = color.toRgb();
+  var hex = color.toHex();
+  if (hsl.s === 0) {
+    hsl.h = oldHue || 0;
+    hsv.h = oldHue || 0;
+  }
+  var transparent = hex === '000000' && rgb.a === 0;
+  return {
+    hsl: hsl,
+    hex: transparent ? 'transparent' : "#".concat(hex),
+    rgb: rgb,
+    hsv: hsv,
+    oldHue: data.h || oldHue || hsl.h,
+    source: data.source
+  };
+};
+export var isValidHex = function isValidHex(hex) {
+  if (hex === 'transparent') {
+    return true;
+  }
+  // disable hex4 and hex8
+  var lh = String(hex).charAt(0) === '#' ? 1 : 0;
+  return hex.length !== 4 + lh && hex.length < 7 + lh && tinycolor(hex).isValid();
+};
+export var getContrastingColor = function getContrastingColor(data) {
+  if (!data) {
+    return '#fff';
+  }
+  var col = toState(data);
+  if (col.hex === 'transparent') {
+    return 'rgba(0,0,0,0.4)';
+  }
+  var yiq = (col.rgb.r * 299 + col.rgb.g * 587 + col.rgb.b * 114) / 1000;
+  return yiq >= 128 ? '#000' : '#fff';
+};
+export var red = {
+  hsl: {
+    a: 1,
+    h: 0,
+    l: 0.5,
+    s: 1
+  },
+  hex: '#ff0000',
+  rgb: {
+    r: 255,
+    g: 0,
+    b: 0,
+    a: 1
+  },
+  hsv: {
+    h: 0,
+    s: 1,
+    v: 1,
+    a: 1
+  }
+};
+export var isvalidColorString = function isvalidColorString(string, type) {
+  var stringWithoutDegree = string.replace('°', '');
+  return tinycolor("".concat(type, " (").concat(stringWithoutDegree, ")"))._ok;
+};

package/lib/ColorPicker/SketchPicker/helpers/hue.js

@@ -0,0 +1,48 @@
+export var calculateChange = function calculateChange(e, direction, hsl, container) {
+  var containerWidth = container.clientWidth;
+  var containerHeight = container.clientHeight;
+  var x = typeof e.pageX === 'number' ? e.pageX : e.touches[0].pageX;
+  var y = typeof e.pageY === 'number' ? e.pageY : e.touches[0].pageY;
+  var left = x - (container.getBoundingClientRect().left + window.pageXOffset);
+  var top = y - (container.getBoundingClientRect().top + window.pageYOffset);
+  if (direction === 'vertical') {
+    var h;
+    if (top < 0) {
+      h = 359;
+    } else if (top > containerHeight) {
+      h = 0;
+    } else {
+      var percent = -(top * 100 / containerHeight) + 100;
+      h = 360 * percent / 100;
+    }
+    if (hsl.h !== h) {
+      return {
+        h: h,
+        s: hsl.s,
+        l: hsl.l,
+        a: hsl.a,
+        source: 'hsl'
+      };
+    }
+  } else {
+    var _h;
+    if (left < 0) {
+      _h = 0;
+    } else if (left > containerWidth) {
+      _h = 359;
+    } else {
+      var _percent = left * 100 / containerWidth;
+      _h = 360 * _percent / 100;
+    }
+    if (hsl.h !== _h) {
+      return {
+        h: _h,
+        s: hsl.s,
+        l: hsl.l,
+        a: hsl.a,
+        source: 'hsl'
+      };
+    }
+  }
+  return null;
+};

package/lib/ColorPicker/SketchPicker/helpers/index.js

@@ -0,0 +1,2 @@
+export * from './checkboard';
+export * from './color';

package/lib/ColorPicker/SketchPicker/helpers/interaction.js

@@ -0,0 +1,55 @@
+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 _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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+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); }
+/* eslint-disable no-invalid-this */
+import React from 'react';
+export var handleFocus = function handleFocus(Component) {
+  var Span = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'span';
+  return /*#__PURE__*/function (_React$Component) {
+    _inherits(Focus, _React$Component);
+    function Focus() {
+      var _this;
+      _classCallCheck(this, Focus);
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      _this = _callSuper(this, Focus, [].concat(args));
+      _defineProperty(_assertThisInitialized(_this), "state", {
+        focus: false
+      });
+      _defineProperty(_assertThisInitialized(_this), "handleFocus", function () {
+        return _this.setState({
+          focus: true
+        });
+      });
+      _defineProperty(_assertThisInitialized(_this), "handleBlur", function () {
+        return _this.setState({
+          focus: false
+        });
+      });
+      return _this;
+    }
+    _createClass(Focus, [{
+      key: "render",
+      value: function render() {
+        return /*#__PURE__*/React.createElement(Span, {
+          onFocus: this.handleFocus,
+          onBlur: this.handleBlur
+        }, /*#__PURE__*/React.createElement(Component, _extends({}, this.props, this.state)));
+      }
+    }]);
+    return Focus;
+  }(React.Component);
+};

package/lib/ColorPicker/SketchPicker/helpers/saturation.js

@@ -0,0 +1,28 @@
+export var calculateChange = function calculateChange(e, hsl, container) {
+  var _container$getBoundin = container.getBoundingClientRect(),
+    containerWidth = _container$getBoundin.width,
+    containerHeight = _container$getBoundin.height;
+  var x = typeof e.pageX === 'number' ? e.pageX : e.touches[0].pageX;
+  var y = typeof e.pageY === 'number' ? e.pageY : e.touches[0].pageY;
+  var left = x - (container.getBoundingClientRect().left + window.pageXOffset);
+  var top = y - (container.getBoundingClientRect().top + window.pageYOffset);
+  if (left < 0) {
+    left = 0;
+  } else if (left > containerWidth) {
+    left = containerWidth;
+  }
+  if (top < 0) {
+    top = 0;
+  } else if (top > containerHeight) {
+    top = containerHeight;
+  }
+  var saturation = left / containerWidth;
+  var bright = 1 - top / containerHeight;
+  return {
+    h: hsl.h,
+    s: saturation,
+    v: bright,
+    a: hsl.a,
+    source: 'hsv'
+  };
+};

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/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.5",
+  "version": "2.5.7",
   "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",
@@ -114,6 +113,7 @@
     "react-router-cache-route": "1.11.1",
     "react-select": "^3.2.0",
     "react-viewer": "^3.2.2",
+    "reactcss": "^1.2.0",
     "resize-observer-polyfill": "^1.5.1",
     "scroll-into-view-if-needed": "^2.2.25",
     "socket.io-client": "2.5.0",
@@ -147,5 +147,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "46b2853aff3fc06cda3a575fcf49dc688b547551"
+  "gitHead": "38108e9d670b44253051c68e446442e9956b2f1e"
 }