tenghui-ui 2.2.1 → 2.2.3

package/package.json

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

package/packages/form-item/src/defaultAttrsConfig.js

@@ -2,6 +2,7 @@ const datePickerCommonAttrs = {
 	'range-separator': '至',
 	'start-placeholder': '开始时间',
 	'end-placeholder': '结束时间',
+	size: 'small'
 };
 const datetimerangeDefaultAttrs = {
 	...datePickerCommonAttrs,
@@ -9,23 +10,27 @@ const datetimerangeDefaultAttrs = {
 	'default-time': ['00:00:00', '23:59:59'],
 	'value-format': 'yyyy-MM-dd HH:mm:ss',
 	format: 'yyyy-MM-dd HH:mm:ss',
+	size: 'small'
 };
 const daterangeDefaultAttrs = {
 	...datePickerCommonAttrs,
 	type: 'daterange',
 	'value-format': 'yyyy-MM-dd',
 	format: 'yyyy-MM-dd',
+	size: 'small'
 };
 const datetimeDefaultAttrs = {
 	type: 'datetime',
 	'default-time': '00:00:00',
 	format: 'yyyy-MM-dd HH:mm:ss',
 	'value-format': 'yyyy-MM-dd HH:mm:ss',
+	size: 'small'
 };
 const dateDefaultAttrs = {
 	type: 'date',
 	format: 'yyyy-MM-dd',
 	'value-format': 'yyyy-MM-dd',
+	size: 'small'
 };
 export const defaultAttrsMap = {
 	input: {

package/packages/form-item/src/index.vue

@@ -142,7 +142,8 @@
 					<div :class="{ 'ui-item-prepend': !!$slots.prepend }">
 						<slot name="prepend"></slot>
 					</div>
-					<el-date-picker :class="{ inline_content: inlineLabel }" :ref="type" v-model="modelForm" v-bind="setDefaultAttrs($attrs)" v-on="$listeners">
+					<el-date-picker :class="{ inline_content: inlineLabel }" :ref="type" 
+						v-model="modelForm" v-bind="setDefaultAttrs($attrs)" v-on="$listeners">
 					</el-date-picker>
 				</div>
 			</template>

package/packages/search/src/DefaultItem.vue

@@ -13,6 +13,7 @@ export default {
         const vnode = this._props.vnode;
         const prepend = vnode.$slots.prepend;
         const append = vnode.$slots.append;
+        const label = vnode.$slots.label;
         return h(this._props.vnode.constructor, {
             on: vnode.$listeners,
             props: vnode.$options.propsData,
@@ -22,7 +23,8 @@ export default {
         }, 
         [
             prepend ? [h('div', { slot: 'prepend' }, prepend)] : [],
-            append ? [h('div', { slot: 'append' }, append)] : []
+            append ? [h('div', { slot: 'append' }, append)] : [],
+            label ? [h('div', { slot: 'label', class: 'ui-item__label' }, label)] : []
         ]
         );
     },

package/packages/table/src/index.vue

@@ -96,7 +96,7 @@
 				ref="pageRef"
 				layout="total, sizes, prev, pager, next, jumper"
 				:current-page="Number(pageData.offset)"
-				:page-sizes="pageSizes"
+				:page-sizes="defaultPageSizes"
 				:page-size="Number(pageData.limit)"
 				:total="Number(pageData.total)"
 				@size-change="(val) => handlePageChange('limit', val)"
@@ -252,13 +252,16 @@ export default {
 		hoverStyle: {
 			type: Boolean,
 			default: true
+		},
+		pageSizes: {
+			type: Array
 		}
 	},
 
 	data() {
 		return {
 			isPresetProp,
-			pageSizes: [20, 50, 100, 200, 500, 1000],
+			defaultPageSizes: [20, 50, 100, 200, 500, 1000],
 			tableHeight: '',
 			checkTab: '',
 			useMaps: {},
@@ -397,6 +400,8 @@ export default {
 		// 设置默认tab
 		this.checkTab = this.defaultTab;
 
+		this.defaultPageSizes = this.pageSizes || this.$UICONFIG.pageSizes;
+
 		// 默认map
 		this.useMaps = JSON.parse(JSON.stringify(this.tableMap));
 	},