shineout 3.6.2-beta.5 → 3.6.2-beta.6

package/cjs/index.js

@@ -514,5 +514,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.6.2-beta.5'
+  version: '3.6.2-beta.6'
 };

package/dist/shineout.js

@@ -12139,7 +12139,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.6.2-beta.5');
+/* harmony default export */ var version = ('3.6.2-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -13262,6 +13262,8 @@ var cascaderTokens = {
   cascaderPaddingY: 'Spacing-2',
   cascaderIconSize: 'Size-7',
   cascaderIconColor: 'Neutral-text-4',
+  cascaderTagMarginY: 'Spacing-2',
+  cascaderTagMarginRight: 'Spacing-4',
   cascaderSmallFontSize: 'Font-12',
   cascaderSmallPaddingX: 'Spacing-8',
   cascaderSmallPaddingY: 'Spacing-1',
@@ -15138,6 +15140,8 @@ var treeSelectTokens = {
   treeSelectIconSize: 'Size-7',
   treeSelectIconColor: 'Neutral-text-4',
   treeSelectIconDisabledColor: 'Neutral-text-2',
+  treeSelectTagMarginY: 'Spacing-2',
+  treeSelectTagMarginRight: 'Spacing-4',
   treeSelectSmallFontSize: 'Font-12',
   treeSelectSmallPaddingX: 'Spacing-8',
   treeSelectSmallPaddingY: 'Spacing-1',
@@ -16059,6 +16063,18 @@ var ButtonStyle = {
     '&:active': {
       transition: 'none'
     },
+    '[data-soui-role="input-group"] > &': {
+      borderWidth: 0,
+      borderRadius: 0,
+      '&:first-child': {
+        borderTopLeftRadius: "calc(".concat(src.buttonBorderRadius, " - 1px)"),
+        borderBottomLeftRadius: "calc(".concat(src.buttonBorderRadius, " - 1px)")
+      },
+      '&:last-child': {
+        borderTopRightRadius: "calc(".concat(src.buttonBorderRadius, " - 1px)"),
+        borderBottomRightRadius: "calc(".concat(src.buttonBorderRadius, " - 1px)")
+      }
+    },
     '[data-soui-role="input-group-seperate"] > &': {
       borderRadius: 0,
       marginLeft: -1,
@@ -16946,14 +16962,13 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
       flex: 1,
       minWidth: 0
     },
-    '[data-soui-role="input-group"] [data-soui-input-border] + &': {
+    '[data-soui-role="input-group"] [data-soui-input-border] + &&&': {
       borderLeftWidth: '1px'
     },
     '[data-soui-role="input-group-seperate"] &&&, [data-soui-role="input-group-seperate"] &&&:hover': {
       borderRadius: 0,
       flexShrink: 0,
       width: 'auto',
-      flex: 1,
       'margin-left': "-1px",
       '&:hover': {
         zIndex: 1050
@@ -17036,6 +17051,9 @@ var useCarouselStyle = styled(carousel_carousel, 'carousel');
     boxShadow: "0 0 0 2px ".concat(token.errorFocusShadow),
     borderColor: token.errorFocusBorderColor,
     background: token.errorFocusBackgroundColor
+    // '[data-soui-role="input-group-seperate"]&': {
+    //   boxShadow: 'none',
+    // }
   })), "".concat(name, "Disabled"), {
     color: token.disabledFontColor,
     backgroundColor: token.disabledBackgroundColor,
@@ -17215,7 +17233,7 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     }
   },
   wrapperDisabled: objectSpread2_default()(objectSpread2_default()({}, wrapperDisabled), {}, {
-    '& $icon, & $arrowIcon': {
+    '& $arrowIcon': {
       color: src.cascaderDisabledFontColor
     }
   })
@@ -17226,15 +17244,7 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     minWidth: 0,
     position: 'relative',
     outline: 'none',
-    overflow: 'hidden',
-    '&:hover': {
-      '& $clear': {
-        display: 'inline-flex'
-      },
-      '& $clear + $icon': {
-        display: 'none'
-      }
-    }
+    overflow: 'hidden'
   },
   result: {
     display: 'flex',
@@ -17478,9 +17488,9 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
       marginLeft: 0
     },
     maxWidth: '80%',
-    marginRight: 4,
-    marginTop: src.cascaderPlaceholderMarginY,
-    marginBottom: src.cascaderPlaceholderMarginY,
+    marginRight: src.cascaderTagMarginRight,
+    marginTop: src.cascaderTagMarginY,
+    marginBottom: src.cascaderTagMarginY,
     textWrap: 'nowrap',
     '&$hideTag': {
       marginRight: 0
@@ -20218,6 +20228,16 @@ var groupSpace = function groupSpace(gap) {
     '& > i:last-child, & > span:last-child': {
       paddingRight: gap
     },
+    '[data-soui-role="input-group-seperate"]&': {
+      '& > b:first-child': {
+        marginLeft: 0,
+        borderLeft: "1px solid ".concat(src.inputBorderColor)
+      },
+      '& > b:last-child': {
+        marginRight: 0,
+        borderRight: "1px solid ".concat(src.inputBorderColor)
+      }
+    },
     '& > b': {
       padding: "0 ".concat(gap),
       display: 'flex',
@@ -20228,10 +20248,10 @@ var groupSpace = function groupSpace(gap) {
       fontWeight: 'normal',
       color: src.inputGroupFontColor,
       '&:first-child': {
-        marginLeft: '-1px'
+        borderLeft: 'none'
       },
       '&:last-child': {
-        marginRight: '-1px'
+        borderRight: 'none'
       }
     },
     '&[dir=ltr] > b': {
@@ -20258,13 +20278,18 @@ var groupSpace = function groupSpace(gap) {
 };
 var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
   rootClass: {},
-  wrapper: objectSpread2_default()({
+  wrapper: objectSpread2_default()(objectSpread2_default()({
     display: 'inline-flex',
     width: '100%',
     boxSizing: 'border-box',
     alignItems: 'center',
     position: 'relative'
-  }, input_wrapper)
+  }, input_wrapper), {}, {
+    '[data-soui-role="input-group-seperate"] &': {
+      flex: 1,
+      minWidth: 0
+    }
+  })
 }, input_resetWrapper), {}, {
   wrapperNumber: {},
   content: {
@@ -28053,6 +28078,9 @@ var treeStyle = {
       '&::after': {
         width: 12
       }
+    },
+    '&[draggable="true"]': {
+      cursor: 'pointer'
     }
   },
   leaf: {},
@@ -28497,9 +28525,9 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
       marginLeft: 0
     },
     maxWidth: '80%',
-    marginRight: 4,
-    marginTop: src.treeSelectPlaceholderMarginY,
-    marginBottom: src.treeSelectPlaceholderMarginY,
+    marginRight: src.treeSelectTagMarginRight,
+    marginTop: src.treeSelectTagMarginY,
+    marginBottom: src.treeSelectTagMarginY,
     textWrap: 'nowrap',
     '&$hideTag': {
       marginRight: 0
@@ -49765,6 +49793,7 @@ var useForm = function useForm(props) {
     }
     context.lastValue = props.value;
   };
+  updateValue();
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     // 服务端错误更新
     if (!props.error) context.serverErrors = {};else {
@@ -49780,7 +49809,6 @@ var useForm = function useForm(props) {
 
   // 默认值更新
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
-    updateValue();
     context.removeLock = false;
     // 内部 onChange 改的 value, 不需要更新
     if (props.value === context.value) return;
@@ -52119,8 +52147,7 @@ var input_input_Input = function Input(props) {
     className = props.className,
     width = props.width,
     style = props.style,
-    _props$seperate = props.seperate,
-    seperate = _props$seperate === void 0 ? true : _props$seperate;
+    seperate = props.seperate;
   var rootClass = classnames_default()(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.group, seperate && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupSeperate), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupLarge), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupDisabled), !!focus && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupFocus), (status === 'error' || error) && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.groupError));
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, getDataAttribute({
     role: seperate ? 'input-group-seperate' : 'input-group'
@@ -53629,6 +53656,7 @@ var Node = function Node(props) {
     dragImage.current = dragEl.cloneNode(true);
     document.body.appendChild(dragImage.current);
     dragImage.current.style.position = 'absolute';
+    dragImage.current.style.zIndex = '99999';
     dragImage.current.style.top = '-1000px';
     dragImage.current.style.left = '-1000px';
     dragImage.current.style.width = "".concat(rect.width, "px");
@@ -53642,13 +53670,9 @@ var Node = function Node(props) {
       });
     }
     e.dataTransfer.setDragImage(dragImage.current, e.clientX - rect.left, e.clientY - rect.top);
-    setTimeout(function () {
-      element.current.style.display = 'none';
-    }, 0);
     if (onDragStart) onDragStart(e, data);
   };
   var handleDragEnd = function handleDragEnd(e) {
-    element.current.style.display = '';
     if (!dragLock) return;
     dragLock = false;
     if (!placeElement || !placeElement.parentNode) return;
@@ -62590,8 +62614,18 @@ var Tr = function Tr(props) {
     var _props$rowClickAttr = props.rowClickAttr,
       rowClickAttr = _props$rowClickAttr === void 0 ? '*' : _props$rowClickAttr,
       onRowClick = props.onRowClick;
+    var attributes = Array.isArray(rowClickAttr) ? rowClickAttr : [];
+    if (typeof rowClickAttr === 'string') {
+      attributes.push(rowClickAttr);
+    }
+    var isFireElement = attributes.map(function (v) {
+      return v === '*' ? '' : v;
+    }).find(function (v) {
+      return target.hasAttribute(v);
+    });
+    var isExpandable = !isNotExpandableElement(target) || isFireElement;
     if (onRowClick && rowClickAttr) {
-      if (rowClickAttr === true || rowClickAttr === '*') {
+      if ((rowClickAttr === true || rowClickAttr === '*') && isExpandable) {
         onRowClick(props.rawData, props.rowIndex, rowClickAttr);
       } else {
         var arrts = Array.isArray(rowClickAttr) ? rowClickAttr : [rowClickAttr].filter(function (item) {
@@ -62600,13 +62634,12 @@ var Tr = function Tr(props) {
         var attIndex = arrts.findIndex(function (attr) {
           return attr === '*' || target.hasAttribute(attr);
         });
-        if (attIndex > -1) {
+        if (attIndex > -1 && isExpandable) {
           onRowClick(props.rawData, props.rowIndex, arrts[attIndex]);
         }
       }
     }
-    if (props.rowClickExpand) {
-      if (isNotExpandableElement(target)) return;
+    if (props.rowClickExpand && isExpandable) {
       props.handleExpandClick(props.expandCol, props.rawData, props.rowIndex);
     }
   });
@@ -65288,10 +65321,10 @@ var Transfer = function Transfer(props) {
   };
   var renderSourceList = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return renderList('source');
-  }, [source, size, filterSourceText, sourceSelectedKeys, renderFilter, children]);
+  }, [source, loading, size, filterSourceText, sourceSelectedKeys, renderFilter, children]);
   var renderTargetList = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return renderList('target');
-  }, [target, size, filterTargetText, targetSelectedKeys, renderFilter, children]);
+  }, [target, loading, size, filterTargetText, targetSelectedKeys, renderFilter, children]);
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -69719,7 +69752,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.2-beta.5'
+  version: '3.6.2-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;