@chaoswise/ui 2.2.7 → 2.2.9

package/lib/CWMessage/index.js

@@ -168,10 +168,12 @@ function Message(props) {
                   };
                   readInnerMessage(params);
                   onClickStrongMessageItem(data);
+                  _notification.close(id);
                 },
                 duration: time,
                 prefixCls: "".concat(prefixCls, "-notification"),
-                className: "cw-message-notification-wrapper"
+                className: "cw-message-notification-wrapper",
+                key: id
               }, restStrongMessageOption));
             }
           case 6:

package/lib/CWMessage/index.less

@@ -40,6 +40,9 @@
 .cw-message-notification-wrapper {
   .@{ant-prefix}-notification-notice-message{
     width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
   }
   .@{ant-prefix}-notification-notice-description {
     overflow: hidden;

package/lib/QuickTransfer/CheckList.js

@@ -7,6 +7,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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 TopicList from './TopicList';
+import { DndProvider } from "react-dnd";
+import { HTML5Backend } from "react-dnd-html5-backend";
 var CheckList = function CheckList(props) {
   var checkValue = props.checkValue,
     handleDelete = props.handleDelete,
@@ -14,7 +16,8 @@ var CheckList = function CheckList(props) {
     type = props.type,
     render = props.render,
     renderColumns = props.renderColumns,
-    dragList = props.dragList;
+    dragList = props.dragList,
+    useDndProvider = props.useDndProvider;
   var moveList = function moveList(dragIndex, hoverIndex) {
     var tmp = checkValue[dragIndex]; //临时储存文件
     checkValue.splice(dragIndex, 1); //移除拖拽项
@@ -38,11 +41,14 @@ var CheckList = function CheckList(props) {
       handleDelete: handleDelete,
       moveList: moveList,
       dragList: dragList,
+      useDndProvider: useDndProvider,
       isLockSort: isLockSort
     }, item));
   };
-  return /*#__PURE__*/React.createElement(Fragment, null, checkValue.map(function (item, index) {
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(DndProvider, {
+    backend: HTML5Backend
+  }, checkValue.map(function (item, index) {
     return renderList(item, index);
-  }));
+  })));
 };
 export default CheckList;

package/lib/QuickTransfer/NoDrag.js

@@ -0,0 +1,50 @@
+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 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 = type === "list" && checkValue.filter(function (item) {
+    return item.disabled;
+  }).length;
+  var renderList = function renderList(item, index) {
+    return /*#__PURE__*/React.createElement(NotDragList, _extends({
+      labelValue: 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));
+  };
+  return /*#__PURE__*/React.createElement(Fragment, null, checkValue.map(function (item, index) {
+    return renderList(item, index);
+  }));
+};
+export default NoDrag;

package/lib/QuickTransfer/NotDragList.js

@@ -1,32 +1,81 @@
-import React, { Fragment } from 'react';
-export default function NotDragList(_ref) {
-  var checkValue = _ref.checkValue,
+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"];
+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,
+    moveList = _ref.moveList,
     type = _ref.type,
     renderColumns = _ref.renderColumns,
-    render = _ref.render;
-  var renderTable = function renderTable(rest) {
+    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) {
     return /*#__PURE__*/React.createElement("div", null, renderColumns.map(function (item, index) {
       return /*#__PURE__*/React.createElement("span", {
         style: {
-          marginRight: '8px'
+          marginRight: "8px"
         },
         key: index
-      }, render(rest[item]));
+      }, render(labelValue[item]));
     }));
   };
-  var handleDeleted = function handleDeleted(value) {
-    handleDelete(value);
-  };
-  return /*#__PURE__*/React.createElement(Fragment, null, checkValue.map(function (item, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "cw-transfer-right-content-main",
-      key: "".concat(item, "+").concat(index)
-    }, type === 'table' ? renderTable(item) : render(item.title), /*#__PURE__*/React.createElement("span", {
-      className: "cw-transfer-right-content-del",
-      onClick: function onClick() {
-        return handleDeleted(item);
-      }
-    }, "X"));
+  var dragProps = dragList && !disabled ? {
+    style: {
+      cursor: "move"
+    }
+  } : {};
+  var listLockSortContent = /*#__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", {
+    className: "cw-transfer-right-content-item-text-wrapper"
+  }, 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, {
+    title: localeObj["dragAndDrop"]
+  }, /*#__PURE__*/React.createElement(DragSvg, {
+    className: "cw-transfer-right-content-drag"
+  })), /*#__PURE__*/React.createElement("div", null, type === "table" ? renderTable(labelValue) : render(value)), /*#__PURE__*/React.createElement(_Icon, {
+    type: "close",
+    className: "cw-transfer-right-content-del",
+    onClick: function onClick() {
+      return handleDeleted(labelValue);
+    }
   }));
-}
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", _extends({
+    className: classnames("cw-transfer-right-content-main")
+  }, dragProps), renderItemContent));
+};
+export default NotDragList;

package/lib/QuickTransfer/index.js

@@ -37,13 +37,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useState, useEffect, Fragment, forwardRef, useMemo } from "react";
 import { filterTreeByName, filterTreeByNameTable, filterObj, getNotSelectKeys, getKeysAndTitle, getBottomKey, renderLeafNodetree, renderRelationNode } from "./utils";
 import classnames from "classnames";
-import { DndProvider } from "react-dnd";
-import { HTML5Backend } from "react-dnd-html5-backend";
 import CheckList from "./CheckList";
 import PropTypes from "prop-types";
 import { getLocale } from "./locale";
 import "./index.less";
 import { isEqual } from "@chaoswise/utils";
+import NoDrag from "./NoDrag";
 var Search = _Input.Search;
 
 /**
@@ -687,7 +686,15 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var list = searchCheckedValue.length === 0 ? /*#__PURE__*/React.createElement(_Empty, {
     description: localeObj["pleaseSelectFromLeft"]
-  }) : /*#__PURE__*/React.createElement(CheckList, {
+  }) : useDndProvider ? /*#__PURE__*/React.createElement(CheckList, {
+    checkValue: searchCheckedValue,
+    handleDelete: handleDelete,
+    type: type,
+    render: render,
+    renderColumns: renderColumns ? renderColumns : newRenderColumns,
+    dragList: dragList,
+    handlePreviewList: handlePreviewList
+  }) : /*#__PURE__*/React.createElement(NoDrag, {
     checkValue: searchCheckedValue,
     handleDelete: handleDelete,
     type: type,
@@ -747,9 +754,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"
-  }, useDndProvider ? /*#__PURE__*/React.createElement(DndProvider, {
-    backend: HTML5Backend
-  }, list) : list)), rightFooter && /*#__PURE__*/React.createElement("div", {
+  }, list)), rightFooter && /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-footer"
   }, rightFooter))));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -139,5 +139,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "0147b0f0328fd8b0e07d5679c307a28609b557cf"
+  "gitHead": "a813bf6565e6d63f6e4aa9af86067e6a577f521e"
 }