w-ui-v1 1.1.28 → 1.1.30

package/Locale.ts

@@ -3,17 +3,42 @@ import { Locale } from 'wot-design-uni'
 import enUS from 'wot-design-uni/locale/lang/en-US'
 // 引入中文语言包
 import zhCN from 'wot-design-uni/locale/lang/zh-CN'
+// 引入葡萄牙语言包
+import ptPT from 'wot-design-uni/locale/lang/pt-PT'
 
-export function changeLanguage(lang: string = 'zh-CN') {
-  switch (lang) {
-    case 'en-US':
-      Locale.use('en-US', enUS)
-      break
-    case 'zh-CN':
-      Locale.use('zh-CN', zhCN)
-      break
-    default:
-      Locale.use('en-US', enUS)
-      break
-  }
+
+//切换组件语言
+export function changeLanguage(lang : string = 'zh-CN') {
+	switch (lang) {
+		case 'en-US':
+			Locale.use('en-US', enUS)
+			break
+		case 'zh-CN':
+			Locale.use('zh-CN', zhCN)
+			break
+		case 'pt':
+			Locale.use('pt-PT', ptPT)
+			break
+		default:
+			Locale.use('en-US', enUS)
+			break
+	}
 }
+
+//切换自定义组件语言
+export function changeLanguageConmon(value:string=''):string{
+	//获取当前本地存储的语言
+	let language = JSON.parse(uni.getStorageSync('language') || "{}")
+	if(!language.value){
+		return value
+	}
+	
+	let l= JSON.parse(language.value)[value]
+	
+    if(l){
+		return l
+	}else{
+		return value
+	}
+	
+}

package/index.ts

@@ -22,6 +22,7 @@ import request from './utils/http'
 import nfc from './utils/nfc'
 import iData from './utils/idata-scan'
 import {getPageKey,getDataTotal} from './utils/apis/pageConfig'
+import { changeLanguage ,changeLanguageConmon} from './Locale'
 const coms: any[] = [
   wTest,
   wLogin,
@@ -54,6 +55,8 @@ export const api={
 	nfc,
 	iData,
 	getPageKey,
-	getDataTotal
+	getDataTotal,
+	changeLanguage,
+	changeLanguageConmon
 }
 export default install // 这个方法以后再使用的时候可以被vue.use调用

package/package.json

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

package/utils/apis/language.ts

@@ -0,0 +1,14 @@
+import request from '../http.js'
+// 获取语言列表
+export function languages() {
+  return request({
+    url: `/v3/languages`,
+  })
+}
+
+//获取语言配置信息
+export function languagesConfig(lang:string) {
+  return request({
+    url: `/v3/multilingual?language=${lang}`,
+  })
+}

package/utils/nfc.ts

@@ -1,3 +1,4 @@
+import { changeLanguageConmon} from '../Locale'
 var NfcAdapter;
 var NdefRecord;
 var NdefMessage;
@@ -33,7 +34,7 @@ function listenNFCStatus() {
  
         if (nfcAdapter == null) {
             uni.showToast({
-                title: '设备不支持NFC！',
+                title: changeLanguageConmon('设备不支持NFC！'),
                 icon: 'none'
             })
             return;
@@ -41,7 +42,7 @@ function listenNFCStatus() {
          
         if (!nfcAdapter.isEnabled()) {
             uni.showToast({
-                title: '请在系统设置中先启用NFC功能！',
+                title: changeLanguageConmon('请在系统设置中先启用NFC功能！'),
                 icon: 'none'
             });
             return;
@@ -169,7 +170,7 @@ function showToast(msg) {
 function __read(intent) {
     try {
         var content = "";
-        waiting.setTitle('请勿移开卡\n正在读取数据...');
+        waiting.setTitle(`${changeLanguageConmon('请勿移开卡')}\n${changeLanguageConmon('正在读取数据')}...`);
         var tag = plus.android.importClass("android.nfc.Tag");
         tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
         var bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
@@ -262,13 +263,13 @@ function writeData() {
         return;
     }
     readyWriteData = true;
-    waiting = plus.nativeUI.showWaiting("请将卡靠近！");
+    waiting = plus.nativeUI.showWaiting(changeLanguageConmon("请将卡靠近！"));
 }
  
 function readData(getCardNo) {
     readyRead = true;
     _getCardNo = getCardNo
-    waiting = plus.nativeUI.showWaiting("请将卡靠近！", {
+    waiting = plus.nativeUI.showWaiting(changeLanguageConmon("请将卡靠近！"), {
         modal: false
     });
 }

package/w-add/w-add.vue

@@ -13,7 +13,7 @@ export default {
 		</view>
 		<view v-else>
 			<wd-collapse v-model="value">
-				<wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id"
+				<wd-collapse-item custom-body-class="collapse-custom-class" :title="changeLanguageConmon(item.title)" :name="item.id"
 					v-for="(item, index) in pageConf.groups" :key="index">
 					<view v-if="item.type === 'fieldGroup'">
 						<wd-card>
@@ -29,9 +29,9 @@ export default {
 					<view v-if="item.type === 'relation'">
 						<view class="row-add">
 							<wd-button v-if="item.buttons.includes('selectAdd')" hairline type="info" size="small"
-								icon="add" @click="selectrow(item)">选择</wd-button>
+								icon="add" @click="selectrow(item)">{{changeLanguageConmon('选择')}}</wd-button>
 							<wd-button v-if="item.buttons.includes('dtmplAdd')" hairline type="info" size="small"
-								icon="add" @click="add(item)">新增</wd-button>
+								icon="add" @click="add(item)">{{changeLanguageConmon('新增')}}</wd-button>
 						</view>
 
 						<view v-if="relationLoading[item.id]"
@@ -54,13 +54,13 @@ export default {
 
 						<view class="row-add" v-if="item.buttons.includes('rowAdd')">
 							<wd-button hairline type="info" size="small" icon="add"
-								@click="addrow(item.id)">加一条</wd-button>
+								@click="addrow(item.id)">{{changeLanguageConmon('加一条')}}</wd-button>
 						</view>
 					</view>
 				</wd-collapse-item>
 			</wd-collapse>
 			<view class="footer-button">
-				<wd-button :round="false" block @click="handleSubmit" icon="save">保存</wd-button>
+				<wd-button :round="false" block @click="handleSubmit" icon="save">{{changeLanguageConmon('保存')}}</wd-button>
 			</view>
 		</view>
 		<wd-message-box />
@@ -69,6 +69,7 @@ export default {
 </template>
 
 <script setup lang="ts">
+import { changeLanguageConmon} from '../Locale'
 import wCard from '../w-card/w-card.vue'
 import wFromControl from '../w-form-control/w-form-control.vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
@@ -252,7 +253,7 @@ if(form.value){
 					})
 					if (isTrue.length === 0) {
 						toast.loading({
-							message: '保存中...',
+							message: `${changeLanguageConmon('保存中')}...`,
 							duration: 0
 						})
 						let data = {}
@@ -275,7 +276,7 @@ if(form.value){
 						try {
 							const res = await addPageDataSave(sourceId.value, null,data)
 							if (res.data.status === 'success') {
-								toast.success("保存成功")
+								toast.success(changeLanguageConmon("保存成功"))
 								uni.navigateBack({
 									success: () => {
 			
@@ -283,7 +284,7 @@ if(form.value){
 									}
 								})
 							} else {
-								toast.error(res.data.message || '保存失败"')
+								toast.error(changeLanguageConmon(res.data.message || '保存失败'))
 							}
 			
 						} catch (error) {
@@ -305,7 +306,7 @@ if(form.value){
 					.then(async ({ valid, errors }) => {
 						if (valid) {
 							toast.loading({
-								message: '保存中...',
+								message: `${changeLanguageConmon("保存中")}...`,
 								duration: 0
 							})
 							let data = {}
@@ -328,7 +329,7 @@ if(form.value){
 							try {
 								const res = await addPageDataSave(sourceId.value, null,data)
 								if (res.data.status === 'success') {
-									toast.success("保存成功")
+									toast.success(changeLanguageConmon("保存成功"))
 									uni.navigateBack({
 										success: () => {
 			
@@ -352,7 +353,7 @@ if(form.value){
 			}
 		}else{
 			toast.loading({
-				message: '保存中...',
+				message: `${changeLanguageConmon("保存中")}...`,
 				duration: 0
 			})
 			let data = {}
@@ -375,7 +376,7 @@ if(form.value){
 			try {
 				const res = await addPageDataSave(sourceId.value, null,data)
 				if (res.data.status === 'success') {
-					toast.success("保存成功")
+					toast.success(changeLanguageConmon("保存成功"))
 					uni.navigateBack({
 						success: () => {
 						
@@ -488,8 +489,8 @@ function addrow(key: any) {
 function remove(key: any, index: any, title: string) {
 	message
 		.confirm({
-			msg: `${title}--确定删除第${index + 1}条数据吗？`,
-			title: '删除'
+			msg: changeLanguageConmon(`${title}--确定删除第${index + 1}条数据吗？`),
+			title: changeLanguageConmon('删除')
 		})
 		.then(() => {
 			model.value[key].splice(index, 1)

package/w-card/w-card.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+	 import { changeLanguageConmon} from '../Locale'
 	import WFormMessageBox from '../w-form-message-box/w-form-message-box.vue'
 	import {
 		computed,
@@ -65,7 +66,7 @@
 				if (element.preposes[0].transDefaultValue.includes(props.itemData.fieldMap[element.preposes[0].id])) {
 					data.push({
 						actionType: "submit",
-						name: element.title,
+						name:changeLanguageConmon(element.title) ,
 						color: '#4D81F1',
 						...element
 					})
@@ -73,7 +74,7 @@
 			} else {
 				data.push({
 					actionType: "submit",
-					name: element.title,
+					name: changeLanguageConmon(element.title),
 					color: '#4D81F1',
 					...element
 				})
@@ -83,7 +84,7 @@
 		props.page.ractions?.forEach((item : any) => {
 			data.push({
 				actionType: "openPage",
-				name: item.title,
+				name: changeLanguageConmon(item.title),
 				color: '#4D81F1',
 				...item
 			})
@@ -203,13 +204,13 @@
 	const dele = () => {
 		message
 			.confirm({
-				msg: '确定删除吗?',
-				title: '删除'
+				msg: changeLanguageConmon('确定删除吗?'),
+				title: changeLanguageConmon('删除')
 			})
 			.then(() => {
-				toast.loading('删除中...')
+				toast.loading(`${changeLanguageConmon('删除中')}...`)
 				deletePageData(props.sourceId, props.itemData.code).then((res : any) => {
-					toast.success('删除成功')
+					toast.success(changeLanguageConmon('删除成功'))
 					emits('refresh')
 				})
 			})
@@ -276,7 +277,7 @@
 				sourceId: props.sourceId
 			})
 		} else {
-			return "编辑"
+			return changeLanguageConmon("编辑")
 		}
 
 	}
@@ -289,7 +290,7 @@
 				<view class="card-title-class">
 					<view class="title-icon"></view>
 					<view style="flex: 1; word-break:break-all">
-						{{getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) ||getTitleValue(visibleItems[0], '')}}
+						{{changeLanguageConmon(getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) ||getTitleValue(visibleItems[0], ''))}}
 					</view>
 					<!-- <view class="status-icon">
 			   	已完成成成
@@ -298,12 +299,12 @@
 						:bg-color="getEnumColor(enumMap[page.labelColumn.mstrucId],itemData.fieldMap[page.labelColumn.id]).color"
 						v-if="page.labelColumn?.id">
 						{{
-				           itemData.fieldMap[page.labelColumn.id]
+				          changeLanguageConmon( itemData.fieldMap[page.labelColumn.id])
 			            }}
 					</wd-tag>
 				</view>
 				<view style="font-size: 12px;margin-top: 8px;color: #ffaa00;">
-					{{getTitleValue(visibleItems.find((item) => item.id === page.secondColumn?.id), page.secondColumn?.title)}}
+					{{changeLanguageConmon(getTitleValue(visibleItems.find((item) => item.id === page.secondColumn?.id), page.secondColumn?.title))}}
 				</view>
 			</view>
 
@@ -314,7 +315,7 @@
 
 				<!-- // 标题 -->
 				<view class="lable">
-					<text class="lable">{{ item.title }}:</text>
+					<text class="lable">{{changeLanguageConmon( item.title )}}:</text>
 				</view>
 
 				<!-- // 图片 -->
@@ -328,7 +329,7 @@
 
 				<!-- //文件 -->
 				<view v-else-if="item.content?.type === '文件'" class="value">
-					<wd-text type="primary" @click="downloadFile(item.content.url)" :text="item.content?.name" />
+					<wd-text type="primary" @click="downloadFile(item.content.url)" :text="changeLanguageConmon(item.content?.name)" />
 				</view>
 
 				<!-- // 音频 -->
@@ -337,22 +338,22 @@
 				<view v-else-if="item.buttons.includes('detail')" class="link">
 					<view v-if="Array.isArray(item.content)" @click="goto('link', item, subItem)"
 						v-for="(subItem, subIndex) in item.content" :key="subIndex">
-						<text> {{ subItem.label }}</text>
+						<text> {{ changeLanguageConmon(subItem.label) }}</text>
 					</view>
-					<view v-else @click="goto('link', item, item.content)">{{ item.content?.label ? item.content?.label :
-            item.content }}</view>
+					<view v-else @click="goto('link', item, item.content)">{{changeLanguageConmon( item.content?.label ? item.content?.label :
+            item.content) }}</view>
 				</view>
 
 				<!-- 数组 -->
 				<view v-else-if="Array.isArray(item.content)" class="value">
 					<text v-for="(subItem, subIndex) in item.content" :key="subIndex">
 						<text v-if="subIndex>0">，</text>
-						{{ subItem.label }}
+						{{ changeLanguageConmon(subItem.label) }}
 					</text>
 				</view>
 
 				<view v-else class="value" :style="item.css"
-					v-html="item.content?.label ? item.content?.label : item.content">
+					v-html="item.content?.label ?changeLanguageConmon( item.content?.label) : changeLanguageConmon(item.content)">
 
 				</view>
 
@@ -368,25 +369,25 @@
 			<view class="btns-box">
 				<wd-button :round="false" size="small" class="btn" v-if="props.page.buttons.includes('detail')"
 					@click="goto('detail')">
-					详情
+					{{changeLanguageConmon('详情')}}
 				</wd-button>
 				<!-- //编辑按钮 -->
 				<wd-button :round="false" type="warning" size="small" class="btn" v-if="isShowEditButton()"
 					@click="goto('edit')">
-					{{EditButtonLabel()}}
+					{{changeLanguageConmon(EditButtonLabel())}}
 				</wd-button>
 				<!-- //假删除按钮，在新增、编辑页面才会出现 -->
 				<wd-button :round="false" size="small" class="btn" type="error" @click="delerelation"
 					v-if="props.actionType === 'relation'&&props.page.buttons.includes('singleDelete')">
-					删除
+					{{changeLanguageConmon('删除')}}
 				</wd-button>
 				<wd-button :round="false" size="small" class="btn" type="error" @click="dele"
 					v-else-if="props.page.buttons.includes('singleDelete')">
-					删除
+					{{changeLanguageConmon('删除')}}
 				</wd-button>
 				<view :round="false" v-if="moreBtns.length > 0">
 					<wd-button :round="false" type='info' size="small" @click="showMoreButns = true">
-						更多
+						{{changeLanguageConmon('更多')}}
 					</wd-button>
 				</view>
 			</view>

package/w-detail/w-detail.vue

@@ -19,7 +19,7 @@ import {
 	detailPageConfig,
 	detailPageData,
 } from '../utils/apis/pageConfig'
-
+import { changeLanguageConmon} from '../Locale'
 defineOptions({
 	name: 'WDetail',
 })
@@ -40,7 +40,7 @@ onLoad((option: any) => {
 	sourceId.value = props.sourceId || option.sourceId ||sc.sourceId
 	code.value = option.code || props.code || sc.code
 	getPageData()
-	uni.setNavigationBarTitle({ title: "详情" })
+	uni.setNavigationBarTitle({ title: changeLanguageConmon("详情") })
 })
 
 //将 URL 中问号后面的参数转换为对象
@@ -114,7 +114,7 @@ function goto(type = '', PItem: any, item: any) {
 			<wd-loading />
 		</view>
 		<wd-collapse v-model="value" v-else>
-			<wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id"
+			<wd-collapse-item custom-body-class="collapse-custom-class" :title="changeLanguageConmon(item.title)" :name="item.id"
 				v-for="(item, index) in pageConf.groups" :key="index">
 
 				<wd-card title=" " v-if="item.type === 'fieldGroup'" custom-class="card-custom-class">
@@ -122,7 +122,7 @@ function goto(type = '', PItem: any, item: any) {
 						<view v-if="!subItem.hidden" class="row">
 
 							<view class="label">
-								{{ subItem.title }}:
+								{{ changeLanguageConmon(subItem.title) }}:
 							</view>
 							<!-- //图片 -->
 							<wd-img v-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '图片'"
@@ -178,7 +178,7 @@ function goto(type = '', PItem: any, item: any) {
 
 					<template #footer>
 						<wd-button size="small" icon="view-module" type="text"
-							v-if="item.buttons.includes('detail')">详情</wd-button>
+							v-if="item.buttons.includes('detail')">{{changeLanguageConmon("详情")}}</wd-button>
 					</template>
 				</wd-card>
 
@@ -189,7 +189,7 @@ function goto(type = '', PItem: any, item: any) {
 							<view v-if="!subItem.hidden" class="row">
 
 								<view class="label">
-									{{ subItem.title }}:
+									{{ changeLanguageConmon(subItem.title) }}:
 								</view>
 
 								<!-- //图片 -->
@@ -247,7 +247,7 @@ function goto(type = '', PItem: any, item: any) {
 
 						<template #footer>
 							<wd-button @click="goto('detail', PItem, item)" size="small" icon="view-module" type="text"
-								v-if="item.buttons.includes('detail')">详情</wd-button>
+								v-if="item.buttons.includes('detail')">{{changeLanguageConmon(详情)}}</wd-button>
 						</template>
 					</wd-card>
 				</view>
@@ -260,12 +260,13 @@ function goto(type = '', PItem: any, item: any) {
 
 <style scoped lang="scss">
 .row {
-	display: flex;
+	// display: flex;
 
 	.label {
 		//文字换行
-		white-space: nowrap;
-		word-break: break-all;
+		// white-space: nowrap;
+		// word-break: break-all;
+		color:#919191;
 		margin-right: 20rpx;
 	}
 

package/w-edit/w-edit.vue

@@ -13,7 +13,7 @@
 		</view>
 		<view v-else>
 			<wd-collapse v-model="value">
-				<wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id"
+				<wd-collapse-item custom-body-class="collapse-custom-class" :title="changeLanguageConmon(item.title)" :name="item.id"
 					v-for="(item, index) in pageConf.groups" :key="index">
 					<view v-if="item.type === 'fieldGroup'">
 						<wd-card>
@@ -29,9 +29,9 @@
 					<view v-if="item.type === 'relation'">
 						<view class="row-add">
 							<wd-button v-if="item.buttons.includes('selectAdd')" hairline type="info" size="small"
-								icon="add" @click="selectrow(item)">选择</wd-button>
+								icon="add" @click="selectrow(item)">{{changeLanguageConmon('选择')}}</wd-button>
 							<wd-button v-if="item.buttons.includes('dtmplAdd')" hairline type="info" size="small"
-								icon="add" @click="add(item)">新增</wd-button>
+								icon="add" @click="add(item)">{{changeLanguageConmon('新增')}}</wd-button>
 						</view>
 
 						<view v-if="relationLoading[item.id]"
@@ -54,7 +54,7 @@
 
 						<view class="row-add" v-if="item.buttons.includes('rowAdd')">
 							<wd-button hairline type="info" size="small" icon="add"
-								@click="addrow(item.id)">加一条</wd-button>
+								@click="addrow(item.id)">{{changeLanguageConmon('加一条')}}</wd-button>
 						</view>
 
 					</view>
@@ -63,7 +63,7 @@
 				</wd-collapse-item>
 			</wd-collapse>
 			<view class="footer-button">
-				<wd-button block @click="handleSubmit" icon="save" :round="false">保存</wd-button>
+				<wd-button block @click="handleSubmit" icon="save" :round="false">{{changeLanguageConmon('保存')}}</wd-button>
 			</view>
 		</view>
 		<wd-message-box />
@@ -82,6 +82,7 @@
 </template>
 
 <script setup lang="ts">
+	import { changeLanguageConmon} from '../Locale'
 	import wCard from '../w-card/w-card.vue'
 	import wFromControl from '../w-form-control/w-form-control.vue'
 	import WSelectTable from '../w-select-table/w-select-table.vue';
@@ -231,7 +232,7 @@
 					})
 					if (isTrue.length === 0) {
 						toast.loading({
-							message: '保存中...',
+							message: `${changeLanguageConmon('保存中')}...`,
 							duration: 0
 						})
 						let data = {}
@@ -254,7 +255,7 @@
 						try {
 							const res = await addPageDataSave(sourceId.value, null,data)
 							if (res.data.status === 'success') {
-								toast.success("保存成功")
+								toast.success(changeLanguageConmon("保存成功"))
 								uni.navigateBack({
 									success: () => {
 			
@@ -284,7 +285,7 @@
 					.then(async ({ valid, errors }) => {
 						if (valid) {
 							toast.loading({
-								message: '保存中...',
+								message: `${changeLanguageConmon("保存中")}...`,
 								duration: 0
 							})
 							let data = {}
@@ -307,7 +308,7 @@
 							try {
 								const res = await addPageDataSave(sourceId.value, null,data)
 								if (res.data.status === 'success') {
-									toast.success("保存成功")
+									toast.success(changeLanguageConmon("保存成功"))
 									uni.navigateBack({
 										success: () => {
 			
@@ -331,7 +332,7 @@
 			}
 		}else{
 			toast.loading({
-				message: '保存中...',
+				message: `${changeLanguageConmon("保存中")}...`,
 				duration: 0
 			})
 			let data = {}
@@ -354,7 +355,7 @@
 			try {
 				const res = await addPageDataSave(sourceId.value, null,data)
 				if (res.data.status === 'success') {
-					toast.success("保存成功")
+					toast.success(changeLanguageConmon("保存成功"))
 					uni.navigateBack({
 						success: () => {
 						
@@ -417,7 +418,7 @@
 
 		//监听添加数据完成事件
 		uni.$on('addDataSAC', function (data : any) {
-			console.log(data,'kk')
+			
 			checkboxvalue.value = selectData.value[item.id] ? [...selectData.value[item.id].map((item : any) => {
 				return item.code
 			}), data.entityCode] : [data.entityCode]
@@ -447,8 +448,8 @@
 	function remove(key : any, index : any, title : string) {
 		message
 			.confirm({
-				msg: `${title}--确定删除第${index + 1}条数据吗？`,
-				title: '删除'
+				msg:changeLanguageConmon(`${title}--确定删除第${index + 1}条数据吗？`) ,
+				title: changeLanguageConmon('删除')
 			})
 			.then(() => {
 				model.value[key].splice(index, 1)