shineout 3.6.5-beta.9 → 3.6.6-beta.1

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.5-beta.9'
+  version: '3.6.6-beta.1'
 };

package/dist/shineout.js

@@ -12217,7 +12217,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.5-beta.9');
+/* harmony default export */ var version = ('3.6.6-beta.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -21762,9 +21762,6 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({
       height: '100vh',
       width: '100vw',
       overflow: 'auto'
-    },
-    '& $body': {
-      minHeight: 'auto'
     }
   },
   wrapperZoom: {
@@ -33995,9 +33992,16 @@ var accordion_jssStyle = {
 var ModalSubmit = function ModalSubmit(props) {
   var modalFormContext = useFormFooter();
   var handleClick = usePersistFn(function (e) {
-    var _props$onClick;
-    (_props$onClick = props.onClick) === null || _props$onClick === void 0 || _props$onClick.call(props, e);
-    modalFormContext === null || modalFormContext === void 0 || modalFormContext.func.submit();
+    var _modalFormContext$fun;
+    if (modalFormContext !== null && modalFormContext !== void 0 && (_modalFormContext$fun = modalFormContext.func) !== null && _modalFormContext$fun !== void 0 && _modalFormContext$fun.hasSubmit) {
+      modalFormContext === null || modalFormContext === void 0 || modalFormContext.func.submit(true, function () {
+        var _props$onClick;
+        return (_props$onClick = props.onClick) === null || _props$onClick === void 0 ? void 0 : _props$onClick.call(props, e);
+      });
+    } else {
+      var _props$onClick2;
+      (_props$onClick2 = props.onClick) === null || _props$onClick2 === void 0 || _props$onClick2.call(props, e);
+    }
   });
   return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, objectSpread2_default()(objectSpread2_default()({
     htmlType: "button",
@@ -49447,7 +49451,8 @@ var useForm = function useForm(props) {
     size = props.size,
     colon = props.colon,
     formName = props.name,
-    scrollParent = props.scrollParent;
+    scrollParent = props.scrollParent,
+    isControl = props.isControl;
   var deepSetOptions = {
     removeUndefined: removeUndefined,
     forceSet: true
@@ -49768,6 +49773,7 @@ var useForm = function useForm(props) {
   });
   var submit = use_persist_fn(function () {
     var withValidate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    var callback = arguments.length > 1 ? arguments[1] : undefined;
     if (disabled) return;
     if (context.submitLock) {
       return;
@@ -49785,32 +49791,29 @@ var useForm = function useForm(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (withValidate) {
-              _context.next = 3;
+              _context.next = 4;
               break;
             }
             (_props$onSubmit = props.onSubmit) === null || _props$onSubmit === void 0 || _props$onSubmit.call(props, (_context$value = context.value) !== null && _context$value !== void 0 ? _context$value : {});
+            callback === null || callback === void 0 || callback();
             return _context.abrupt("return");
-          case 3:
-            _context.next = 5;
+          case 4:
+            _context.next = 6;
             return validateFields(undefined, {
               ignoreBind: true
             }).catch(function (e) {
               return e;
             });
-          case 5:
+          case 6:
             result = _context.sent;
-            if (!(result === true)) {
-              _context.next = 11;
-              break;
+            if (result === true) {
+              (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
+              if (activeEl) activeEl.focus();
+            } else {
+              handleSubmitError(result);
             }
-            (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
-            if (activeEl) activeEl.focus();
-            _context.next = 13;
-            break;
-          case 11:
-            handleSubmitError(result);
-            return _context.abrupt("return");
-          case 13:
+            callback === null || callback === void 0 || callback();
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -50011,7 +50014,7 @@ var useForm = function useForm(props) {
     context.removeLock = false;
     // 内部 onChange 改的 value, 不需要更新
     if (props.value === context.value) {
-      // if (!isControl) update();
+      if (!isControl) update();
       return;
     }
     if (initValidate && !context.resetTime) {
@@ -63813,7 +63816,8 @@ var TabsPanel = function TabsPanel(props) {
     active = _useTabsContext.active,
     lazy = _useTabsContext.lazy,
     setTabs = _useTabsContext.setTabs,
-    color = _useTabsContext.color;
+    color = _useTabsContext.color,
+    shape = _useTabsContext.shape;
   var isActive = active === id;
   var keekAlive = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
@@ -63822,7 +63826,7 @@ var TabsPanel = function TabsPanel(props) {
       tab: tab,
       disabled: props.disabled,
       jssStyle: jssStyle,
-      background: background,
+      background: shape !== 'button' && shape !== 'fill' ? background : undefined,
       color: props.color || (active === id ? color : undefined)
     };
     setTabs(function (prev) {
@@ -63851,7 +63855,7 @@ var TabsPanel = function TabsPanel(props) {
         });
       });
     };
-  }, [id, tab, color, active, props.disabled, props.jssStyle]);
+  }, [id, tab, color, active, shape, props.disabled, props.jssStyle]);
   if (!isActive && lazy && !keekAlive.current) {
     return null;
   }
@@ -65440,6 +65444,7 @@ var TransferOperate = function TransferOperate(props) {
 
 
 
+
 var Transfer = function Transfer(props) {
   var _jssStyle$transfer;
   var jssStyle = props.jssStyle,
@@ -65514,7 +65519,7 @@ var Transfer = function Transfer(props) {
     sourceSelectedKeys = _useTransfer.sourceSelectedKeys,
     targetSelectedKeys = _useTransfer.targetSelectedKeys,
     onFilter = _useTransfer.onFilter,
-    onSelectChange = _useTransfer.onSelectChange;
+    _onSelectChange = _useTransfer.onSelectChange;
   var styles = (jssStyle === null || jssStyle === void 0 || (_jssStyle$transfer = jssStyle.transfer) === null || _jssStyle$transfer === void 0 ? void 0 : _jssStyle$transfer.call(jssStyle)) || {};
   var rootClass = classnames_default()(styles.rootClass, styles.transfer, className, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, styles.simple, simple), styles.small, size === 'small'), styles.large, size === 'large'), styles.equalPanelWidth, equalPanelWidth));
   var renderOperations = function renderOperations() {
@@ -65588,7 +65593,15 @@ var Transfer = function Transfer(props) {
       searchPlaceholder: placeholder,
       renderFilter: renderFilter,
       onFilter: onFilterProp ? onFilter : undefined,
-      onSelectChange: onSelectChange
+      onSelectChange: function onSelectChange(keys) {
+        if (isSource) {
+          var newAllKeys = Array.from(new Set([].concat(toConsumableArray_default()(keys), toConsumableArray_default()(targetSelectedKeys || []))));
+          _onSelectChange(newAllKeys, keys, targetSelectedKeys);
+        } else {
+          var _newAllKeys = Array.from(new Set([].concat(toConsumableArray_default()(keys), toConsumableArray_default()(sourceSelectedKeys || []))));
+          _onSelectChange(_newAllKeys, sourceSelectedKeys, keys);
+        }
+      }
     });
   };
   var renderSourceList = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
@@ -70058,7 +70071,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.5-beta.9'
+  version: '3.6.6-beta.1'
 });
 }();
 /******/ 	return __webpack_exports__;