wargerm 0.7.9 → 0.7.11

package/dist/components/Modal/dialog.d.ts

@@ -12,12 +12,14 @@ declare type Props = {
     destroyOnClose?: boolean;
     hiddenMask?: boolean;
     isResize?: boolean;
+    isDrag?: boolean;
     open?: boolean;
     width?: number;
     className?: string;
+    wrapClassName?: string;
     style?: React.CSSProperties;
     children?: ReactNode;
     ref?: any;
 };
-declare const _default: React.ForwardRefExoticComponent<Pick<Props, "width" | "open" | "destroyOnClose" | "closeCb" | "onClose" | "hiddenMask" | "isResize" | "className" | "style" | "title" | "onOk" | "onCancel" | "footer" | "content" | "okText" | "cancelText" | "children"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Pick<Props, "width" | "open" | "destroyOnClose" | "closeCb" | "onClose" | "hiddenMask" | "isResize" | "isDrag" | "className" | "wrapClassName" | "style" | "title" | "onOk" | "onCancel" | "footer" | "content" | "okText" | "cancelText" | "children"> & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/Modal/index.d.ts

@@ -17,6 +17,7 @@ declare type Props = {
     isResize?: boolean;
     width?: number;
     className?: string;
+    wrapClassName?: string;
     ref?: any;
     style?: React.CSSProperties;
 };

package/dist/index.css

@@ -12004,6 +12004,12 @@
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -24840,6 +24846,12 @@ button.swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -38822,6 +38834,12 @@ button[data-prefers-color='dark'] .swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -52563,6 +52581,12 @@ button[data-prefers-color='light'] .swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -65316,6 +65340,12 @@ button[data-prefers-color='light'] .swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }

package/dist/index.esm.css

@@ -12004,6 +12004,12 @@
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -24840,6 +24846,12 @@ button.swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -38822,6 +38834,12 @@ button[data-prefers-color='dark'] .swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -52563,6 +52581,12 @@ button[data-prefers-color='light'] .swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }
@@ -65316,6 +65340,12 @@ button[data-prefers-color='light'] .swiper-pagination-bullet {
 .h1 {
   height: calc(1 / 1080 * 100vh);
 }
+.w0 {
+  width: 0px;
+}
+.h0 {
+  height: calc(0 / 1080 * 100vh);
+}
 .flex {
   display: flex;
 }

package/dist/index.esm.js

@@ -4165,7 +4165,7 @@ var WForm = function WForm(props, ref) {
     style: {
       display: 'flex'
     }
-  }, search && search.optionRender && search.optionRender(search, props.form, [/*#__PURE__*/React.createElement(WButton, {
+  }, search && search.optionRender && search.optionRender(search, form, [/*#__PURE__*/React.createElement(WButton, {
     key: 'submit',
     type: "primary",
     className: "mr20",
@@ -5983,8 +5983,10 @@ function DialogModel(props, ref) {
       onClose = props.onClose,
       hiddenMask = props.hiddenMask,
       isResize = props.isResize,
+      isDrag = props.isDrag,
       _props$className = props.className,
       className = _props$className === void 0 ? 'default-dialog' : _props$className,
+      wrapClassName = props.wrapClassName,
       style = props.style;
 
   var _useState = useState(open),
@@ -6026,19 +6028,21 @@ function DialogModel(props, ref) {
     var _classNames;
 
     return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement("div", {
-      className: "w100p h100p pa ",
+      className: 'w100p h100p'.concat(" pa ", wrapClassName || ''),
       style: {
         display: modelShow ? 'block' : 'none',
-        overflow: 'hidden',
+        overflow: isDrag ? 'visible' : 'hidden',
         top: 0,
-        left: 0
+        left: 0,
+        pointerEvents: isDrag ? 'none' : 'all'
       }
     }, /*#__PURE__*/React.createElement("div", {
       ref: containerRef,
       className: classnames((_classNames = {}, _defineProperty(_classNames, className, true), _defineProperty(_classNames, 'model_container', true), _defineProperty(_classNames, "animate__animated", true), _defineProperty(_classNames, flag ? 'animate__bounceInDown' : 'animate__fadeOutRightBig', true), _classNames)),
       style: _objectSpread2({
         opacity: modelShowAync ? 1 : 0,
-        width: typeof width == 'number' ? width + 'px' : width
+        width: typeof width == 'number' ? width + 'px' : width,
+        pointerEvents: 'all'
       }, style)
     }, /*#__PURE__*/React.createElement("div", {
       className: 'model_wrap'
@@ -6168,7 +6172,7 @@ function DialogModel(props, ref) {
 
 var Dialog = /*#__PURE__*/React.forwardRef(DialogModel);
 
-var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style"],
+var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
     _excluded2$3 = ["open"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
@@ -6286,6 +6290,8 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           onClose = _this$props4.onClose,
           className = _this$props4.className,
           style = _this$props4.style,
+          isDrag = _this$props4.isDrag,
+          wrapClassName = _this$props4.wrapClassName,
           other = _objectWithoutProperties(_this$props4, _excluded$i);
 
       return /*#__PURE__*/React.createElement(Dialog, _objectSpread2({
@@ -6295,6 +6301,8 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
         open: open,
         width: width,
         className: className,
+        isDrag: isDrag,
+        wrapClassName: wrapClassName,
         style: style
       }, other), this.renderTop(), /*#__PURE__*/React.createElement("div", {
         className: "model-content"
@@ -8568,7 +8576,7 @@ var index$6 = /*#__PURE__*/forwardRef(VideoPlayer$1);
   }, window.dhPlayerControl || {}, {
     noCardPlayerFlag: false,
     DHPlayerVersion: '',
-    pkgDHPlayerVerion: [2301102132, 2301121115] // 配套的插件版本号
+    pkgDHPlayerVerion: [2305221636, 2305221636] // 配套的插件版本号
 
   }); //在Function的原型上自定义myBind()方法
 
@@ -9754,7 +9762,7 @@ var index$6 = /*#__PURE__*/forwardRef(VideoPlayer$1);
     onbeforeunload: function onbeforeunload() {
       var _this5 = this;
 
-      this.destroy().then(function () {
+      this.destroy(true).then(function () {
         socketClose.call(_this5);
       });
     },
@@ -9944,6 +9952,7 @@ var index$6 = /*#__PURE__*/forwardRef(VideoPlayer$1);
     destroy: function destroy() {
       var _this7 = this;
 
+      var isRefresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       return new Promise(function (resolve, reject) {
         var that = window.dhPlayerControl.videoList[_this7.setting.videoId];
 
@@ -9953,7 +9962,8 @@ var index$6 = /*#__PURE__*/forwardRef(VideoPlayer$1);
           _this7.send({
             method: 'window.destroy',
             info: {
-              hwnd: that.setting.hwnd
+              hwnd: that.setting.hwnd,
+              isRefresh: isRefresh
             }
           });
 

package/dist/index.js

@@ -4209,7 +4209,7 @@ var WForm = function WForm(props, ref) {
     style: {
       display: 'flex'
     }
-  }, search && search.optionRender && search.optionRender(search, props.form, [/*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.optionRender && search.optionRender(search, form, [/*#__PURE__*/React__default['default'].createElement(WButton, {
     key: 'submit',
     type: "primary",
     className: "mr20",
@@ -6027,8 +6027,10 @@ function DialogModel(props, ref) {
       onClose = props.onClose,
       hiddenMask = props.hiddenMask,
       isResize = props.isResize,
+      isDrag = props.isDrag,
       _props$className = props.className,
       className = _props$className === void 0 ? 'default-dialog' : _props$className,
+      wrapClassName = props.wrapClassName,
       style = props.style;
 
   var _useState = React.useState(open),
@@ -6070,19 +6072,21 @@ function DialogModel(props, ref) {
     var _classNames;
 
     return /*#__PURE__*/ReactDOM__default['default'].createPortal( /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "w100p h100p pa ",
+      className: 'w100p h100p'.concat(" pa ", wrapClassName || ''),
       style: {
         display: modelShow ? 'block' : 'none',
-        overflow: 'hidden',
+        overflow: isDrag ? 'visible' : 'hidden',
         top: 0,
-        left: 0
+        left: 0,
+        pointerEvents: isDrag ? 'none' : 'all'
       }
     }, /*#__PURE__*/React__default['default'].createElement("div", {
       ref: containerRef,
       className: classnames__default['default']((_classNames = {}, _defineProperty(_classNames, className, true), _defineProperty(_classNames, 'model_container', true), _defineProperty(_classNames, "animate__animated", true), _defineProperty(_classNames, flag ? 'animate__bounceInDown' : 'animate__fadeOutRightBig', true), _classNames)),
       style: _objectSpread2({
         opacity: modelShowAync ? 1 : 0,
-        width: typeof width == 'number' ? width + 'px' : width
+        width: typeof width == 'number' ? width + 'px' : width,
+        pointerEvents: 'all'
       }, style)
     }, /*#__PURE__*/React__default['default'].createElement("div", {
       className: 'model_wrap'
@@ -6212,7 +6216,7 @@ function DialogModel(props, ref) {
 
 var Dialog = /*#__PURE__*/React__default['default'].forwardRef(DialogModel);
 
-var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style"],
+var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
     _excluded2$3 = ["open"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
@@ -6330,6 +6334,8 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           onClose = _this$props4.onClose,
           className = _this$props4.className,
           style = _this$props4.style,
+          isDrag = _this$props4.isDrag,
+          wrapClassName = _this$props4.wrapClassName,
           other = _objectWithoutProperties(_this$props4, _excluded$i);
 
       return /*#__PURE__*/React__default['default'].createElement(Dialog, _objectSpread2({
@@ -6339,6 +6345,8 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
         open: open,
         width: width,
         className: className,
+        isDrag: isDrag,
+        wrapClassName: wrapClassName,
         style: style
       }, other), this.renderTop(), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-content"
@@ -8612,7 +8620,7 @@ var index$6 = /*#__PURE__*/React.forwardRef(VideoPlayer$1);
   }, window.dhPlayerControl || {}, {
     noCardPlayerFlag: false,
     DHPlayerVersion: '',
-    pkgDHPlayerVerion: [2301102132, 2301121115] // 配套的插件版本号
+    pkgDHPlayerVerion: [2305221636, 2305221636] // 配套的插件版本号
 
   }); //在Function的原型上自定义myBind()方法
 
@@ -9798,7 +9806,7 @@ var index$6 = /*#__PURE__*/React.forwardRef(VideoPlayer$1);
     onbeforeunload: function onbeforeunload() {
       var _this5 = this;
 
-      this.destroy().then(function () {
+      this.destroy(true).then(function () {
         socketClose.call(_this5);
       });
     },
@@ -9988,6 +9996,7 @@ var index$6 = /*#__PURE__*/React.forwardRef(VideoPlayer$1);
     destroy: function destroy() {
       var _this7 = this;
 
+      var isRefresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       return new Promise(function (resolve, reject) {
         var that = window.dhPlayerControl.videoList[_this7.setting.videoId];
 
@@ -9997,7 +10006,8 @@ var index$6 = /*#__PURE__*/React.forwardRef(VideoPlayer$1);
           _this7.send({
             method: 'window.destroy',
             info: {
-              hwnd: that.setting.hwnd
+              hwnd: that.setting.hwnd,
+              isRefresh: isRefresh
             }
           });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",