w-ui-v1 1.1.29 → 1.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/w-richness-user/w-richness-user.vue

@@ -20,7 +20,7 @@
 			<wd-cell :title="changeLanguageConmon('个人信息')" icon="user" v-if="userInfo.viewPersonalInfoable" :is-link="true" :clickable="true"
 				@click="goUserInfo" />
 			<!-- <wd-cell title="修改密码" icon="keywords" :is-link="true" :clickable="true"  /> -->
-			<wd-cell :title="changeLanguageConmon('语言切换')" icon="internet" :is-link="true" :clickable="true" @click="isVisible=true" />
+			<wd-cell v-if="props.langSwitch" :title="changeLanguageConmon('语言切换')" icon="internet" :is-link="true" :clickable="true" @click="isVisible=true" />
 			<wd-cell :title="changeLanguageConmon('退出登录')" icon="logout" :is-link="true" :clickable="true" @click="quit" />
 		</wd-cell-group>
 		<wd-message-box />

package/w-search/w-search.vue

@@ -5,8 +5,8 @@
 				<!-- <view class="search-icon">
           <wd-icon name="search" size="12px" ></wd-icon>
         </view> -->
-				<wd-drop-menu >
-					<wd-drop-menu-item ref="dropMenu"  :title="changeLanguageConmon('更多')" @opened="handleOpened">
+				<wd-drop-menu>
+					<wd-drop-menu-item ref="dropMenu" :title="changeLanguageConmon('更多')" @opened="handleOpened">
 						<view v-for="(item, index) in props.criterias" :key="index">
 							<!-- <wSelectPicker :model-value="searchData[item.sourceId] ? searchData[item.sourceId].value : ''"
                 v-if="item.extControlType === 'relselectvalue' || item.extControlType === 'entity-select'" type="radio"
@@ -44,28 +44,31 @@
 						<view class="search-btn">
 							<wd-button size="small" icon="refresh" :round="false" @click="clear"
 								type="info">{{changeLanguageConmon('重置')}}</wd-button>
-							<wd-button size="small" icon="search" :round="false" @click="search">{{changeLanguageConmon('确定')}}</wd-button>
+							<wd-button size="small" icon="search" :round="false"
+								@click="search">{{changeLanguageConmon('确定')}}</wd-button>
 
 						</view>
 
 					</wd-drop-menu-item>
 				</wd-drop-menu>
 			</view>
-            <view style="flex:1;" v-if="primaryCriteria?.extControlType==='text'||primaryCriteria?.controlType==='text'">
-            	<wd-search @clear="search" v-model="searchData[primaryCriteria.id]" :placeholder="`${changeLanguageConmon('搜索')}${changeLanguageConmon(primaryCriteria.title)}`">
+			<view style="flex:1;"
+				v-if="primaryCriteria?.extControlType==='text'||primaryCriteria?.controlType==='text'">
+				<wd-search @clear="search" v-model="searchData[primaryCriteria.id]"
+					:placeholder="`${changeLanguageConmon('搜索')}${changeLanguageConmon(primaryCriteria.title)}`">
 					<template #suffix>
 						<view @click="search" style="padding:0 8px;">
 							<wd-icon name="search" />
 						</view>
 					</template>
 				</wd-search>
-            </view>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { changeLanguageConmon} from '../Locale'
+	import { changeLanguageConmon } from '../Locale'
 	import dayjs from 'dayjs/esm/index'
 	import wSelectPicker from '../w-select-picker/w-select-picker.vue'
 	import wFromControl from '../w-form-control/w-form-control.vue'
@@ -84,9 +87,9 @@
 			default: []
 		},
 		//主搜索配置
-		primaryCriteria:{
-			type:Object,
-			default:{}
+		primaryCriteria: {
+			type: Object,
+			default: {}
 		}
 	})
 
@@ -100,7 +103,10 @@
 
 			switch (item.extControlType) {
 				case 'daterange':
-					data[`${item.sourceId}`] =item.transDefaultValue ||""
+					data[`${item.sourceId}`] = item.transDefaultValue || ""
+					break;
+				case 'yes-no-switch':
+					data[`${item.sourceId}`] = item.transDefaultValue || ""
 					break;
 				default:
 					data[`${item.sourceId}`] = ''
@@ -291,7 +297,8 @@
 
 <style scoped lang="scss">
 	.search-box {
-            display: flex;
+		display: flex;
+
 		.left {
 			// position: relative;
 

package/w-table/w-table.vue

@@ -63,8 +63,9 @@ const dataList = ref([])
 const pageData = ref<{
   criterias: []
   buttons: string[]
-  primaryCriteria:{}
-}>({ criterias: [], buttons: [], primaryCriteria:{}})
+  primaryCriteria:{},
+  defaultCriteriaValue:{}
+}>({ criterias: [], buttons: [], primaryCriteria:{},defaultCriteriaValue:{}})
 onLoad((option: any) => {
   sourceId.value = props.sourceId || option.sourceId
   mainCode.value =  props.mainCode ||option.mainCode
@@ -97,7 +98,6 @@ watch(() => props.sourceId, (value) => {
 
 // 点击搜索按钮
 function search(e: string) {
-	
   query.value = e
   paging.value.reload() // 手动触发列表重新加载
 }
@@ -115,7 +115,20 @@ async function queryList(pageNo: number, pageSize: number) {
   // paging.value.complete(false);
   // paging.value.reload() // 手动触发加载
   // })
+  
   try {
+	  
+	  //查找是否存在查询默认值
+	  Object.keys(pageData.value.defaultCriteriaValue).forEach(key => {
+	    console.log(`${key}: ${pageData.value.defaultCriteriaValue[key]}`);
+	  	//加上查询默认值
+	  	if(!query.value.includes(key)){
+	  		query.value=query.value+`${key}=${pageData.value.defaultCriteriaValue[key]}`
+	  	}
+	  	
+	  });
+	  
+	  
     
     const key = await getPageKey(sourceId.value, mainCode.value,query.value)// 获取key
     const data = await getPageData(key.data?.key, pageNo, pageSize)// 获取数据