w-web-sso 1.0.19 → 1.0.21

package/docs/WWebSso.html

@@ -387,7 +387,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sun Jul 13 2025 22:35:42 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Mon Jul 14 2025 15:01:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebSso.mjs.html

@@ -1177,7 +1177,7 @@ export default WWebSso
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sun Jul 13 2025 22:35:42 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Mon Jul 14 2025 15:01:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sun Jul 13 2025 22:35:42 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Mon Jul 14 2025 15:01:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-sso",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "main": "dist/w-web-sso.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
@@ -13,7 +13,7 @@
     "w-serv-orm": "^1.0.29",
     "w-syslog": "^1.0.6",
     "w-ui-loginout": "^1.0.9",
-    "wsemi": "^1.8.14"
+    "wsemi": "^1.8.15"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -29,7 +29,7 @@
     "eslint-plugin-vue": "^9.10.0",
     "vue": "^2.6.14",
     "vuex": "^3.6.2",
-    "w-orm-lmdb": "^1.0.1",
+    "w-orm-lmdb": "^1.0.2",
     "w-package-tools": "^1.1.2"
   },
   "scripts": {

package/script.txt

@@ -19,4 +19,3 @@ npm run deploy
 #npm test
 
 #npm publish
-

package/src/components/LayoutContentUserInfor.vue

@@ -859,7 +859,7 @@ export default {
 
         //         //u
         //         let u = {
-        //             id: genID(),
+        //             id: genIDSeq(),
         //             name: vo.$t('newUser'),
         //             from: '',
         //             isAdmin: 'n',

package/src/components/LayoutContentUsers.vue

@@ -284,7 +284,6 @@ export default {
                 'from',
                 'redir',
                 'isAdmin',
-                // 'isVerified',
                 'timeVerified',
                 'timeExpired',
                 'timeBlocked',
@@ -303,7 +302,6 @@ export default {
                 'from',
                 'redir',
                 'isAdmin',
-                // 'isVerified',
                 'timeVerified',
                 'timeExpired',
                 'timeBlocked',
@@ -322,7 +320,6 @@ export default {
                 'from',
                 'redir',
                 'isAdmin',
-                // 'isVerified',
                 'timeVerified',
                 'timeExpired',
                 'timeBlocked',
@@ -611,7 +608,6 @@ export default {
                 'from': vo.$t('from'),
                 'redir': vo.$t('redir'),
                 'isAdmin': vo.$t('isAdmin'),
-                // 'isVerified': vo.$t('isVerified'),
                 'timeVerified': vo.$t('userTimeVerified'),
                 'timeExpired': vo.$t('userTimeExpired'),
                 'timeBlocked': vo.$t('userTimeBlocked'),
@@ -727,17 +723,9 @@ export default {
                     },
                     defHeadMinWidth: 150,
                     kpHeadWidth: {
-                        // 'name': isnum(vo.widthUsersName) ? cdbl(vo.widthUsersName) : 200,
-                        // 'email': isnum(vo.widthUsersEmail) ? cdbl(vo.widthUsersEmail) : 300,
-                        // 'description': isnum(vo.widthUsersDescription) ? cdbl(vo.widthUsersDescription) : 300,
-                        // 'cgrups': 300,
                         'timeVerified': 250,
                         'timeExpired': 250,
                         'timeBlocked': 250,
-                        // 'isAdmin': 100,
-                        // 'isActive': 100,
-                        // 'timeCreate': 220,
-                        // 'timeUpdate': 220,
                     },
                     kpHeadFilterType: {
                         'id': 'text',
@@ -750,7 +738,6 @@ export default {
                         'from': 'text',
                         'redir': 'text',
                         'isAdmin': 'text',
-                        // 'isVerified': 'text',
                         'timeVerified': 'text',
                         'timeExpired': 'text',
                         'timeBlocked': 'text',
@@ -862,19 +849,6 @@ export default {
 
                             return t
                         },
-                        // 'isVerified': (v, k, r) => {
-                        //     // console.log('kpCellRender isAdmin', v, k, r)
-
-                        //     //id
-                        //     let id = get(r, 'id', '')
-                        //     // console.log('id', id, k, r)
-
-                        //     let t = `
-                        //         <input type="checkbox" ${v === 'y' ? 'checked' : ''} onclick="$vo.$dg.toggleItemIsVerifiedById('${id}')" ${vo.isEditable ? '' : 'disabled'} />
-                        //     `
-
-                        //     return t
-                        // },
                         'isActive': (v, k, r) => {
                             // console.log('kpCellRender isActive', v, k, r)
 
@@ -1171,16 +1145,6 @@ export default {
 
         },
 
-        // toggleItemIsVerifiedById: function(id) {
-        //     // console.log('toggleItemIsVerifiedById', id)
-
-        //     let vo = this
-
-        //     //toggleItemByKeyAndId
-        //     vo.toggleItemByKeyAndId('isVerified', id)
-
-        // },
-
         toggleItemIsActiveById: function(id) {
             // console.log('toggleItemIsActiveById', id)
 

package/src/components/PageLogin.vue

@@ -124,7 +124,11 @@
         </div>
 
         <div style="position:absolute; top:10px; right:10px;">
-            <div style="_white-space:nowrap">
+
+            <div
+                style="white-space:nowrap;"
+                v-if="showLangSelect"
+            >
                 <WTextSelect
                     style="width:100px;"
                     :items="keysLang"
@@ -139,6 +143,7 @@
                     </template>
                 </WTextSelect>
             </div>
+
         </div>
 
     </div>
@@ -195,6 +200,24 @@ export default {
 
         }
     },
+    mounted: function() {
+        // console.log('mounted')
+
+        let vo = this
+
+        //firstSetting
+        if (vo.firstSetting) {
+            // console.log('webInfor', vo.webInfor)
+            let showLanguage = get(vo, 'webInfor.showLanguage', '')
+            // console.log('showLanguage', showLanguage)
+            vo.showLangSelect = showLanguage === 'y'
+            let language = get(vo, 'webInfor.language', '')
+            // console.log('language', language)
+            vo.$ui.setLang(language, 'layout mounted')
+            vo.firstSetting = false
+        }
+
+    },
     computed: {
 
         webName: {
@@ -214,14 +237,19 @@ export default {
             // },
         },
 
+        webInfor: function() {
+            let wi = get(this, `$store.state.webInfor`)
+            return wi
+        },
+
         webLogo: function() {
             let vo = this
-            return get(vo, `$store.state.webInfor.webLogo`, '')
+            return get(vo, `webInfor.webLogo`, '')
         },
 
         webBackgoundGradientColors: function() {
             let vo = this
-            return get(vo, `$store.state.webInfor.webBackgoundGradientColors`, [])
+            return get(vo, `webInfor.webBackgoundGradientColors`, [])
         },
 
         c1: function() {

package/src/plugins/mLang.mjs

@@ -309,7 +309,7 @@ let kpLang = {
     },
     userTimeVerified: {
         eng: `Verified time`,
-        cht: `帳號驗證時間`,
+        cht: `帳號驗證狀態與時間`,
     },
     isVerifiedWaiting: {
         eng: `Waiting for verification`,
@@ -330,7 +330,7 @@ let kpLang = {
     },
     userTimeExpired: {
         eng: `Expired time`,
-        cht: `帳號過期時間`,
+        cht: `帳號過期狀態與時間`,
     },
     isExpiredDeny: {
         eng: `Account login prohibited`,
@@ -355,7 +355,7 @@ let kpLang = {
     },
     userTimeBlocked: {
         eng: `Blocked time`,
-        cht: `帳號封鎖時間`,
+        cht: `帳號封鎖狀態與時間`,
     },
     isBlockedNormalStatus: {
         eng: `Normal status`,

package/src/schema/tables/ips.mjs

@@ -1,6 +1,6 @@
 import map from 'lodash-es/map.js'
 import keys from 'lodash-es/keys.js'
-import genID from 'wsemi/src/genID.mjs'
+import genIDSeq from 'wsemi/src/genIDSeq.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
 import nowms2str from 'wsemi/src/nowms2str.mjs'
@@ -30,7 +30,7 @@ let settings = {
 
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
-    o.id = `${now2strp()}-${genID()}`
+    o.id = `${genIDSeq()}`
     return o
 }
 

package/src/schema/tables/tokens.mjs

@@ -1,6 +1,6 @@
 import map from 'lodash-es/map.js'
 import keys from 'lodash-es/keys.js'
-import genID from 'wsemi/src/genID.mjs'
+import genIDSeq from 'wsemi/src/genIDSeq.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
 import nowms2str from 'wsemi/src/nowms2str.mjs'
@@ -47,8 +47,8 @@ let settings = {
 
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
-    o.id = `${now2strp()}-${genID()}`
-    o.token = `${now2strp()}-${genID()}`
+    o.id = `${genIDSeq()}`
+    o.token = `${genIDSeq()}`
     o.timeCreate = nowms2str()
     o.timeEnd = ot().add(30, 'minute').format('YYYY-MM-DDTHH:mm:ss.SSSZ') //預設30min, 可由創建處再依照設定更新
     o.timeUpdate = o.timeCreate

package/src/schema/tables/users.mjs

@@ -1,6 +1,6 @@
 import map from 'lodash-es/map.js'
 import keys from 'lodash-es/keys.js'
-import genID from 'wsemi/src/genID.mjs'
+import genIDSeq from 'wsemi/src/genIDSeq.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
 import nowms2str from 'wsemi/src/nowms2str.mjs'
@@ -90,7 +90,7 @@ let settings = {
 
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
-    o.id = `${now2strp()}-${genID()}`
+    o.id = `${genIDSeq()}`
     o.timeCreate = nowms2str()
     // o.userId = o.userId
     o.userIdUpdate = o.userId