@chaoswise/ui 2.3.10 → 2.3.11

package/lib/CWTree/index.js

@@ -9,7 +9,7 @@ import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
 import _Menu from "@chaoswise/ui/lib/Menu";
 import "antd/es/tree/style";
 import _Tree from "antd/es/tree";
-var _excluded = ["children", "treeData", "menuData", "extendType", "onClickMenu", "menuStyle", "menuRender", "extraFooter", "tooltipPlacement", "searchValue", "multiple", "selectedKeys", "defaultSelectedKeys", "onSelect", "searchHighlight", "draggable", "isDrawer", "searchHighlightStyle", "className", "caseSensitive", "onExpand"],
+var _excluded = ["children", "treeData", "menuData", "extendType", "onClickMenu", "menuStyle", "menuRender", "extraFooter", "tooltipPlacement", "searchValue", "multiple", "selectedKeys", "defaultSelectedKeys", "onSelect", "searchHighlight", "draggable", "isDrawer", "searchHighlightStyle", "className", "caseSensitive", "onExpand", "renderItem"],
   _excluded2 = ["icon", "title", "key", "children"];
 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; }
@@ -75,6 +75,7 @@ function CWTree(_ref) {
     caseSensitive = _ref$caseSensitive === void 0 ? false : _ref$caseSensitive,
     _ref$onExpand = _ref.onExpand,
     onExpand = _ref$onExpand === void 0 ? function () {} : _ref$onExpand,
+    renderItem = _ref.renderItem,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
@@ -235,6 +236,11 @@ function CWTree(_ref) {
           style: searchHighlightStyle
         }, searchStr), afterTitle) : /*#__PURE__*/React.createElement("span", null, title);
       }
+
+      // renderItem 自定义
+      if (renderItem) {
+        _title = renderItem(_title, _props);
+      }
       return /*#__PURE__*/React.createElement(TreeNode, _extends({
         className: "cw-tree-treenode",
         record: _props,
@@ -407,7 +413,11 @@ CWTree.propTypes = {
   /**
    * 使用抽屉扩展功能
    */
-  isDrawer: PropTypes.bool
+  isDrawer: PropTypes.bool,
+  /**
+   * 自定义render node节点
+   */
+  renderItem: PropTypes.func
 };
 CWTree.TreeNode = TreeNode;
 CWTree.DirectoryTree = DirectoryTree;

package/lib/CWTree/utils/index.js

@@ -6,13 +6,19 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 import { KMPMatch } from "../../QuickTransfer/utils";
 import isUndefined from "lodash-es/isUndefined";
+var getFinalStr = function getFinalStr(con) {
+  if (typeof con === "string") {
+    return con.toLowerCase();
+  }
+  return con;
+};
 export var createTree = function createTree(list, searchValue, caseSensitive, isAppend) {
   return list.reduce(function (t, c) {
     var children = c.children,
       title = c.title,
       isLeaf = c.isLeaf;
-    var finalTitle = caseSensitive ? title : title.toLowerCase();
-    var finalSearchValue = caseSensitive ? searchValue : searchValue.toLowerCase();
+    var finalTitle = caseSensitive ? title : getFinalStr(title);
+    var finalSearchValue = caseSensitive ? searchValue : getFinalStr(searchValue);
     var isHit = KMPMatch(finalTitle, finalSearchValue) > -1;
     var leafNode = isUndefined(isLeaf) ? !Boolean(Array.isArray(children)) : isLeaf;
     if (children && children.length) {

package/lib/Form/FormItem.js

@@ -39,8 +39,7 @@ var FormItem = function FormItem(_ref) {
         }, labelCol),
         wrapperCol: _objectSpread({
           style: {
-            flex: 1,
-            width: 0 // csshack修复flex:1分摊剩余空间有问题
+            flex: 1
           }
         }, wrapperCol),
         label: !label && label !== '' && !showLabelWidth ? label : /*#__PURE__*/React.createElement(_Tooltip, {

package/lib/Pagination/index.js

@@ -1,10 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+import "@chaoswise/ui/lib/Form/index.less";
+import _Form from "@chaoswise/ui/lib/Form";
 import "antd/es/pagination/style";
 import _Pagination from "antd/es/pagination";
 import "@chaoswise/ui/lib/SimplePagination/index.less";
 import _SimplePagination from "@chaoswise/ui/lib/SimplePagination";
-import "@chaoswise/ui/lib/Form/index.less";
-import _Form from "@chaoswise/ui/lib/Form";
 import "@chaoswise/ui/lib/Input/index.less";
 import _Input from "@chaoswise/ui/lib/Input";
 import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
@@ -256,7 +256,7 @@ function CWPagination(props) {
       marginLeft: 16
     },
     ref: inputRef
-  }, /*#__PURE__*/React.createElement("span", null, localeObj["goto"]), /*#__PURE__*/React.createElement(_Form, null, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Input, {
+  }, /*#__PURE__*/React.createElement("span", null, localeObj["goto"]), /*#__PURE__*/React.createElement(_Input, {
     value: value,
     size: size === "small" ? "small" : "default",
     onPressEnter: inputEnterHandle,
@@ -264,7 +264,7 @@ function CWPagination(props) {
     className: "cw-pagination-jump-input",
     onChange: inputChange,
     type: "text"
-  }))), /*#__PURE__*/React.createElement("span", null, localeObj.page)) : null;
+  }), /*#__PURE__*/React.createElement("span", null, localeObj.page)) : null;
   var finalRenderPagination = /*#__PURE__*/React.createElement("div", {
     className: "cw-pagination-wrapper",
     style: {

package/lib/Pagination/index.less

@@ -103,19 +103,11 @@
         // border: 1px solid #d9d9d9;
         // border-radius: 8px;
         line-height: @pagination-item-size;
-        .@{ant-prefix}-form-item{
-            margin-bottom: 0;
-        }
-        .@{ant-prefix}-form-horizontal{
-            padding: 0 8px;
-        }
-        .@{ant-prefix}-form-item-control{
-            line-height: 0;
-        }
         .cw-pagination-jump-input{
             width: 42px;
             // height: 32px;
             padding: 7px 9px;
+            margin: 0 8px;
             background: @component-background;
             border-radius: @border-radius-base;
             border: @border-width-base @border-style-base @border-color-base;

package/lib/QuickTransfer/Drag.js

@@ -0,0 +1,55 @@
+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 React, { Fragment, useMemo } from "react";
+import DragList from "./DragList";
+import { DndProvider } from "react-dnd";
+import { HTML5Backend } from "react-dnd-html5-backend";
+var Drag = function Drag(props) {
+  var checkValue = props.checkValue,
+    handleDelete = props.handleDelete,
+    handlePreviewList = props.handlePreviewList,
+    type = props.type,
+    render = props.render,
+    renderColumns = props.renderColumns,
+    dragList = props.dragList,
+    useDndProvider = props.useDndProvider;
+  var moveList = function moveList(dragIndex, hoverIndex) {
+    var tmp = checkValue[dragIndex]; //临时储存文件
+    checkValue.splice(dragIndex, 1); //移除拖拽项
+    checkValue.splice(hoverIndex, 0, tmp); //插入放置项
+    handlePreviewList(_toConsumableArray(checkValue)); //更新修改后的列表
+  };
+
+  var hasPrefixIcon = useMemo(function () {
+    var isLockSort = checkValue.filter(function (item) {
+      return item.disabled;
+    }).length;
+    return Boolean(isLockSort || dragList);
+  }, [checkValue, dragList]);
+  var renderList = function renderList(item, index) {
+    return /*#__PURE__*/React.createElement(DragList, {
+      key: item.key,
+      index: index,
+      listItem: item,
+      type: type,
+      renderColumns: renderColumns,
+      render: render,
+      handleDelete: handleDelete,
+      moveList: moveList,
+      dragList: dragList,
+      hasPrefixIcon: hasPrefixIcon
+    });
+  };
+  return /*#__PURE__*/React.createElement(Fragment, null, useDndProvider ? /*#__PURE__*/React.createElement(DndProvider, {
+    backend: HTML5Backend
+  }, checkValue.map(function (item, index) {
+    return renderList(item, index);
+  })) : checkValue.map(function (item, index) {
+    return renderList(item, index);
+  }));
+};
+export default Drag;

package/lib/QuickTransfer/DragList.js

@@ -0,0 +1,98 @@
+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";
+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 _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, { Fragment, useRef } from "react";
+import { useDrag, useDrop } from "react-dnd";
+import classnames from "classnames";
+import { getLocale } from "./locale";
+import LockSvg from "./assets/LockSvg";
+import DragSvg from "./assets/DragSvg";
+var DragList = function DragList(_ref) {
+  var index = _ref.index,
+    listItem = _ref.listItem,
+    type = _ref.type,
+    renderColumns = _ref.renderColumns,
+    render = _ref.render,
+    handleDelete = _ref.handleDelete,
+    moveList = _ref.moveList,
+    dragList = _ref.dragList,
+    hasPrefixIcon = _ref.hasPrefixIcon;
+  var title = listItem.title,
+    disabled = listItem.disabled;
+  // 获取当前语言
+  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
+    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
+    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
+  var localeObj = getLocale(locale);
+  var dragRef = useRef(null);
+  var _useDrag = useDrag({
+      item: {
+        type: "transferDrag",
+        index: index
+      }
+    }),
+    _useDrag2 = _slicedToArray(_useDrag, 2),
+    drag = _useDrag2[1];
+  var _useDrop = useDrop({
+      accept: "transferDrag",
+      hover: function hover(item) {
+        //拖拽目标的Index
+        var dragIndex = item.index;
+        //放置目标Index
+        var hoverIndex = index;
+        // 如果拖拽目标和放置目标相同的话，停止执行
+        if (dragIndex === hoverIndex) {
+          return;
+        }
+        moveList(dragIndex, hoverIndex); //调用方法完成交换
+        item.index = hoverIndex; //重新赋值index，否则会出现无限交换情况
+      }
+    }),
+    _useDrop2 = _slicedToArray(_useDrop, 2),
+    _ = _useDrop2[0],
+    drop = _useDrop2[1];
+  var renderTable = function renderTable(listItem) {
+    return /*#__PURE__*/React.createElement("div", null, renderColumns.map(function (item, index) {
+      return /*#__PURE__*/React.createElement("span", {
+        style: {
+          marginRight: "8px"
+        },
+        key: index
+      }, render(listItem[item]));
+    }));
+  };
+  var renderPrefixIcon = /*#__PURE__*/React.createElement("div", {
+    className: "cw-transfer-right-content-item-prefix-icon-wrapper"
+  }, disabled ? /*#__PURE__*/React.createElement(LockSvg, null) : /*#__PURE__*/React.createElement(_Tooltip, {
+    title: localeObj["dragAndDrop"]
+  }, /*#__PURE__*/React.createElement(DragSvg, null)));
+  var renderItemContent = /*#__PURE__*/React.createElement("div", {
+    className: "cw-transfer-right-content-item"
+  }, hasPrefixIcon && renderPrefixIcon, /*#__PURE__*/React.createElement("div", {
+    className: "cw-transfer-right-content-item-text-wrapper"
+  }, type === "table" ? renderTable(listItem) : render(title)), !disabled && /*#__PURE__*/React.createElement(_Icon, {
+    type: "close",
+    className: "cw-transfer-right-content-del",
+    onClick: function onClick() {
+      return handleDelete(listItem);
+    }
+  }));
+  var dragProps = dragList && !disabled ? {
+    ref: drag(drop(dragRef)),
+    style: {
+      cursor: "move"
+    }
+  } : {};
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", _extends({
+    className: classnames("cw-transfer-right-content-main")
+  }, dragProps), renderItemContent));
+};
+export default DragList;

package/lib/QuickTransfer/NoDrag.js

@@ -1,47 +1,30 @@
-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 _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 React, { Fragment } from 'react';
+import React, { Fragment, useMemo } from "react";
 import NotDragList from "./NotDragList";
 var NoDrag = function NoDrag(props) {
   var checkValue = props.checkValue,
     handleDelete = props.handleDelete,
-    handlePreviewList = props.handlePreviewList,
     type = props.type,
     render = props.render,
     renderColumns = props.renderColumns,
-    dragList = props.dragList,
-    useDndProvider = props.useDndProvider;
-  var moveList = function moveList(dragIndex, hoverIndex) {
-    var tmp = checkValue[dragIndex]; //临时储存文件
-    checkValue.splice(dragIndex, 1); //移除拖拽项
-    checkValue.splice(hoverIndex, 0, tmp); //插入放置项
-    handlePreviewList(_toConsumableArray(checkValue)); //更新修改后的列表
-  };
-
-  var isLockSort = checkValue.filter(function (item) {
-    return item.disabled;
-  }).length;
+    dragList = props.dragList;
+  var hasPrefixIcon = useMemo(function () {
+    var isLockSort = checkValue.filter(function (item) {
+      return item.disabled;
+    }).length;
+    return Boolean(isLockSort);
+  }, [checkValue]);
   var renderList = function renderList(item, index) {
-    return /*#__PURE__*/React.createElement(NotDragList, _extends({
-      labelValue: item,
+    return /*#__PURE__*/React.createElement(NotDragList, {
+      key: item.key,
+      index: index,
+      listItem: item,
       type: type,
       renderColumns: renderColumns,
-      label: item.key,
-      value: item.title && item.title,
-      index: index,
       render: render,
-      key: item.key,
       handleDelete: handleDelete,
-      moveList: moveList,
       dragList: dragList,
-      useDndProvider: useDndProvider,
-      isLockSort: isLockSort
-    }, item));
+      hasPrefixIcon: hasPrefixIcon
+    });
   };
   return /*#__PURE__*/React.createElement(Fragment, null, checkValue.map(function (item, index) {
     return renderList(item, index);

package/lib/QuickTransfer/NotDragList.js

@@ -1,85 +1,42 @@
 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", "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; }
 import React, { Fragment } from "react";
 import classnames from "classnames";
-import { getLocale } from "./locale";
 import LockSvg from "./assets/LockSvg";
-import DragSvg from "./assets/DragSvg";
 var NotDragList = function NotDragList(_ref) {
-  var label = _ref.label,
-    value = _ref.value,
-    index = _ref.index,
-    handleDelete = _ref.handleDelete,
-    labelValue = _ref.labelValue,
+  var listItem = _ref.listItem,
     type = _ref.type,
     renderColumns = _ref.renderColumns,
     render = _ref.render,
-    dragList = _ref.dragList,
-    disabled = _ref.disabled,
-    isLockSort = _ref.isLockSort,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  // 获取当前语言
-  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
-    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
-    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
-  var localeObj = getLocale(locale);
-  var handleDeleted = function handleDeleted(labelValue) {
-    handleDelete(labelValue);
-  };
-  var renderTable = function renderTable(labelValue) {
+    handleDelete = _ref.handleDelete,
+    hasPrefixIcon = _ref.hasPrefixIcon;
+  var title = listItem.title,
+    disabled = listItem.disabled;
+  var renderTable = function renderTable(listItem) {
     return /*#__PURE__*/React.createElement("div", null, renderColumns.map(function (item, index) {
       return /*#__PURE__*/React.createElement("span", {
         style: {
           marginRight: "8px"
         },
         key: index
-      }, render(labelValue[item]));
+      }, render(listItem[item]));
     }));
   };
-  var dragProps = dragList && !disabled ? {
-    style: {
-      cursor: "move"
-    }
-  } : {};
-  var lockSortContent = /*#__PURE__*/React.createElement("div", {
+  var renderPrefixIcon = /*#__PURE__*/React.createElement("div", {
+    className: "cw-transfer-right-content-item-prefix-icon-wrapper"
+  }, disabled && /*#__PURE__*/React.createElement(LockSvg, null));
+  var renderItemContent = /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "cw-transfer-right-content-item-drag-wrapper"
-  }, disabled ? /*#__PURE__*/React.createElement(LockSvg, null) : /*#__PURE__*/React.createElement(_Tooltip, {
-    title: localeObj["dragAndDrop"]
-  }, /*#__PURE__*/React.createElement(DragSvg, null))), /*#__PURE__*/React.createElement("div", {
+  }, hasPrefixIcon && renderPrefixIcon, /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-content-item-text-wrapper"
-  }, 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 = 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"
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 1,
-      width: 0
-    }
-  }, type === "table" ? renderTable(labelValue) : render(value)), /*#__PURE__*/React.createElement(_Icon, {
+  }, type === "table" ? renderTable(listItem) : render(title)), !disabled && /*#__PURE__*/React.createElement(_Icon, {
     type: "close",
     className: "cw-transfer-right-content-del",
     onClick: function onClick() {
-      return handleDeleted(labelValue);
+      return handleDelete(listItem);
     }
   }));
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", _extends({
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-transfer-right-content-main")
-  }, dragProps), renderItemContent));
+  }, renderItemContent));
 };
 export default NotDragList;

package/lib/QuickTransfer/index.js

@@ -39,7 +39,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useState, useEffect, Fragment, forwardRef, useMemo } from "react";
 import { filterTreeByName, filterTree, filterTreeByNameTable, filterObj, getNotSelectKeys, getKeysAndTitle, getBottomKey, renderLeafNodetree, renderRelationNode, createTitle } from "./utils";
 import classnames from "classnames";
-import CheckList from "./CheckList";
+import Drag from "./Drag";
 import PropTypes from "prop-types";
 import { getLocale } from "./locale";
 import "./index.less";
@@ -295,12 +295,22 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       getTargetKeys(checkedKeys);
     }
   }, [checkedKeys]);
+  var isMath = function isMath(title, searchValue) {
+    if (!searchValue) {
+      return true;
+    }
+    if (typeof title === 'string' && typeof searchValue === 'string') {
+      return title.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
+    }
+    return false;
+  };
+
   // 内置的右侧搜索框内容改变触发搜索
   var handleRightSearch = function handleRightSearch(searchValue) {
     var newCheckedValue = [];
     if (type === "list") {
       checkValue.forEach(function (item, index) {
-        if (item.title.toLowerCase().indexOf(searchValue.toLowerCase()) > -1) {
+        if (isMath(item.title, searchValue)) {
           newCheckedValue.push(checkValue[index]);
         }
       });
@@ -332,7 +342,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     var listCheckedKeys_ = [];
     if (type === "list") {
       dataSource.forEach(function (item, index) {
-        if (item.title.toLowerCase().indexOf(searchValue.toLowerCase()) > -1) {
+        if (isMath(item.title, searchValue)) {
           newData.push(dataSource[index]);
         }
       });
@@ -433,16 +443,10 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   var clearAll = function clearAll() {
     var newCheckedValue = [];
     var newCheckedKey = [];
-    var disabledKeys = searchCheckedValue.filter(function (item) {
-      return item.disabled;
-    }).map(function (item) {
-      return item.key;
-    });
     newCheckedValue = checkValue.filter(function (i) {
-      if (disabledKeys.includes(i.key)) {
-        return true;
-      }
-      return false;
+      return !Boolean(handleRightSearch(saveSearchValueRight).find(function (item) {
+        return item.key == i.key && !item.disabled;
+      }));
     });
     newCheckedKey = newCheckedValue.map(function (item) {
       return item.key;
@@ -641,6 +645,22 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var allSelectedText = "".concat(localeObj.checkAll, "\uFF08").concat(listCheckedKeys.length, "\uFF09");
   // 根据不同的type渲染不同的列表类型，目前支持list tree table
+
+  var getFinalTitle = function getFinalTitle(title) {
+    if (typeof title === 'string') {
+      var _createTitle = createTitle(caseSensitive, saveSearchValueLeft, title),
+        index = _createTitle.index,
+        beforeTitle = _createTitle.beforeTitle,
+        afterTitle = _createTitle.afterTitle,
+        searchStr = _createTitle.searchStr;
+      return /*#__PURE__*/React.createElement("span", null, index > -1 ? /*#__PURE__*/React.createElement(React.Fragment, null, beforeTitle, /*#__PURE__*/React.createElement("span", {
+        style: {
+          color: "#F5222D"
+        }
+      }, searchStr), afterTitle) : value.title);
+    }
+    return title;
+  };
   var transferContent = function transferContent(data) {
     if (type === "list") {
       return /*#__PURE__*/React.createElement("div", {
@@ -650,11 +670,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         onChange: onCheckAllChange,
         checked: checkAll
       }, allSelectedTextRender ? allSelectedTextRender(listCheckedKeys, data) : allSelectedText), data.map(function (value) {
-        var _createTitle = createTitle(caseSensitive, saveSearchValueLeft, value.title),
-          index = _createTitle.index,
-          beforeTitle = _createTitle.beforeTitle,
-          afterTitle = _createTitle.afterTitle,
-          searchStr = _createTitle.searchStr;
         return /*#__PURE__*/React.createElement(_Checkbox, {
           key: value.key,
           checked: listCheckedKeys.includes(value.key),
@@ -665,11 +680,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         }, /*#__PURE__*/React.createElement(_TooltipText, {
           title: value.title,
           placement: 'topLeft'
-        }, /*#__PURE__*/React.createElement("span", null, index > -1 ? /*#__PURE__*/React.createElement(React.Fragment, null, beforeTitle, /*#__PURE__*/React.createElement("span", {
-          style: {
-            color: "#F5222D"
-          }
-        }, searchStr), afterTitle) : value.title)));
+        }, getFinalTitle(value.title)));
       }));
     }
     if (type === "table") {
@@ -698,16 +709,18 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       }, treeRest));
     }
   };
+  // todo - react-dnd：DndProvider的问题拖拽和非拖拽需要分开写
   var renderRightList = searchCheckedValue.length === 0 ? /*#__PURE__*/React.createElement(_Empty, {
     description: localeObj["pleaseSelectFromLeft"]
-  }) : useDndProvider ? /*#__PURE__*/React.createElement(CheckList, {
+  }) : dragList ? /*#__PURE__*/React.createElement(Drag, {
     checkValue: searchCheckedValue,
     handleDelete: handleDelete,
     type: type,
     render: render,
     renderColumns: renderColumns ? renderColumns : newRenderColumns,
     dragList: dragList,
-    handlePreviewList: handlePreviewList
+    handlePreviewList: handlePreviewList,
+    useDndProvider: useDndProvider
   }) : /*#__PURE__*/React.createElement(NoDrag, {
     checkValue: searchCheckedValue,
     handleDelete: handleDelete,
@@ -715,7 +728,8 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     render: render,
     renderColumns: renderColumns ? renderColumns : newRenderColumns,
     dragList: dragList,
-    handlePreviewList: handlePreviewList
+    handlePreviewList: handlePreviewList,
+    useDndProvider: useDndProvider
   });
   return /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-transfer-main", {
@@ -774,11 +788,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
 });
 QuickTransfer.propTypes = {
   /**
-   * 是否开启搜索框，默认开启
-   */
-  showSearch: PropTypes.bool,
-  /**
-   * showSearch开启后搜索框的props属性，指出antd的Input.Search所有属性
+   * 搜索框的props属性，指出antd的Input.Search所有属性
    */
   searchProps: PropTypes.object,
   /**

package/lib/QuickTransfer/index.less

@@ -180,7 +180,7 @@
             align-items: center;
             width: 100%;
 
-            .cw-transfer-right-content-item-drag-wrapper {
+            .cw-transfer-right-content-item-prefix-icon-wrapper {
               display: flex;
               justify-content: center;
               align-items: center;

package/lib/QuickTransfer/utils.js

@@ -67,8 +67,14 @@ export var KMPMatch = function KMPMatch(str, pattern) {
     return -1;
   }
 };
+var getFinalStr = function getFinalStr(con) {
+  if (typeof con === "string") {
+    return con.toLowerCase();
+  }
+  return con;
+};
 export var createTitle = function createTitle(caseSensitive, searchValue, title) {
-  var index = caseSensitive ? KMPMatch(title, searchValue) : KMPMatch(title.toLowerCase(), searchValue.toLowerCase());
+  var index = caseSensitive ? KMPMatch(title, searchValue) : KMPMatch(getFinalStr(title), getFinalStr(searchValue));
   var beforeTitle = title.substr(0, index);
   var searchStr = title.substr(index, searchValue.length);
   var afterTitle = title.substr(index + searchValue.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.3.10",
+  "version": "2.3.11",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -140,5 +140,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "08c3f2cabbbf26304f03b36797f1dccd60fc8647"
+  "gitHead": "b43201bccc63f00e99a7144afec62280ec3465fc"
 }