shineout 3.6.6-beta.5 → 3.6.6-beta.7

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

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.6-beta.5');
+/* harmony default export */ var version = ('3.6.6-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -29857,11 +29857,6 @@ var usePopup = function usePopup(props) {
       updatePosition();
     }
     setOpenState(!!props.open);
-
-    // 外部传了open时，需要正常的触发onCollapse；触发了onCollapse才能让组件内部的edit状态正确，否则可能会出现弹出层打开了但是用户却无法选择的情况
-    if (props.open !== undefined) {
-      changeOpen(!!props.open);
-    }
   }, [props.open]);
 
   // const getPopUpHeight = () => {
@@ -46830,7 +46825,7 @@ var DatePicker = function DatePicker(props0) {
     if (props.open) {
       func.startEdit();
     }
-  }, []);
+  }, [props.open]);
   var _usePopup = use_popup({
       open: props.open,
       onCollapse: onCollapse,
@@ -47562,7 +47557,8 @@ var Modal = function Modal(props) {
       renderEd: false,
       isMask: false,
       mouseDownTarget: null,
-      mouseUpTarget: null
+      mouseUpTarget: null,
+      content: null
     }),
     context = _useRef.current;
   var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.visible || props.autoShow),
@@ -47805,6 +47801,14 @@ var Modal = function Modal(props) {
   if (props.moveable && !props.fullScreen) {
     panelStyle.transform = "translate(".concat(moveInfo.pos.x, "px, ").concat(moveInfo.pos.y, "px)");
   }
+  var renderContent = function renderContent() {
+    if (!props.visible && context.content !== null) return context.content;
+    return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
+      children: [renderHeader(), renderBody(), renderFooter(), renderResize()]
+    });
+  };
+  var content = renderContent();
+  context.content = content;
   return /*#__PURE__*/(0,jsx_runtime.jsx)(FormFooterProvider, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       onClick: function onClick(e) {
@@ -47823,11 +47827,11 @@ var Modal = function Modal(props) {
         onMouseUp: handleMaskMouseUp,
         onClick: handleMaskClick,
         onAnimationStart: updateOrigin,
-        children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           ref: panelRef,
           className: classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.panel, props.className),
           style: panelStyle,
-          children: [renderHeader(), renderBody(), renderFooter(), renderResize()]
+          children: content
         })
       }))
     })
@@ -70078,7 +70082,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.6-beta.5'
+  version: '3.6.6-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;