shineout 3.8.0 → 3.8.1-beta.2

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.8.0'
+  version: '3.8.1-beta.2'
 };

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.8.0');
+/* harmony default export */ var version = ('3.8.1-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -42975,6 +42975,7 @@ var Cascader = function Cascader(props0) {
       return renderLoading();
     }
     if (isDataEmpty) {
+      // todo: 空数据时 是否 支持一下也能走到renderOptionList
       return renderEmpty();
     }
     if (!filterText || filterText && mode !== undefined || data && data.length === 0) {
@@ -49255,6 +49256,9 @@ var removeModalInstance = function removeModalInstance(instanceId) {
     return id !== instanceId;
   });
 };
+var getInstanceIds = function getInstanceIds() {
+  return modal_content_state.mutate.instanceIds;
+};
 var mousePosition = null;
 var getClickPosition = function getClickPosition(e) {
   mousePosition = {
@@ -49441,8 +49445,7 @@ var Modal = function Modal(props) {
       if (visible) {
         setDocumentOverflow();
       } else {
-        if (config.instanceIds.length && config.instanceIds[config.instanceIds.length - 1] === context.instanceId) return;
-        resetDocumentOverflow();
+        if (config.instanceIds.length === 0) resetDocumentOverflow();
       }
     }
   }, [visible, config.instanceIds]);
@@ -49457,10 +49460,10 @@ var Modal = function Modal(props) {
     return function () {
       var _props$shouldDestroy2;
       removeModalInstance(context.instanceId);
-      if (context.isMask) {
+      var instanceIds = getInstanceIds();
+      if (instanceIds.length === 0) {
         resetDocumentOverflow();
       }
-      ;
       (_props$shouldDestroy2 = props.shouldDestroy) === null || _props$shouldDestroy2 === void 0 || _props$shouldDestroy2.call(props, true);
       if (context.isMask) {
         context.isMask = false;
@@ -57925,6 +57928,7 @@ function Select(props0) {
     });
   };
   var renderEmpty = function renderEmpty() {
+    if (props.emptyText === false) return null;
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: styles === null || styles === void 0 ? void 0 : styles.option,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -57939,13 +57943,13 @@ function Select(props0) {
   var renderOptions = function renderOptions() {
     if (loading) return renderLoading();
     var isEmpty = !(filterData !== null && filterData !== void 0 && filterData.length);
-    if (isEmpty && props.emptyText !== false) return renderEmpty();
     var options = 'treeData' in props ? renderTreeList() : renderList();
     if (renderOptionList) {
-      return renderOptionList(options, {
+      return renderOptionList(isEmpty ? renderEmpty() : options, {
         loading: loading
       });
     }
+    if (isEmpty) return renderEmpty();
     return options;
   };
   var renderHeader = function renderHeader() {
@@ -73022,7 +73026,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0'
+  version: '3.8.1-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;