fix: 回退style属性

Tencent · Mar 14, 2023 · 87540da · 87540da
1 parent fc369b3
commit 87540da
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/examples/main-react/src/index.css b/examples/main-react/src/index.css
@@ -94,6 +94,7 @@ h3 {
   height: 100vh;
   overflow: hidden scroll;
   width: 1px;
+  z-index: 2;
 }
 
 .nav a {

diff --git a/examples/main-vue/src/App.vue b/examples/main-vue/src/App.vue
@@ -191,6 +191,7 @@ h3 {
   height: 100vh;
   overflow: hidden scroll;
   width: 1px;
+  z-index: 2;
 }
 
 #nav a {

diff --git a/packages/wujie-react/index.js b/packages/wujie-react/index.js
@@ -36,10 +36,9 @@ export default class WujieReact extends React.PureComponent {
 
   render() {
     this.execStartApp();
-
-    const { width, height, style } = this.props;
+    const { width, height } = this.props;
     const { myRef: ref } = this.state;
-    return <div style={{ width, height, ...style }} ref={ref} />;
+    return <div style={{ width, height }} ref={ref} />;
   }
 }
 
@@ -67,5 +66,4 @@ const propTypes = {
     activated: PropTypes.func,
     deactivated: PropTypes.func,
     loadError: PropTypes.func,
-    style: PropTypes.object
   }
diff --git a/packages/wujie-vue2/index.js b/packages/wujie-vue2/index.js
@@ -27,7 +27,6 @@ const wujieVueOptions = {
     activated: { type: Function, default: null },
     deactivated: { type: Function, default: null },
     loadError: { type: Function, default: null },
-    style: { type: Object, default: {} },
   },
   data() {
     return {
@@ -92,7 +91,6 @@ const wujieVueOptions = {
       style: {
         width: this.width,
         height: this.height,
-        ...this.style,
       },
       ref: "wujie",
     });

diff --git a/packages/wujie-vue3/index.js b/packages/wujie-vue3/index.js
@@ -27,7 +27,6 @@ const wujieVueOptions = {
     activated: { type: Function, default: null },
     deactivated: { type: Function, default: null },
     loadError: { type: Function, default: null },
-    style: { type: Object, default: {} },
   },
   data() {
     return {
@@ -91,7 +90,6 @@ const wujieVueOptions = {
       style: {
         width: this.width,
         height: this.height,
-        ...this.style,
       },
       ref: "wujie",
     });