w-ui-v1 1.1.43 → 1.1.44

package/Locale.ts

@@ -28,12 +28,30 @@ export function changeLanguage(lang : string = 'zh-CN') {
 //切换自定义组件语言
 export function changeLanguageConmon(value:string=''):string{
 	//获取当前本地存储的语言
-	let language = JSON.parse(uni.getStorageSync('language') || "{}")
+	let languageRaw = uni.getStorageSync('language')
+	// 兼容 uni.getStorageSync 返回对象或字符串的情况
+	let language : any
+	if(typeof languageRaw === 'string'){
+		language = JSON.parse(languageRaw || "{}")
+	}else if(languageRaw && typeof languageRaw === 'object'){
+		language = languageRaw
+	}else{
+		language = {}
+	}
 	if(!language.value){
 		return value
 	}
 	
-	let l= JSON.parse(language.value)[value]
+	// 兼容 language.value 是字符串或对象的情况
+	let langObj : any
+	if(typeof language.value === 'string'){
+		langObj = JSON.parse(language.value)
+	}else if(language.value && typeof language.value === 'object'){
+		langObj = language.value
+	}else{
+		return value
+	}
+	let l= langObj[value]
 	
     if(l){
 		return l
@@ -41,4 +59,4 @@ export function changeLanguageConmon(value:string=''):string{
 		return value
 	}
 	
-}
+}

package/package.json

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

package/w-report-table/w-report-table.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="smart-table-container">
 		<!-- 搜索 -->
-		<wSearch :primaryCriteria="pageConfigs.primaryCriteria" :criterias="pageConfigs.drillingParams" @search="search" v-if="pageConfigs.buttons?.includes('query')">
+		<wSearch :primaryCriterion="pageConfigs.primaryCriterion" :criteria="pageConfigs.drillingParams" @search="search" v-if="pageConfigs.buttons?.includes('query')">
 		</wSearch>
 		<view v-if="loading" class="enpert">
 			<wd-loading />

package/w-search/w-search.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
 		<view class="search-box">
-			<view class="left" v-if="props.criterias.length">
+			<view class="left" v-if="props.criteria.length">
 				<!-- <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">
-						<view v-for="(item, index) in props.criterias" :key="index">
+						<view v-for="(item, index) in props.criteria" :key="index">
 							<!-- <wSelectPicker :model-value="searchData[item.sourceId] ? searchData[item.sourceId].value : ''"
                 v-if="item.extControlType === 'relselectvalue' || item.extControlType === 'entity-select'" type="radio"
                 @confirm="(e) => { searchData[item.sourceId] = e.selectedItems }" :label="item.title"
@@ -53,9 +53,9 @@
 				</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)}`">
+				v-if="primaryCriterion?.extControlType==='text'||primaryCriterion?.controlType==='text'">
+				<wd-search @clear="search" v-model="searchData[primaryCriterion.id]"
+					:placeholder="`${changeLanguageConmon('搜索')}${changeLanguageConmon(primaryCriterion.title)}`">
 					<template #suffix>
 						<view @click="search" style="padding:0 8px;">
 							<wd-icon name="search" />
@@ -82,12 +82,12 @@
 	const emits = defineEmits(['search'])
 	const props = defineProps({
 		//搜索框配置源
-		criterias: {
+		criteria: {
 			type: Array,
 			default: []
 		},
 		//主搜索配置
-		primaryCriteria: {
+		primaryCriterion: {
 			type: Object,
 			default: {}
 		}
@@ -99,7 +99,7 @@
 
 	onBeforeMount(() => {
 		let data = {}
-		props.criterias.forEach((item : any) => {
+		props.criteria.forEach((item : any) => {
 
 			switch (item.extControlType) {
 				case 'daterange':
@@ -130,7 +130,7 @@
 		for (const key in searchData.value) {
 			if (Object.prototype.hasOwnProperty.call(searchData.value, key)) {
 				const element = searchData.value[key];
-				props.criterias.forEach((item : any) => {
+				props.criteria.forEach((item : any) => {
 					console.log(element)
 					if (!element) return
 
@@ -267,7 +267,7 @@
 	}
 	const clear = () => {
 		let data = {}
-		props.criterias.forEach((item : any) => {
+		props.criteria.forEach((item : any) => {
 			data[`${item.sourceId}`] = ''
 		})
 		searchData.value = data
@@ -278,7 +278,7 @@
 	//获取枚举
 	async function getEnumer() {
 		let params = []
-		props.criterias.forEach((item : any) => {
+		props.criteria.forEach((item : any) => {
 
 			if (item.controlType === 'select') {
 				params.push(`mstrucIds=${item.mstrucId}`)

package/w-select-picker/w-select-picker.vue

@@ -142,7 +142,7 @@
 	const filterColumns = ref<Array<Record<string, any>>>([])
 	const scrollTop = ref<number>(0) // 滚动位置
 	const cell = useCell()
-	const ltmplConfig = ref({ primaryColumn: { sourceId: "" }, primaryCriteria: { sourceId: "" } })
+	const ltmplConfig = ref({ primaryColumn: { sourceId: "" }, primaryCriterion: { sourceId: "" } })
 	const pageData = ref([])
 	const loading = ref(false)
 	const showValue = computed(() => {
@@ -287,7 +287,7 @@
 	//滚动到底部事件
 	const scrolltolower = async () => {
 		let qrueKey = ""
-		if (ltmplConfig.value.primaryCriteria?.sourceId) qrueKey = "c_" + ltmplConfig.value.primaryCriteria.sourceId + `=${filterVal.value}`
+		if (ltmplConfig.value.primaryCriterion?.sourceId) qrueKey = "c_" + ltmplConfig.value.primaryCriterion.sourceId + `=${filterVal.value}`
 		const key = await getPageKey(props.sourceId, props.mainCode, qrueKey)// 获取key
 		const data = await getPageData(key.data?.key, pageNo.value, 50)// 获取数据
 		if (data.data?.entities?.length === 0) {
@@ -434,7 +434,7 @@
 		filterColumns.value = []
 		pageData.value = []
 		let qrueKey = ""
-		if (ltmplConfig.value.primaryCriteria.sourceId) qrueKey = "c_" + ltmplConfig.value.primaryCriteria.sourceId + `=${value}`
+		if (ltmplConfig.value.primaryCriterion.sourceId) qrueKey = "c_" + ltmplConfig.value.primaryCriterion.sourceId + `=${value}`
 		const key = await getPageKey(props.sourceId, "", qrueKey)// 获取key
 		const data = await getPageData(key.data?.key, 1, 50)// 获取数据
 		getlist(data.data?.entities || [])

package/w-select-table/w-select-table.vue

@@ -34,9 +34,9 @@ const sourceId = ref('')
 const radiovalue = ref()
 const checkboxvalue = ref([])
 const pageData = ref<{
-  criterias: []
+  criteria: []
   buttons: string[]
-}>({ criterias: [], buttons: [] })
+}>({ criteria: [], buttons: [] })
 onLoad((option: any) => {
 	console.log(option,props)
   sourceId.value = props.sourceId || option.sourceId
@@ -162,7 +162,7 @@ function handleCansle() {
     <template #top>
       <view class="buttons">
         <!-- 搜索 -->
-        <wSearch :criterias="pageData.criterias" @search="search" v-if="pageData.buttons.includes('query')">
+        <wSearch :criteria="pageData.criteria" @search="search" v-if="pageData.buttons.includes('query')">
         </wSearch>
         <view>
           <!-- 添加按钮 -->

package/w-switch-lang/w-switch-lang.vue

@@ -13,7 +13,15 @@
 	const loading = ref(false)
 	const emits = defineEmits(["update:show"])
 	//获取当前本地存储的语言
-	let language = JSON.parse(uni.getStorageSync('language') || "{}")
+	let languageRaw = uni.getStorageSync('language')
+	let language : any
+	if(typeof languageRaw === 'string'){
+		language = JSON.parse(languageRaw || "{}")
+	}else if(languageRaw && typeof languageRaw === 'object'){
+		language = languageRaw
+	}else{
+		language = {}
+	}
 	// 默认中文:zh-CN
 	const lang = ref('zh-CN')
 	const columns = ref([
@@ -137,4 +145,4 @@
 		// display: flex;
 		// justify-content: flex-end;
 	}
-</style>
+</style>

package/w-table/w-table.vue

@@ -61,11 +61,11 @@ const paging = ref()
 // 列表数据 v-model绑定的这个变量不要在分页请求结束中自己赋值，直接使用即可
 const dataList = ref([])
 const pageData = ref<{
-  criterias: []
+  criteria: []
   buttons: string[]
-  primaryCriteria:{},
+  primaryCriterion:{},
   defaultCriteriaValue:{}
-}>({ criterias: [], buttons: [], primaryCriteria:{},defaultCriteriaValue:{}})
+}>({ criteria: [], buttons: [], primaryCriterion:{},defaultCriteriaValue:{}})
 onLoad((option: any) => {
   sourceId.value = props.sourceId || option.sourceId
   mainCode.value =  props.mainCode ||option.mainCode
@@ -166,7 +166,7 @@ defineExpose({
 		<view v-if="props.showSearch">
 			<view >
 			  <!-- 搜索 -->
-			  <wSearch :primaryCriteria="pageData.primaryCriteria" :criterias="pageData.criterias" @search="search" v-if="pageData.buttons.includes('query')">
+			  <wSearch :primaryCriterion="pageData.primaryCriterion" :criteria="pageData.criteria" @search="search" v-if="pageData.buttons.includes('query')">
 			  </wSearch>
 			  
 			</view>