sh-view 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/components/global-components/sh-drawer/index.vue

@@ -392,7 +392,7 @@ export default {
 		position: absolute;
 		top: 0;
 		bottom: 0;
-		background-color: #fff;
+		background-color: var(--vxe-table-body-background-color);
 		border: 0;
 		background-clip: padding-box;
 		box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);

package/packages/components/global-components/sh-form/css/index.scss

@@ -5,14 +5,14 @@
             .vxe-input--inner[disabled], .vxe-textarea--inner[disabled]{
                 cursor: auto;
                 color: #333;
-                background-color: #fff;
+                background-color: var(--vxe-table-body-background-color);
                 border-color: var(--vxe-primary-lighten-color);
             }
             .vxe-checkbox.is--disabled{
                 cursor: auto;
                 color: #333;
                 & > input + .vxe-checkbox--icon{
-                    background-color: #fff;
+                    background-color: var(--vxe-table-body-background-color);
                     border-color: var(--vxe-primary-lighten-color);
                 }
                 & > input + .vxe-checkbox--icon:before{

package/packages/components/global-components/sh-poptip/index.vue

@@ -350,6 +350,7 @@ $poptip-arrow-color: hsla(0, 0%, 85%, 0.5);
 	&-rel {
 		display: inline-block;
 		position: relative;
+		width: 100%;
 	}
 	&-title {
 		margin: 0;
@@ -386,7 +387,7 @@ $poptip-arrow-color: hsla(0, 0%, 85%, 0.5);
 	}
 	&-inner {
 		width: 100%;
-		background-color: #fff;
+		background-color: var(--vxe-table-body-background-color);
 		background-clip: padding-box;
 		border-radius: var(--vxe-border-radius);
 		box-shadow: var(--box-shadow);

package/packages/components/global-components/sh-tabs/index.vue

@@ -11,7 +11,7 @@
 								<slot name="tabItem" v-bind="{ ...tab, isActive: tab.value === activeKey }">
 									<div v-if="tab.icon" class="sh-tab-icon"><sh-icon :type="tab.icon"></sh-icon></div>
 									<div class="sh-tab-label">{{ tab[labelField] }}</div>
-									<div v-if="closable && !tab.disabled" class="sh-tab-close" @click.stop="handleClose(tab)"><sh-icon type="ios-close"></sh-icon></div>
+									<div v-if="getTabIsClosable(tab)" class="sh-tab-close" @click.stop="handleClose(tab)"><sh-icon type="ios-close"></sh-icon></div>
 								</slot>
 							</div>
 						</template>
@@ -21,7 +21,7 @@
 			</div>
 			<div v-if="$slots.right" class="sh-tabs-nav-slot sh-tabs-nav-right"><slot name="right"></slot></div>
 		</div>
-		<div v-if="isContent" class="sh-tabs-content">
+		<div v-if="hasContent" class="sh-tabs-content">
 			<div ref="contentWrap" class="sh-tabs-content-wrap" :class="{ 'sh-tabs-content-animated': animated }" :style="contentStyle">
 				<template v-for="(tab, tabIndex) in tabList" :key="tabIndex">
 					<div class="sh-tabs-content-item">
@@ -65,6 +65,10 @@ export default {
 		closable: {
 			type: Boolean,
 			default: false
+		},
+		isContent: {
+			type: Boolean,
+			default: true
 		}
 	},
 	emits: ['update:modelValue', 'close', 'change'],
@@ -77,8 +81,8 @@ export default {
 		}
 	},
 	computed: {
-		isContent() {
-			return this.activeKey && this.options.map(item => item.value).includes(this.activeKey)
+		hasContent() {
+			return this.isContent && this.activeKey && this.options.map(item => item.value).includes(this.activeKey)
 		},
 		tabList() {
 			return this.options.filter(tab => !this.closedList.includes(tab.value)) || []
@@ -131,6 +135,9 @@ export default {
 			const { navStyle } = this
 			return navStyle.transform ? Number(navStyle.transform.match(/translateX\(-(\d+(\.\d+)*)px\)/)[1]) : 0
 		},
+		getTabIsClosable(tab) {
+			return this.closable && !tab.disabled && !tab.unClosed
+		},
 		handleResize(e) {
 			const navWidth = this.$refs.nav.offsetWidth
 			const containerWidth = this.$refs.navScroll.offsetWidth