@kdcloudjs/kdesign 1.0.4 → 1.1.2

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.0.2
+ *   @kdcloudjs/kdesign v1.1.1
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -4203,7 +4203,11 @@ var InternalBaseData = function InternalBaseData(props, ref) {
 
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", {
         key: item.value,
-        className: "".concat(advancedSelectorfixCls, "-dropdown-options"),
+        className: classnames__WEBPACK_IMPORTED_MODULE_18___default()("".concat(advancedSelectorfixCls, "-dropdown-options"), {
+          selected: seletedOptions.some(function (v) {
+            return v.value === item.value;
+          })
+        }),
         onMouseDown: function onMouseDown() {
           return handleSelect(item);
         }
@@ -4613,6 +4617,7 @@ var Card = function Card(props) {
       title = _getCompProps.title,
       avatar = _getCompProps.avatar,
       actions = _getCompProps.actions,
+      extra = _getCompProps.extra,
       children = _getCompProps.children,
       className = _getCompProps.className,
       hoverable = _getCompProps.hoverable,
@@ -4652,7 +4657,9 @@ var Card = function Card(props) {
     style: bodyStyle
   }, children), actions && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["createElement"]("div", {
     className: "".concat(prefixCls, "-actions")
-  }, actions));
+  }, actions), extra && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["createElement"]("div", {
+    className: "".concat(prefixCls, "-extra")
+  }, extra));
 };
 
 Card.displayName = 'Card';
@@ -7494,12 +7501,11 @@ var compDefaultProps = {
     destroyOnClose: false,
     forceRender: false,
     getContainer: document.body,
-    height: 220,
     keyboard: true,
     mask: true,
     maskClosable: true,
     placement: 'right',
-    width: 365,
+    width: 320,
     zIndex: 1050
   },
   Empty: {},
@@ -13501,7 +13507,6 @@ var InternalDrawer = function InternalDrawer(props, ref) {
       footerClassName = drawerProps.footerClassName,
       visible = drawerProps.visible,
       width = drawerProps.width,
-      height = drawerProps.height,
       headerStyle = drawerProps.headerStyle,
       headerClassName = drawerProps.headerClassName,
       zindex = drawerProps.zIndex,
@@ -13519,12 +13524,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
   var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_14__["useState"])(width),
       _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState3, 2),
       currentWidth = _useState4[0],
-      setCurrentWidth = _useState4[1];
-
-  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_14__["useState"])(height),
-      _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState5, 2),
-      currentHeight = _useState6[0],
-      setCurrentHeight = _useState6[1]; // const previousWidthRef = usePrevious(currentWidth)
+      setCurrentWidth = _useState4[1]; // const previousWidthRef = usePrevious(currentWidth)
   // const previousHeightRef = usePrevious(currentHeight)
 
 
@@ -13563,9 +13563,8 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     }
   }, [drawerContainer, isBody, isAtOriginalPlace, containerRef]);
   var handleContainerResize = Object(react__WEBPACK_IMPORTED_MODULE_14__["useCallback"])(function (_ref) {
-    var containerWidth = _ref.width,
-        containerHeight = _ref.height;
-    if (!visible && width === currentWidth && height === currentHeight) return;
+    var containerWidth = _ref.width;
+    if (!visible && width === currentWidth) return;
 
     if (containerWidth < currentWidth) {
       // 这里改成操作DOM？
@@ -13575,13 +13574,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     } else {
       setCurrentWidth(width);
     }
-
-    if (containerHeight < currentHeight) {
-      setCurrentHeight(containerHeight);
-    } else {
-      setCurrentHeight(height);
-    }
-  }, [width, height, visible, currentWidth, currentHeight]);
+  }, [width, visible, currentWidth]);
   Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_22__["useResizeObserver"])(function () {
     var _containerRef$current;
 
@@ -13592,9 +13585,6 @@ var InternalDrawer = function InternalDrawer(props, ref) {
   Object(react__WEBPACK_IMPORTED_MODULE_14__["useEffect"])(function () {
     setCurrentWidth(width);
   }, [width]);
-  Object(react__WEBPACK_IMPORTED_MODULE_14__["useEffect"])(function () {
-    setCurrentHeight(height);
-  }, [height]);
   var closeDrawer = Object(react__WEBPACK_IMPORTED_MODULE_14__["useCallback"])(function () {
     onClose && onClose();
     destroyOnClose && setShowChildren(false);
@@ -13625,10 +13615,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
   var containerStyle = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, placement, 0), horizontalPlacements.includes(placement) ? {
     width: currentWidth,
     transform: "translateX(".concat(visible ? 0 : transformSize(currentWidth, placement), ")")
-  } : {
-    height: currentHeight,
-    transform: "translateY(".concat(visible ? 0 : transformSize(currentHeight, placement), ")")
-  });
+  } : {});
 
   var container = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.createElement("div", {
     className: classnames__WEBPACK_IMPORTED_MODULE_18___default()((_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(drawerPrefixCls, "-container-box"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(drawerPrefixCls, "-has-container-box"), drawerContainer), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(drawerPrefixCls, "-container-").concat(placement), true), _classNames2)),
@@ -13658,8 +13645,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     return p !== placement;
   })[0] : '';
   var noneMaskStyle = !mask ? {
-    width: containerStyle.width,
-    height: containerStyle.height
+    width: containerStyle.width
   } : {};
   var comp = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.createElement("div", {
     className: drawerClasses,
@@ -13826,11 +13812,14 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["forwardRef"](fu
   });
   var isMenu = menu.type === _menu__WEBPACK_IMPORTED_MODULE_14__["Menu"];
 
-  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_10__["useState"](((_menu$props = menu.props) === null || _menu$props === void 0 ? void 0 : _menu$props.defaultKey) || props.defaultKey || ''),
+  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_10__["useState"](props.selectedKey || ((_menu$props = menu.props) === null || _menu$props === void 0 ? void 0 : _menu$props.defaultKey) || props.defaultKey || ''),
       _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState3, 2),
-      defaultKey = _React$useState4[0],
-      setKeyValue = _React$useState4[1];
+      selectedKey = _React$useState4[0],
+      setSelectedKey = _React$useState4[1];
 
+  react__WEBPACK_IMPORTED_MODULE_10__["useEffect"](function () {
+    setSelectedKey(props.selectedKey);
+  }, [props.selectedKey]);
   var menuSelectable = ((_menu$props2 = menu.props) === null || _menu$props2 === void 0 ? void 0 : _menu$props2.selectable) === undefined ? selectable : (_menu$props3 = menu.props) === null || _menu$props3 === void 0 ? void 0 : _menu$props3.selectable;
 
   var handleItemClick = function handleItemClick(e) {
@@ -13847,13 +13836,13 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["forwardRef"](fu
         onItemClick(key);
       }
 
-      menuSelectable && setKeyValue(key);
+      menuSelectable && setSelectedKey(key);
       props.visible === undefined && setVisible(false);
     }
   };
 
   var menuElement = isMenu ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["cloneElement"](menu, {
-    defaultKey: defaultKey,
+    selectedKey: selectedKey,
     onClick: handleItemClick,
     selectable: menuSelectable
   }) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["createElement"]("ul", {
@@ -13873,7 +13862,7 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["forwardRef"](fu
       rel: 'noopener noreferrer'
     };
     var key = itemKey || label;
-    var selected = selectable && String(defaultKey) === String(key);
+    var selected = selectable && String(selectedKey) === String(key);
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["createElement"]("li", {
       title: label,
       key: key,
@@ -13950,7 +13939,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_6__);
 
 
-var _excluded = ["prefixCls", "children", "selectable", "defaultKey", "className"],
+var _excluded = ["prefixCls", "children", "selectable", "selectedKey", "className"],
     _excluded2 = ["prefixCls", "danger", "divided", "disabled", "children", "selected", "defaultKey", "className"];
 
 
@@ -13968,7 +13957,7 @@ var Menu = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](functio
       customPrefixcls = _getCompProps.prefixCls,
       children = _getCompProps.children,
       selectable = _getCompProps.selectable,
-      defaultKey = _getCompProps.defaultKey,
+      selectedKey = _getCompProps.selectedKey,
       className = _getCompProps.className,
       restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_1___default()(_getCompProps, _excluded); // className前缀
 
@@ -13977,7 +13966,7 @@ var Menu = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](functio
 
   var cloneItem = function cloneItem(item, index) {
     var key = item.key || index;
-    var selected = selectable && String(defaultKey) === String(key);
+    var selected = selectable && String(selectedKey) === String(key);
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["cloneElement"](item, {
       key: key,
       selected: selected,
@@ -15742,7 +15731,9 @@ var Field = function Field(props) {
   });
   var mergedRequired = required || !!rulesRequired;
 
-  if (rules.length === 0 && required) {
+  if (Array.isArray(rules) && !rules.some(function (rule) {
+    return Object.prototype.hasOwnProperty.call(rule, 'required');
+  }) && required) {
     rules.push({
       required: true
     });
@@ -15750,7 +15741,7 @@ var Field = function Field(props) {
 
   var mergeRules = rules;
 
-  if (Array.isArray(mergeRules) && mergeRules.length) {
+  if (mergeRules.length) {
     mergeRules = rules.map(function (r) {
       if (typeof r === 'function') {
         return r(fieldContext);
@@ -21520,8 +21511,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
     className: classnames__WEBPACK_IMPORTED_MODULE_6___default()(className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, prefixCls, subMenuMode !== 'horizontal'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),
     role: "menuitem",
     style: style,
-    key: keyValue,
-    title: children
+    key: keyValue
   }, mouseEvent), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("div", {
     className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(prefixCls, "-title")),
     style: titleStyle
@@ -22093,13 +22083,17 @@ var Content = function Content(args) {
       type: "warning-solid"
     }),
     info: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_3__["default"], {
-      type: "tips-solid"
+      type: "notice"
     })
   };
 
   var renderIcon = function renderIcon() {
-    if (icon) return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", null, icon);
-    return iconMap[type] ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", null, iconMap[type]) : null;
+    if (icon) return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", {
+      className: "".concat(classPrefix, "-icon-wrapper")
+    }, icon);
+    return iconMap[type] ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", {
+      className: "".concat(classPrefix, "-icon-wrapper")
+    }, iconMap[type]) : null;
   };
 
   var handleClick = function handleClick(e) {
@@ -23302,7 +23296,7 @@ var Content = function Content(args) {
   var getMainElement = function getMainElement() {
     if (typeof content === 'string') {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
-        className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(classPrefix, "-main"))
+        className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(classPrefix, "-description"))
       }, content);
     }
 
@@ -23863,7 +23857,7 @@ var Pagination = function Pagination(props) {
     className: "".concat(prefixCls, "-selector")
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16__["createElement"](_dropdown__WEBPACK_IMPORTED_MODULE_21__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
     selectable: true,
-    defaultKey: size,
+    selectedKey: size,
     menu: sizeOptions,
     trigger: "click",
     disabled: disabled,
@@ -24014,7 +24008,7 @@ var Pagination = function Pagination(props) {
     size: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16__["createElement"](_dropdown__WEBPACK_IMPORTED_MODULE_21__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
       selectable: true,
       trigger: "click",
-      defaultKey: size,
+      selectedKey: size,
       menu: sizeOptions,
       disabled: disabled,
       popperStyle: {
@@ -32942,7 +32936,7 @@ var Operation = function Operation(_ref) {
     className: className,
     style: style
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_button__WEBPACK_IMPORTED_MODULE_1__["default"], {
-    type: "primary",
+    type: disabled || !rightActive ? 'ghost' : 'primary',
     size: "small",
     disabled: disabled || !rightActive,
     onClick: moveToRight,
@@ -32952,7 +32946,7 @@ var Operation = function Operation(_ref) {
       type: "arrow-left"
     })
   }, rightArrowText), !oneWay && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_button__WEBPACK_IMPORTED_MODULE_1__["default"], {
-    type: "primary",
+    type: disabled || !leftActive ? 'ghost' : 'primary',
     size: "small",
     disabled: disabled || !leftActive,
     onClick: moveToLeft,