acud 0.0.63 → 0.0.66

package/lib/transfer/index.js

@@ -21,9 +21,9 @@ var _classnames2 = _interopRequireDefault(require("classnames"));
 
 var _default = _interopRequireDefault(require("../locale/default"));
 
-var _dataSource = _interopRequireDefault(require("./dataSource"));
+var _DataSource = _interopRequireDefault(require("./DataSource"));
 
-var _target = _interopRequireDefault(require("./target"));
+var _Target = _interopRequireDefault(require("./Target"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -33,11 +33,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * transfer 穿梭框
  * author zhousheng
  */
-;
-
 function transfer(props) {
+  var _classnames;
+
   var _props$prefixCls = props.prefixCls,
       prefixCls = _props$prefixCls === void 0 ? 'acud-transfer' : _props$prefixCls,
+      _props$displayType = props.displayType,
+      displayType = _props$displayType === void 0 ? 'single' : _props$displayType,
       _props$targetKeys = props.targetKeys,
       targetKeys = _props$targetKeys === void 0 ? [] : _props$targetKeys,
       onChange = props.onChange,
@@ -82,16 +84,18 @@ function transfer(props) {
   React.useEffect(function () {
     onChange && onChange(tKeys);
   }, [tKeys]);
-  var classNames = (0, _classnames2["default"])((0, _defineProperty2["default"])({}, prefixCls, true));
+  var classNames = (0, _classnames2["default"])((_classnames = {}, (0, _defineProperty2["default"])(_classnames, prefixCls, true), (0, _defineProperty2["default"])(_classnames, "".concat(prefixCls, "-table"), displayType === 'table'), _classnames));
   return /*#__PURE__*/React.createElement("div", {
     className: classNames
-  }, /*#__PURE__*/React.createElement(_dataSource["default"], (0, _extends2["default"])({}, props, {
+  }, /*#__PURE__*/React.createElement(_DataSource["default"], (0, _extends2["default"])({}, props, {
+    displayType: displayType,
     locale: userLocale,
     prefixCls: prefixCls,
     tKeys: tKeys,
     setTKeys: setTKeys,
     expansionSource: expansionSource
-  })), /*#__PURE__*/React.createElement(_target["default"], (0, _extends2["default"])({}, props, {
+  })), /*#__PURE__*/React.createElement(_Target["default"], (0, _extends2["default"])({}, props, {
+    displayType: displayType,
     locale: userLocale,
     prefixCls: prefixCls,
     tKeys: tKeys,

package/lib/transfer/style/css.js

@@ -2,4 +2,6 @@
 
 require("../../style/index.css");
 
-require("./index.css");
+require("./index.css");
+
+require("../../table/style/css");

package/lib/transfer/style/index.css

@@ -32,6 +32,7 @@
   border: 1px solid #E8E9EB;
   border-radius: 4px;
   background-color: #F7F7F9;
+  overflow: hidden;
 }
 .acud-transfer-datasource-header {
   display: flex;
@@ -42,8 +43,10 @@
   border-radius: 4px 4px 0 0;
   line-height: 21px;
 }
+.acud-transfer-datasource-header-checkall {
+  margin-right: 12px;
+}
 .acud-transfer-datasource-label {
-  margin-left: 12px;
   color: #151B26;
   font-size: 12px;
   font-weight: #FFECD4;
@@ -148,8 +151,8 @@
   padding-left: 60px;
 }
 .acud-transfer-datasource-search {
-  height: 24px;
-  margin: 8px 12px;
+  height: 40px;
+  padding: 8px 12px;
   width: auto;
   flex-shrink: 0;
 }
@@ -173,6 +176,7 @@
   border-radius: 4px;
   background-color: #F7F7F9;
   margin-left: 16px;
+  overflow: hidden;
 }
 .acud-transfer-target-header {
   display: flex;
@@ -325,10 +329,10 @@
   padding-left: 56px;
 }
 .acud-transfer-target-search {
-  margin: 8px 12px;
+  padding: 8px 12px;
   width: auto;
   flex-shrink: 0;
-  height: 24px;
+  height: 40px;
 }
 .acud-transfer-target-nodata {
   display: flex;
@@ -344,3 +348,21 @@
 .acud-transfer .acud-input input {
   font-size: 12px;
 }
+.acud-transfer.acud-transfer-table .acud-transfer-datasource,
+.acud-transfer.acud-transfer-table .acud-transfer-target {
+  height: 360px;
+}
+.acud-transfer.acud-transfer-table .acud-transfer-datasource-search,
+.acud-transfer.acud-transfer-table .acud-transfer-target-search {
+  background-color: #F7F7F9;
+  border-top: 1px solid #fff;
+}
+.acud-transfer.acud-transfer-table table {
+  border-top: 1px solid #fff;
+}
+.acud-transfer.acud-transfer-table table thead tr th:nth-last-child(2) {
+  border-right: none;
+}
+.acud-transfer.acud-transfer-table .acud-transfer-table-box {
+  overflow: auto;
+}

package/lib/transfer/style/index.d.ts

@@ -1,2 +1,3 @@
 import '../../style/index.less';
 import './index.less';
+import '../../table/style';

package/lib/transfer/style/index.js

@@ -2,4 +2,6 @@
 
 require("../../style/index.less");
 
-require("./index.less");
+require("./index.less");
+
+require("../../table/style");

package/lib/transfer/style/index.less

@@ -26,6 +26,7 @@
         border: 1px solid @G8;
         border-radius: @R3;
         background-color: @G10;
+        overflow: hidden;
         &-header {
             display: flex;
             flex: none;
@@ -34,9 +35,11 @@
             background-color: @G10;
             border-radius: @R3 @R3 0 0;
             line-height: 21px;
+            &-checkall {
+                margin-right: @P * 3;
+            }
         }
         &-label {
-            margin-left: @P * 3;
             color: @G2;
             font-size: @T2;
             font-weight: @W2;
@@ -87,8 +90,8 @@
             }
         }
         &-search {
-            height: @P * 6;
-            margin: @P * 2 @P * 3;
+            height: @P * 10;
+            padding: @P * 2 @P * 3;
             width: auto;
             flex-shrink: 0;
         }
@@ -113,6 +116,7 @@
         border-radius: @R3;
         background-color: @G10;
         margin-left: @P * 4;
+        overflow: hidden;
         &-header {
             display: flex;
             flex: none;
@@ -186,10 +190,10 @@
             }
         }
         &-search {
-            margin: @P * 2 @P * 3;
+            padding: @P * 2 @P * 3;
             width: auto;
             flex-shrink: 0;
-            height: @P * 6;
+            height: @P * 10;
         }
         &-nodata {
             display: flex;
@@ -206,4 +210,27 @@
     .@{acud-prefix}-input input {
         font-size: 12px;
     }
+    &.@{transfer-prefix-cls}-table {
+        .@{transfer-prefix-cls}-datasource,
+        .@{transfer-prefix-cls}-target {
+            height: 360px;
+        }
+        .@{transfer-prefix-cls}-datasource-search,
+        .@{transfer-prefix-cls}-target-search {
+            background-color: @G10;
+            border-top: 1px solid #fff;
+        }
+        table {
+            border-top: 1px solid #fff;
+            thead tr th:nth-last-child(2) {
+                border-right: none;
+            }
+            tbody > tr:last-child > td {
+                // border-bottom: none;
+            }
+        }
+        .@{transfer-prefix-cls}-table-box {
+            overflow: auto;
+        }
+    }
 }

package/lib/upload/UploadList/ListItem.js

@@ -132,7 +132,11 @@ var ListItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
   var infoUploadingClass = (0, _classnames["default"])((_classNames3 = {}, (0, _defineProperty2["default"])(_classNames3, "".concat(prefixCls, "-list-item"), true), (0, _defineProperty2["default"])(_classNames3, "".concat(prefixCls, "-list-item-").concat(file.status), true), (0, _defineProperty2["default"])(_classNames3, "".concat(prefixCls, "-list-item-list-type-").concat(listType), true), _classNames3));
   var linkProps = typeof file.linkProps === 'string' ? JSON.parse(file.linkProps) : file.linkProps;
-  var removeIcon = showRemoveIcon ? actionIconRender((typeof customRemoveIcon === 'function' ? customRemoveIcon(file) : customRemoveIcon) || listType === 'text' ? /*#__PURE__*/React.createElement(_OutlinedClose["default"], null) : /*#__PURE__*/React.createElement(_OutlinedDelete["default"], null), function () {
+  var removeIcon = showRemoveIcon ? actionIconRender((typeof customRemoveIcon === 'function' ? customRemoveIcon(file) : customRemoveIcon) || listType === 'text' ? /*#__PURE__*/React.createElement(_OutlinedClose["default"], {
+    width: 16
+  }) : /*#__PURE__*/React.createElement(_OutlinedDelete["default"], {
+    width: 16
+  }), function () {
     return onClose(file);
   }, prefixCls, locale.removeFile) : null;
   var downloadIcon = showDownloadIcon ? actionIconRender((typeof customDownloadIcon === 'function' ? customDownloadIcon(file) : customDownloadIcon) || /*#__PURE__*/React.createElement(_OutlinedCloudDownload["default"], null), function () {
@@ -219,7 +223,8 @@ var ListItem = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       strokeColor: "#2468F2",
       infoType: "none",
       type: "line",
-      percent: file.percent
+      percent: file.percent,
+      strokeWidth: listType === 'text' ? 2 : 4
     }, progressProps)) : null;
     return /*#__PURE__*/React.createElement("div", {
       className: (0, _classnames["default"])("".concat(prefixCls, "-list-item-progress"), motionClassName)

package/lib/upload/UploadList/index.js

@@ -196,16 +196,14 @@ var InternalUploadList = function InternalUploadList(_ref, ref) {
     }) : /*#__PURE__*/React.createElement(_OutlinedFile["default"], {
       width: 24
     });
-    var icon = isLoading ? /*#__PURE__*/React.createElement(_OutlinedLoading["default"], {
-      animation: "spin"
-    }) : renderIcon(file.name || file.fileName);
+    var icon = renderIcon(file.name || file.fileName);
 
     if (listType === 'picture') {
       icon = isLoading ? /*#__PURE__*/React.createElement(_OutlinedLoading["default"], {
         animation: "spin"
       }) : fileIcon;
     } else if (listType === 'picture-card') {
-      icon = isLoading ? locale.uploading : fileIcon;
+      icon = isLoading ? "".concat(locale.uploading, "...") : fileIcon;
     }
 
     return icon;
@@ -318,9 +316,8 @@ var UploadList = /*#__PURE__*/React.forwardRef(InternalUploadList);
 UploadList.displayName = 'UploadList';
 UploadList.defaultProps = {
   listType: 'text',
-  progress: {
-    strokeWidth: 2 // showInfo: false
-
+  progress: {// strokeWidth: 4,
+    // showInfo: false
   },
   showUploadIcon: true,
   showRemoveIcon: true,

package/lib/upload/style/index.css

@@ -43,6 +43,7 @@
   border-style: solid;
   cursor: pointer;
   transition: border-color 0.3s;
+  overflow: hidden;
   color: #5C5F66;
   background-color: #FFFFFF;
   border-color: #E8E9EB;
@@ -115,15 +116,12 @@
   height: 100%;
   text-align: center;
   border: 1px dashed #d9d9d9;
-  border-radius: 4px;
+  border-radius: 6px;
   cursor: pointer;
   transition: border-color 0.3s;
 }
-.acud-upload.acud-upload-drag .acud-upload {
-  padding: 16px 0;
-}
 .acud-upload.acud-upload-drag.acud-upload-drag-hover:not(.acud-upload-disabled) {
-  border-color: red;
+  border-color: #144BCC;
 }
 .acud-upload.acud-upload-drag.acud-upload-disabled {
   background: #fafafa;
@@ -300,10 +298,6 @@
   color: #B8BABF;
 }
 .acud-upload-list-item .acuicon-outlined-close {
-  position: absolute;
-  top: 4px;
-  right: 4px;
-  color: #B8BABF;
   font-size: 10px;
   line-height: 0;
   cursor: pointer;
@@ -319,6 +313,19 @@
 .acud-upload-list-item:hover .acuicon-outlined-close {
   opacity: 1;
 }
+.acud-upload-list-item .acuicon-outlined-cloud-download {
+  transition: all 0.3s;
+  opacity: 0;
+}
+.acud-upload-list-item:hover .acuicon-outlined-cloud-download {
+  opacity: 1;
+}
+.acud-upload-list-item-card-actions-btn {
+  margin-right: 6px;
+}
+.acud-upload-list-item-card-actions-btn:last-child {
+  margin-right: 0;
+}
 .acud-upload-list-item:hover .acud-upload-list-item-card-actions-btn {
   opacity: 1;
 }
@@ -328,12 +335,9 @@
 .acud-upload-list-item-error .acud-upload-list-item-info .acud-upload-text-icon .acuicon:hover {
   color: #F33E3E;
 }
-.acud-upload-list-item-error .acud-upload-list-item-card-actions .acuicon {
+.acud-upload-list-item-error .acud-upload-list-item-card-actions .acud-upload-text-icon {
   color: #F33E3E;
 }
-.acud-upload-list-item-error .acud-upload-list-item-card-actions-btn {
-  opacity: 1;
-}
 .acud-upload-list-item-progress {
   position: absolute;
   bottom: -12px;

package/lib/upload/style/index.less

@@ -5,11 +5,10 @@
 @upload-item: ~'@{acud-prefix}-upload-list-item';
 @upload-picture-card-size: 120px;
 @upload-picture-card-border-style: 1px;
-
 @heading-color: fade(#000, 85%);
 @background-color-light: hsv(0, 0, 98%);
 @border-color-base: hsv(0, 0, 85%);
-@primary-7: red;
+@primary-7: @B7;
 @primary-5: @B5;
 @item-hover-bg: #f5f5f5;
 @error-color: @E6;
@@ -61,6 +60,7 @@
         border-style: solid;
         cursor: pointer;
         transition: border-color .3s;
+        overflow: hidden;
         .basic-tp-config(@upload-pic-tp);
         .basic-p-config(@upload-pic-p);
 
@@ -90,14 +90,10 @@
         height: 100%;
         text-align: center;
         border: @border-width-base dashed @border-color-base;
-        border-radius: @R3;
+        border-radius: @R4;
         cursor: pointer;
         transition: border-color .3s;
 
-        .@{upload-prefix-cls} {
-            padding: @padding-md 0;
-        }
-
         &.@{upload-prefix-cls}-drag-hover:not(.@{upload-prefix-cls}-disabled) {
             border-color: @primary-7;
         }
@@ -253,10 +249,10 @@
         }
 
         .@{iconfont-css-prefix}-outlined-close {
-            position: absolute;
-            top: 4px;
-            right: 4px;
-            color: @text-color-secondary;
+            // position: absolute;
+            // top: 4px;
+            // right: 4px;
+            // color: @text-color-secondary;
             font-size: 10px;
             line-height: 0;
             cursor: pointer;
@@ -276,7 +272,20 @@
         &:hover .@{iconfont-css-prefix}-outlined-close {
             opacity: 1;
         }
+        .@{iconfont-css-prefix}-outlined-cloud-download {
+            transition: all .3s;
+            opacity: 0;
+        }
+        &:hover .@{iconfont-css-prefix}-outlined-cloud-download {
+            opacity: 1;
+        }
 
+        &-card-actions-btn {
+            margin-right: 6px;
+            &:last-child {
+                margin-right: 0;
+            }
+        }
         &:hover &-card-actions-btn {
             opacity: 1;
         }
@@ -287,15 +296,10 @@
         &-error .@{upload-prefix-cls}-list-item-info .@{upload-prefix-cls}-text-icon .acuicon:hover {
             color: @error-color;
         }
-
         &-error &-card-actions {
-            .@{iconfont-css-prefix} {
+            .@{upload-prefix-cls}-text-icon {
                 color: @error-color;
             }
-
-            &-btn {
-                opacity: 1;
-            }
         }
 
         &-progress {
@@ -431,9 +435,10 @@
             margin: 0 @margin-xs @margin-xs 0;
             vertical-align: top;
         }
-
-        &.@{upload-prefix-cls}-list::after {
-            display: none;
+        &.@{upload-prefix-cls}-list {
+            &::after {
+                display: none;
+            }
         }
 
         .@{upload-item} {

package/lib/upload/utils.js

@@ -39,7 +39,7 @@ function updateFileList(file, fileList) {
   });
 
   if (fileIndex === -1) {
-    nextFileList.push(file);
+    nextFileList.unshift(file);
   } else {
     nextFileList[fileIndex] = file;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "0.0.63",
+    "version": "0.0.66",
     "description": "acg react 组件库",
     "main": "lib/index.js",
     "module": "es/index.js",