ls-pro-common 3.0.34 → 3.0.36

package/es/components/ImageSelector.js

@@ -254,6 +254,11 @@ function ImageSelector(prop) {
       formRef.current.setFieldsValue(_objectSpread({}, formValue));
     }
   };
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProFormText, _extends({
     name: name
   }, rest), isInput ? /*#__PURE__*/React.createElement(_Input, _extends({
@@ -371,7 +376,7 @@ function ImageSelector(prop) {
       onClick: confirmImage
     }, "\u786E\u8BA4")),
     getContainer: function getContainer() {
-      return document.body;
+      return win.document.body;
     }
   }, modalProps), /*#__PURE__*/React.createElement("div", {
     style: {

package/es/components/InputTable.js

@@ -343,6 +343,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
     }
   }, [text, multiple]);
+  useEffect(function () {
+    if (visible && loadOnShow) {
+      var _tableRef$current3, _tableRef$current3$re;
+      (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$re = _tableRef$current3.reload) === null || _tableRef$current3$re === void 0 ? void 0 : _tableRef$current3$re.call(_tableRef$current3);
+    }
+  }, [visible, loadOnShow]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,

package/es/utils/index.js

@@ -334,34 +334,70 @@ _message.config({
 });
 /** @name 显示错误 */
 export var showError = function showError(text) {
-  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 4;
+  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _message.error({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement() || document.body;
+      return getFullScreenElement() || win.document.body;
+    },
+    onClick: function onClick(e) {
+      var _e$target;
+      var tag = (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.tagName.toLowerCase();
+      if (tag === 'img' || tag === 'path' || tag === 'svg') {
+        _message.destroy();
+      }
     }
   });
 };
 /** @name 显示警示 */
 export var showWarn = function showWarn(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _message.warn({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement() || document.body;
+      return getFullScreenElement() || win.document.body;
+    },
+    onClick: function onClick(e) {
+      var _e$target2;
+      var tag = (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.tagName.toLowerCase();
+      if (tag === 'img' || tag === 'path' || tag === 'svg') {
+        _message.destroy();
+      }
     }
   });
 };
 /** @name 显示成功 */
 export var showSuccess = function showSuccess(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _message.success({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement() || document.body;
+      return getFullScreenElement() || win.document.body;
+    },
+    onClick: function onClick(e) {
+      var _e$target3;
+      var tag = (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.tagName.toLowerCase();
+      if (tag === 'img' || tag === 'path' || tag === 'svg') {
+        _message.destroy();
+      }
     }
   });
 };
@@ -377,11 +413,16 @@ export var showAlert = function showAlert(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   return new Promise(function (resolve, reject) {
     _Modal[type](_objectSpread({
       content: text,
       title: title,
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || win.document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -403,6 +444,11 @@ export var exitAlert = function exitAlert() {
 export var showConfirm = function showConfirm(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   return new Promise(function (resolve, reject) {
+    var win = top || window;
+    //@ts-ignore
+    if (!win.lsAppList) {
+      win = window;
+    }
     _Modal.confirm({
       title: title,
       content: text,
@@ -412,7 +458,7 @@ export var showConfirm = function showConfirm(text) {
       cancelButtonProps: {
         className: 'ant-btn-gray'
       },
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || win.document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -430,10 +476,16 @@ var timeout = false;
 export var reLogin = function reLogin() {
   if (timeout) return;
   timeout = true;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _Modal.warning({
     title: '登录状态已过期,请重新登录',
     okText: '重新登录',
     maskClosable: false,
+    getContainer: getFullScreenElement() || win.document.body,
     afterClose: function afterClose() {
       timeout = false;
       (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);

package/lib/components/ImageSelector.js

@@ -254,6 +254,11 @@ function ImageSelector(prop) {
       formRef.current.setFieldsValue(_objectSpread({}, formValue));
     }
   };
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProFormText, _extends({
     name: name
   }, rest), isInput ? /*#__PURE__*/React.createElement(_Input, _extends({
@@ -371,7 +376,7 @@ function ImageSelector(prop) {
       onClick: confirmImage
     }, "\u786E\u8BA4")),
     getContainer: function getContainer() {
-      return document.body;
+      return win.document.body;
     }
   }, modalProps), /*#__PURE__*/React.createElement("div", {
     style: {

package/lib/components/InputTable.js

@@ -343,6 +343,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
     }
   }, [text, multiple]);
+  useEffect(function () {
+    if (visible && loadOnShow) {
+      var _tableRef$current3, _tableRef$current3$re;
+      (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$re = _tableRef$current3.reload) === null || _tableRef$current3$re === void 0 ? void 0 : _tableRef$current3$re.call(_tableRef$current3);
+    }
+  }, [visible, loadOnShow]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,

package/lib/utils/index.js

@@ -334,34 +334,70 @@ _message.config({
 });
 /** @name 显示错误 */
 export var showError = function showError(text) {
-  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 4;
+  var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _message.error({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement() || document.body;
+      return getFullScreenElement() || win.document.body;
+    },
+    onClick: function onClick(e) {
+      var _e$target;
+      var tag = (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.tagName.toLowerCase();
+      if (tag === 'img' || tag === 'path' || tag === 'svg') {
+        _message.destroy();
+      }
     }
   });
 };
 /** @name 显示警示 */
 export var showWarn = function showWarn(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _message.warn({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement() || document.body;
+      return getFullScreenElement() || win.document.body;
+    },
+    onClick: function onClick(e) {
+      var _e$target2;
+      var tag = (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.tagName.toLowerCase();
+      if (tag === 'img' || tag === 'path' || tag === 'svg') {
+        _message.destroy();
+      }
     }
   });
 };
 /** @name 显示成功 */
 export var showSuccess = function showSuccess(text) {
   var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _message.success({
     content: text,
     duration: duration,
     getPopupContainer: function getPopupContainer(e) {
-      return getFullScreenElement() || document.body;
+      return getFullScreenElement() || win.document.body;
+    },
+    onClick: function onClick(e) {
+      var _e$target3;
+      var tag = (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.tagName.toLowerCase();
+      if (tag === 'img' || tag === 'path' || tag === 'svg') {
+        _message.destroy();
+      }
     }
   });
 };
@@ -377,11 +413,16 @@ export var showAlert = function showAlert(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   return new Promise(function (resolve, reject) {
     _Modal[type](_objectSpread({
       content: text,
       title: title,
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || win.document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -403,6 +444,11 @@ export var exitAlert = function exitAlert() {
 export var showConfirm = function showConfirm(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   return new Promise(function (resolve, reject) {
+    var win = top || window;
+    //@ts-ignore
+    if (!win.lsAppList) {
+      win = window;
+    }
     _Modal.confirm({
       title: title,
       content: text,
@@ -412,7 +458,7 @@ export var showConfirm = function showConfirm(text) {
       cancelButtonProps: {
         className: 'ant-btn-gray'
       },
-      getContainer: getFullScreenElement() || document.body,
+      getContainer: getFullScreenElement() || win.document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -430,10 +476,16 @@ var timeout = false;
 export var reLogin = function reLogin() {
   if (timeout) return;
   timeout = true;
+  var win = top || window;
+  //@ts-ignore
+  if (!win.lsAppList) {
+    win = window;
+  }
   _Modal.warning({
     title: '登录状态已过期,请重新登录',
     okText: '重新登录',
     maskClosable: false,
+    getContainer: getFullScreenElement() || win.document.body,
     afterClose: function afterClose() {
       timeout = false;
       (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.34",
+  "version": "3.0.36",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [
@@ -21,10 +21,11 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "^3.0.22",
-    "ls-pro-form": "^3.0.8",
+    "ls-pro-table": "^3.0.23",
+    "ls-pro-form": "^3.0.9",
     "ls-pro-descriptions": "^3.0.1",
     "ls-pro-card": "^3.0.3",
+    "ls-pro-utils": "^3.0.6",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",