tenghui-ui 2.4.12 → 2.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tenghui-ui",
-  "version": "2.4.12",
+  "version": "2.4.13",
   "description": "vue 2x, tenghui-ui",
   "files": [
     "dist",

package/packages/search/src/index.vue

@@ -396,7 +396,7 @@ export default {
 
         async setConfigCache(key, value) {
 
-            if (!this.$UICONFIG.setCacheApi) {
+            if (!this.$UICONFIG || !this.$UICONFIG.setCacheApi) {
 
                 localStorage.setItem(key, JSON.stringify(value));
                 return;
@@ -411,7 +411,7 @@ export default {
 
         async getConfigCache(key) {
 
-            if (!this.$UICONFIG.getCacheApi) {
+            if (!this.$UICONFIG || !this.$UICONFIG.getCacheApi) {
                 this.loadingConfig = false;
                 return JSON.parse(localStorage.getItem(key) || "{}");
             }

package/packages/table/src/index.vue

@@ -2,13 +2,7 @@
 	<div class="ui-table" :class="{ 'remove-hover-css': !hoverStyle }">
 		<div class="ui-table__tab" :style="{ height: showTab ? '32px' : 'unset' }">
 			<slot>
-				<el-tabs
-					v-if="tabList.length"
-					v-model="checkTab"
-					type="card"
-					size="mini"
-					@tab-click="(val) => $emit('tabChange', val)"
-				>
+				<el-tabs v-if="tabList.length" v-model="checkTab" type="card" size="mini" @tab-click="(val) => $emit('tabChange', val)">
 					<el-tab-pane v-for="item in tabList" :key="item.value" :name="item.value">
 						<template v-slot:label>
 							<el-badge :value="item.num" :max="999">
@@ -28,34 +22,11 @@
 			<ColumnConfig v-if="showConfig" :tableName="tableName" :options="useMaps" @change="handleMapChange" />
 		</div>
 
-		<el-table
-			ref="myTable"
-			@select="manualSelectchange"
-			v-loading="renderLoading"
-			v-bind="{ highlightRow: true, border: true, stripe: true, ...$attrs }"
-			v-on="polyfillListeners($listeners)"
-			:data="tableData"
-			:[isBindHeight]="tableHeight"
-			:[isBindMaxHeight]="maxHeight"
-			:span-method="spanMethod"
-			:row-class-name="rowClassName"
-			@row-click="handleRowClick"
-		>
+		<el-table ref="myTable" @select="manualSelectchange" v-loading="renderLoading" v-bind="{ highlightRow: true, border: true, stripe: true, ...$attrs }" v-on="polyfillListeners($listeners)" :data="tableData" :[isBindHeight]="tableHeight" :[isBindMaxHeight]="maxHeight" :span-method="spanMethod" :row-class-name="rowClassName" @row-click="handleRowClick">
 			<!-- :cell-class-name="cellClassName" -->
 			<el-table-column type="selection" width="35" v-if="showSelect" :selectable="selectable"></el-table-column>
 			<slot name="column"></slot>
-			<el-table-column
-				v-for="(item, index) in tableTitle"
-				:minWidth="tableColsMinWidth[index] || '60px'"
-				:label="item"
-				:fixed="fixedMap[tableProps[index]]"
-				:key="tableProps[index]"
-				:render-header="typeof item === 'function' ? item : null"
-				:show-overflow-tooltip="tooltips.includes(tableProps[index])"
-				:prop="tableProps[index]"
-				:width="tableProps[index] === 'index' ? '60px' : tableColsWidth[index] || ''"
-				:sortable="getSortable(tableProps[index])"
-			>
+			<el-table-column v-for="(item, index) in tableTitle" :minWidth="tableColsMinWidth[index] || '60px'" :label="item" :fixed="fixedMap[tableProps[index]]" :key="tableProps[index]" :render-header="typeof item === 'function' ? item : null" :show-overflow-tooltip="tooltips.includes(tableProps[index])" :prop="tableProps[index]" :width="tableProps[index] === 'index' ? '60px' : tableColsWidth[index] || ''" :sortable="getSortable(tableProps[index])">
 				<!-- 表头插槽 自定义表头-->
 				<template v-slot:header="scope">
 					<slot :name="tableProps[index] + 'Title'" :row="item" :$index="scope.$index">
@@ -70,8 +41,8 @@
 					</template>
 					<slot v-else :name="tableProps[index]" :row="scope.row" :$index="scope.$index">
 						<span :class="{ 'text--number': tableProps[index] != 'index' && Number.isFinite(Number(scope.row[tableProps[index]])) }">{{
-							tableProps[index] === 'index' ? changeTableInx(scope.$index) : scope.row[tableProps[index]]
-						}}</span>
+		tableProps[index] === 'index' ? changeTableInx(scope.$index) : scope.row[tableProps[index]]
+	}}</span>
 					</slot>
 				</template>
 				<template v-if="multiHeaderKey.includes(tableProps[index])">
@@ -92,17 +63,7 @@
 				<!-- 新汇总数据槽位 -->
 				<slot name="summarydata"></slot>
 			</div>
-			<el-pagination
-				ref="pageRef"
-				layout="total, sizes, prev, pager, next, jumper"
-				v-loading="loadingPageTotal"
-				:current-page="Number(pageData.offset)"
-				:page-sizes="defaultPageSizes"
-				:page-size="Number(pageData.limit)"
-				:total="Number(pageData.total)"
-				@size-change="(val) => handlePageChange('limit', val)"
-				@current-change="(val) => handlePageChange('offset', val)"
-			>
+			<el-pagination ref="pageRef" layout="total, sizes, prev, pager, next, jumper" v-loading="loadingPageTotal" :current-page="Number(pageData.offset)" :page-sizes="defaultPageSizes" :page-size="Number(pageData.limit)" :total="Number(pageData.total)" @size-change="(val) => handlePageChange('limit', val)" @current-change="(val) => handlePageChange('offset', val)">
 			</el-pagination>
 		</div>
 	</div>
@@ -129,7 +90,7 @@ export default {
 		selectable: {
 			type: Function,
 			default() {
-				return () => {};
+				return () => { };
 			},
 		},
 
@@ -215,7 +176,7 @@ export default {
 
 		rowClassName: {
 			type: Function,
-			default({ row }) {},
+			default({ row }) { },
 		},
 		tooltips: {
 			type: Array,
@@ -241,7 +202,7 @@ export default {
 				return [];
 			},
 		},
-    
+
 		fixedMap: {
 			type: Object,
 			default() {
@@ -408,14 +369,14 @@ export default {
 				this.$toChildren.$on('changePageTotal', async totalId => {
 					try {
 						this.loadingPageTotal = true;
-						const { data:res } = await this.$http.post(this.$UICONFIG.getPageTotalApi, {
+						const { data: res } = await this.$http.post(this.$UICONFIG.getPageTotalApi, {
 							id: totalId
 						});
 
 						this.pageData.total = res.data.total;
 						this.loadingPageTotal = false;
 						this.$refs.pageRef.internalCurrentPage = Number(this.pageData.offset || 0);
-					} catch(e) {
+					} catch (e) {
 						this.loadingPageTotal = false;
 					}
 				})
@@ -424,6 +385,18 @@ export default {
 	},
 
 	created() {
+
+		if (!this.$UICONFIG) {
+			this.$UICONFIG = {
+				tablePreset: {
+					separator: '@',
+					presetPropMap: {},
+				},
+
+				getPageTotalApi: '',
+			}
+		}
+
 		// 设置默认tab
 		this.checkTab = this.defaultTab;
 		this.defaultPageSizes = this.pageSizes || this.$UICONFIG?.pageSizes || [20, 50, 100, 200, 500, 1000];
@@ -435,7 +408,7 @@ export default {
 	},
 
 	async mounted() {
-		
+
 		await this.$nextTick();
 		setTimeout(() => {
 			this.isInit = true;
@@ -469,7 +442,7 @@ export default {
 		window.removeEventListener('resize', this.handleWindowResize);
 		this.$toChildren.$off('changePageTotal');
 	},
-	
+
 	deactivated() {
 		console.log('off');
 		this.$toChildren.$off('changePageTotal');
@@ -511,9 +484,9 @@ export default {
 		line-height: 28px;
 	}
 
-	/deep/ .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
+	/deep/ .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
 		// background: linear-gradient(to right bottom, #cee3ff, #66a8ff) no-repeat;
-    	// color: #FFF;
+		// color: #FFF;
 		color: #FFF;
 		background: #409eff;
 		box-shadow: 0 0 3px 1px #cee3ff;
@@ -574,11 +547,11 @@ export default {
 	z-index: 1;
 }
 
-.ui-page__main > .ui-table {
+.ui-page__main>.ui-table {
 	background: #FFF;
-    box-shadow: 0 0 4px 1px #eee;
-    margin-left: 10px;
-    border-radius: 4px;
+	box-shadow: 0 0 4px 1px #eee;
+	margin-left: 10px;
+	border-radius: 4px;
 	padding-left: 10px;
 	margin-right: 10px;
 }