shineout 3.9.0-beta.12 → 3.9.0-beta.14

package/cjs/index.js

@@ -522,5 +522,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.9.0-beta.12'
+  version: '3.9.0-beta.14'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.9.0-beta.12');
+/* harmony default export */ var version = ('3.9.0-beta.14');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -49532,20 +49532,10 @@ var addModalInstance = function addModalInstance(instanceId) {
   modal_content_state.mutate.instanceIds.push(instanceId);
 };
 var addModalCascadeConfig = function addModalCascadeConfig(props) {
-  var width = props.width;
-  var widthNumber = 0;
-  // width 是30% 这种格式的，转为number
-  if (typeof width === 'string' && width.indexOf('%') > -1) {
-    var parentWidth = document.body.clientWidth;
-    var percent = parseInt(width, 10);
-    widthNumber = parentWidth * percent / 100;
-  } else {
-    widthNumber = typeof width === 'number' ? width : parseInt(width, 10) || 0;
-  }
   modal_content_state.mutate.cascadeConfigs.push({
     cascade: props.cascade,
-    instanceId: props.instanceId,
-    width: widthNumber
+    cascadeWidth: props.cascadeWidth,
+    instanceId: props.instanceId
   });
 };
 var removeModalInstance = function removeModalInstance(instanceId) {
@@ -49648,8 +49638,8 @@ var Modal = function Modal(props) {
       addModalInstance(context.instanceId);
       addModalCascadeConfig({
         instanceId: context.instanceId,
-        width: props.width,
-        cascade: !!props.cascade && !!props.width && !!isPositionX
+        cascade: !!props.cascade && !!isPositionX,
+        cascadeWidth: typeof_default()(props.cascade) === 'object' ? props.cascade.width || 180 : 180
       });
     }
     if (!visible && index > -1 && !animation) {
@@ -49825,6 +49815,7 @@ var Modal = function Modal(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.header,
       onMouseDown: props.moveable && !props.fullScreen ? moveInfo.handleMouseDown : undefined,
+      style: props.headerStyle,
       children: [renderIcon(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerTitle,
         children: props.title
@@ -49849,6 +49840,7 @@ var Modal = function Modal(props) {
     if (!props.footer) return null;
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.footer,
+      style: props.footerStyle,
       children: props.footer
     });
   };
@@ -49871,20 +49863,22 @@ var Modal = function Modal(props) {
   };
   if (!context.renderEd && !visible) return null;
   context.renderEd = true;
-  var marginStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+  var cascadeStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     if (!props.cascade) return;
     var idx = config.instanceIds.findIndex(function (id) {
       return id === context.instanceId;
     });
-    var afterInstances = config.cascadeConfigs.filter(function (_, index) {
-      return index > idx;
-    }).filter(function (c) {
-      return c.cascade;
-    }).slice(0, 1);
-    var width = afterInstances.reduce(function (ret, cur) {
-      return (ret || 0) + cur.width;
-    }, 0);
-    return defineProperty_default()(defineProperty_default()({}, props.position === 'left' ? 'marginLeft' : 'marginRight', "".concat(width, "px")), "transition", width ? 'margin .3s ease .05s' : 'margin 0.2s ease');
+    var instance = 0;
+    var curCascadeConfig = config.cascadeConfigs.find(function (c) {
+      return c.instanceId === context.instanceId;
+    });
+    if (curCascadeConfig && idx < config.cascadeConfigs.length - 1) {
+      instance = curCascadeConfig.cascadeWidth;
+    }
+    return {
+      transform: props.position === 'left' ? "translateX(".concat(instance, "px)") : "translateX(-".concat(instance, "px)"),
+      transition: instance ? 'transform 0.3s ease 0.05s' : 'transform 0.2s ease'
+    };
   }, [config.cascadeConfigs, config.instanceIds]);
   var panelStyle = objectSpread2_default()(objectSpread2_default()({
     transformOrigin: origin,
@@ -49892,7 +49886,7 @@ var Modal = function Modal(props) {
   }, props.style), {}, {
     width: props.fullScreen ? undefined : width,
     height: props.fullScreen ? undefined : height
-  }, marginStyle);
+  }, cascadeStyle);
   if (props.resizable) {
     panelStyle.width = resizeInfo.width;
     panelStyle.height = resizeInfo.height;
@@ -73611,7 +73605,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.12'
+  version: '3.9.0-beta.14'
 });
 }();
 /******/ 	return __webpack_exports__;