w-ui-v1 1.1.43 → 1.1.45

package/Locale.ts

@@ -1,44 +1,62 @@
-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
-		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
-	}
-	
-}
+import { Locale } from '@wot-ui/ui'
+// 引入英文语言包
+import enUS from '@wot-ui/ui/locale/lang/en-US'
+// 引入中文语言包
+import zhCN from '@wot-ui/ui/locale/lang/zh-CN'
+// 引入葡萄牙语言包
+import ptPT from '@wot-ui/ui/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
+		case 'pt':
+			Locale.use('pt-PT', ptPT)
+			break
+		default:
+			Locale.use('en-US', enUS)
+			break
+	}
+}
+
+//切换自定义组件语言
+export function changeLanguageConmon(value:string=''):string{
+	//获取当前本地存储的语言
+	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
+	}
+	
+	// 兼容 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
+	}else{
+		return value
+	}
+	
+}

package/index.ts

@@ -1,69 +1,69 @@
-import type { App } from 'vue'
-import wLogin from './w-login/w-login.vue'
-import WMenu from './w-menu/w-menu.vue'
-import wSwitchLang from './w-switch-lang/w-switch-lang.vue'
-import WTable from './w-table/w-table.vue'
-import wTest from './w-test/w-test.vue'
-import wSelectPicker from './w-select-picker/w-select-picker.vue'
-import wDetail from './w-detail/w-detail.vue'
-import wAdd from './w-add/w-add.vue'
-import WSearch from './w-search/w-search.vue'
-import WUser from './w-user/w-user.vue'
-import wEdit from './w-edit/w-edit.vue'
-import WSelectTable from './w-select-table/w-select-table.vue'
-import WFormMessageBox from './w-form-message-box/w-form-message-box.vue'
-import WAudio from './w-audio/w-audio.vue'
-import WReportTable from './w-report-table/w-report-table.vue'
-import WFormControlVue from './w-form-control/w-form-control.vue'
-import WScanBindingSensor from './w-scan-binding-sensor/w-scan-binding-sensor.vue'
-import WUpdateVersion from './w-update-version/w-update-version.vue'
-import WTree from './w-tree/w-tree.vue'
-import WTreeAddTableVue from './w-tree-add-table/w-tree-add-table.vue'
-import WBorrowAddVue from './w-add/w-borrow-add.vue'
-import {menu} from './utils/apis/menu'
-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,
-  wSwitchLang,
-  WMenu,
-  WTable,
-  wSelectPicker,
-  wDetail,
-  wAdd,
-  WSearch,
-  WUser,
-  wEdit,
-  WSelectTable,
-  WFormMessageBox,
-  WAudio,
-  WReportTable,
-  WFormControlVue,
-  WScanBindingSensor,
-  WUpdateVersion,
-  WTree,
-  WTreeAddTableVue,
-  WBorrowAddVue
-]
-// 批量组件注册
-function install(Vue: App) {
-  coms.forEach((com) => {
-    Vue.component(com.name, com)
-  })
-}
-export const api={
-	request,
-	menu,
-	nfc,
-	iData,
-	getPageKey,
-	getDataTotal,
-	changeLanguage,
-	changeLanguageConmon
-}
-export default install // 这个方法以后再使用的时候可以被vue.use调用
+import type { App } from 'vue'
+import wLogin from './w-login/w-login.vue'
+import WMenu from './w-menu/w-menu.vue'
+import wSwitchLang from './w-switch-lang/w-switch-lang.vue'
+import WTable from './w-table/w-table.vue'
+import wTest from './w-test/w-test.vue'
+import wSelectPicker from './w-select-picker/w-select-picker.vue'
+import wDetail from './w-detail/w-detail.vue'
+import wAdd from './w-add/w-add.vue'
+import WSearch from './w-search/w-search.vue'
+import WUser from './w-user/w-user.vue'
+import wEdit from './w-edit/w-edit.vue'
+import WSelectTable from './w-select-table/w-select-table.vue'
+import WFormMessageBox from './w-form-message-box/w-form-message-box.vue'
+import WAudio from './w-audio/w-audio.vue'
+import WReportTable from './w-report-table/w-report-table.vue'
+import WFormControlVue from './w-form-control/w-form-control.vue'
+import WScanBindingSensor from './w-scan-binding-sensor/w-scan-binding-sensor.vue'
+import WUpdateVersion from './w-update-version/w-update-version.vue'
+import WTree from './w-tree/w-tree.vue'
+import WTreeAddTableVue from './w-tree-add-table/w-tree-add-table.vue'
+import WBorrowAddVue from './w-add/w-borrow-add.vue'
+import {menu} from './utils/apis/menu'
+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,
+  wSwitchLang,
+  WMenu,
+  WTable,
+  wSelectPicker,
+  wDetail,
+  wAdd,
+  WSearch,
+  WUser,
+  wEdit,
+  WSelectTable,
+  WFormMessageBox,
+  WAudio,
+  WReportTable,
+  WFormControlVue,
+  WScanBindingSensor,
+  WUpdateVersion,
+  WTree,
+  WTreeAddTableVue,
+  WBorrowAddVue
+]
+// 批量组件注册
+function install(Vue: App) {
+  coms.forEach((com) => {
+    Vue.component(com.name, com)
+  })
+}
+export const api={
+	request,
+	menu,
+	nfc,
+	iData,
+	getPageKey,
+	getDataTotal,
+	changeLanguage,
+	changeLanguageConmon
+}
+export default install // 这个方法以后再使用的时候可以被vue.use调用

package/package.json

@@ -1,20 +1,21 @@
-{
-  "name": "w-ui-v1",
-  "version": "1.1.43",
-  "description": "w-ui",
-  "author": "wgxshh",
-  "license": "ISC",
-  "main": "index.ts",
- "publishConfig": {
-     "registry": "https://registry.npmjs.org/"
-   },
-  "peerDependencies": {
-    "wot-design-uni": "^1.7.0",
-    "z-paging": "^2.8.5"
-  },
-  "dependencies": {
-    "dayjs": "^1.11.13",
-    "jsencrypt": "^3.3.2",
-    "lodash-es": "^4.17.21"
-  }
-}
+{
+  "name": "w-ui-v1",
+  "version": "1.1.45",
+  "description": "w-ui",
+  "author": "wgxshh",
+  "license": "ISC",
+  "main": "index.ts",
+ "publishConfig": {
+     "registry": "https://registry.npmjs.org/"
+   },
+  "peerDependencies": {
+    "@wot-ui/ui": "^2.0.0",
+    "z-paging": "^2.8.5",
+    "sass": "^1.101.0"
+  },
+  "dependencies": {
+    "dayjs": "^1.11.13",
+    "jsencrypt": "^3.3.2",
+    "lodash-es": "^4.17.21"
+  }
+}

package/utils/apis/language.ts

@@ -1,14 +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}`,
-  })
-}
+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/apis/login.ts

@@ -1,51 +1,51 @@
-import dayjs from 'dayjs/esm/index'
-import timezone from 'dayjs/esm/plugin/timezone'
-import utc from 'dayjs/esm/plugin/utc'
-import request from '../http.js'
-import rsaEncrypt from '../rsaEncrypt.js'
-
-// 获取公钥
-export function pubKey() {
-  return request({
-    url: `/v3/auth/ras-pubkey`,
-  })
-}
-
-// 登录
-export function login(username: string, password: string, pubkey: string, kaptchaToken: string = '', kaptchaText: string = '') {
-  dayjs.extend(utc)
-  dayjs.extend(timezone)
-  const datetime = dayjs(new Date())
-    .tz('Europe/London')
-    .format('YYYY-MM-DD HH:mm:ss')
-  const json = {
-    username,
-    password,
-    datetime,
-  }
-  const userInfo = rsaEncrypt(JSON.stringify(json), pubkey)
-  return request({
-    url: `/v3/auth/hctoken`,
-    data: {
-      userInfo,
-      kaptchaToken,
-      kaptchaText,
-    },
-  })
-}
-// 获取验证码
-export function getKaptchaToken() {
-  return request({
-    url: `/v3/auth/kaptcha`,
-    method: 'POST',
-  })
-}
-
-//获取登录用户权限配置信息
-export function getUserConfig() {
-  return request({
-    url: `/v3/current-user`,
-  })
-}
-
-
+import dayjs from 'dayjs/esm/index'
+import timezone from 'dayjs/esm/plugin/timezone'
+import utc from 'dayjs/esm/plugin/utc'
+import request from '../http.js'
+import rsaEncrypt from '../rsaEncrypt.js'
+
+// 获取公钥
+export function pubKey() {
+  return request({
+    url: `/v3/auth/ras-pubkey`,
+  })
+}
+
+// 登录
+export function login(username: string, password: string, pubkey: string, kaptchaToken: string = '', kaptchaText: string = '') {
+  dayjs.extend(utc)
+  dayjs.extend(timezone)
+  const datetime = dayjs(new Date())
+    .tz('Europe/London')
+    .format('YYYY-MM-DD HH:mm:ss')
+  const json = {
+    username,
+    password,
+    datetime,
+  }
+  const userInfo = rsaEncrypt(JSON.stringify(json), pubkey)
+  return request({
+    url: `/v3/auth/hctoken`,
+    data: {
+      userInfo,
+      kaptchaToken,
+      kaptchaText,
+    },
+  })
+}
+// 获取验证码
+export function getKaptchaToken() {
+  return request({
+    url: `/v3/auth/kaptcha`,
+    method: 'POST',
+  })
+}
+
+//获取登录用户权限配置信息
+export function getUserConfig() {
+  return request({
+    url: `/v3/current-user`,
+  })
+}
+
+

package/utils/apis/menu.ts

@@ -1,7 +1,7 @@
-import request from '../http.js'
-// 获取菜单
-export function menu() {
-  return request({
-    url: `/v3/menu/blocks?l2MenuId=&blockId=`,
-  })
-}
+import request from '../http.js'
+// 获取菜单
+export function menu() {
+  return request({
+    url: `/v3/menu/blocks?l2MenuId=&blockId=`,
+  })
+}