w-web-api 1.0.7 → 1.0.10

package/docs/WWebApi.html

@@ -604,7 +604,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 16:47:26 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 3.6.10</a> on Fri Apr 15 2022 15:12:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebApi.mjs.html

@@ -153,6 +153,14 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     let webName = get(opt, 'webName', {})
 
 
+    //webDescription
+    let webDescription = get(opt, 'webDescription', {})
+
+
+    //webLogo
+    let webLogo = get(opt, 'webLogo', {})
+
+
     //WServOrm
     let optWServOrm = {
         bCheckUser,
@@ -173,6 +181,8 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     let getWebInfor = (userId) => {
         return {
             webName,
+            webDescription,
+            webLogo,
         }
     }
 
@@ -367,7 +377,7 @@ export default WWebApi
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 16:47:26 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 3.6.10</a> on Fri Apr 15 2022 15:12:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -68,7 +68,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 16:47:26 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 3.6.10</a> on Fri Apr 15 2022 15:12:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.mDb.mjs

@@ -1,75 +1,9 @@
-// import path from 'path'
-import fs from 'fs'
-// import _ from 'lodash'
-import w from 'wsemi'
-import br from 'w-serv-orm/src/getDbBackupAndRecover.mjs'
 import { woItems } from './g.mOrm.mjs'
-// import { genModels } from './g.mOrmGenModels.mjs'
+import getDb from 'w-serv-orm/src/getDb.mjs'
 
 
-//mOrmGenModels.mjs
-let genModels = `
-import path from 'path'
-import _ from 'lodash'
-// import w from 'wsemi'
-import genModelsByTabs from 'w-orm-reladb/src/genModelsByTabs.mjs'
-import ds from '../src/schema/index.mjs'
-
-
-let fdSrv = path.resolve()
-
-
-function genModels() {
-
-    //names
-    let names = _.keys(ds)
-
-    //tabs
-    let tabs = {}
-    _.each(names, (name) => {
-        tabs[name] = ds[name].settings
-    })
-    console.log('tabs', tabs)
-
-    //fd
-    let fd = fdSrv + '/models' 
-
-    //genModelsByTabs
-    genModelsByTabs(fd, tabs)
-
-}
-
-
-export { genModels }
-`
-
-function backup() {
-    br.backup(woItems)
-        .then((res) => {
-            let j = w.o2j(res)
-            fs.writeFileSync(`./backup-${w.now2strp()}.json`, j, 'utf8')
-            console.log('backup finish')
-        })
-        .catch((err) => {
-            console.log(err)
-        })
-}
-backup()
-
-
-function recover() {
-    let fp = '../_db/backup-20220222134749.json'
-    let genModels = null
-    let needCreateStorage = false
-    br.recover(fp, woItems, genModels, needCreateStorage)
-        .then(() => {
-            console.log('recover finish')
-        })
-        .catch((err) => {
-            console.log(err)
-        })
-}
-// recover()
+getDb.backup(woItems)
+// getDb.recover(woItems, './ooo.json')
 
 
 //備份資料重與由備份資料重建資料庫

package/g.mInitialTestData.mjs

@@ -1,32 +1,12 @@
-// import path from 'path'
-// import fs from 'fs'
-// import _ from 'lodash'
-import w from 'wsemi'
 import ds from './src/schema/index.mjs'
 import { woItems } from './g.mOrm.mjs'
+import genTestData from 'w-serv-orm/src/genTestData.mjs'
 
 
 async function initialTestData() {
 
-    //delFiles
-    // delFiles('./histData')
-    // delFiles('./uploadFiles')
-
-    //funTest
-    await w.pmSeries(ds, async (v, k) => {
-
-        //funTestAndSave
-        let rs = await v.funTestAndSave(woItems)
-        console.log(`${k}.funTestAndSave`, rs)
-
-        // //funTest
-        // let rs = await v.funTest(woItems)
-
-        // //save
-        // await woItems[k].save(rs)
-        // console.log(`${k}.funTest and save`, rs)
-
-    })
+    //genTestData
+    await genTestData(ds, woItems)
 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-api",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "main": "dist/w-web-api.umd.js",
   "dependencies": {
     "@mdi/js": "^6.6.96",
@@ -10,7 +10,7 @@
     "w-component-vue": "^2.2.6",
     "w-data-collector": "^1.0.13",
     "w-serv-hapi": "^1.0.6",
-    "w-serv-orm": "^1.0.1",
+    "w-serv-orm": "^1.0.2",
     "wsemi": "^1.6.55"
   },
   "devDependencies": {

package/server/WWebApi.mjs

@@ -109,6 +109,14 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     let webName = get(opt, 'webName', {})
 
 
+    //webDescription
+    let webDescription = get(opt, 'webDescription', {})
+
+
+    //webLogo
+    let webLogo = get(opt, 'webLogo', {})
+
+
     //WServOrm
     let optWServOrm = {
         bCheckUser,
@@ -129,6 +137,8 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     let getWebInfor = (userId) => {
         return {
             webName,
+            webDescription,
+            webLogo,
         }
     }
 

package/server/provideApis.mjs

@@ -57,7 +57,7 @@ async function provideApis(url, levels, apis) {
         .catch((err) => {
             // console.log(err)
             rout = {
-                state: 'success',
+                state: 'error',
                 msg: '無法傳輸API清單',
                 res: err,
             }

package/src/App.vue

@@ -28,6 +28,15 @@ export default {
 
         }
     },
+    mounted: function() {
+        // console.log('mounted')
+
+        let vo = this
+
+        //setVo, 更換ui內vo, 才能使用廣播技術, 更換語系才能用廣播通知全部組件forceUpdate
+        vo.$ui.setVo(vo)
+
+    },
     methods: {
 
         resize: function(msg) {

package/src/components/Layout.vue

@@ -11,24 +11,20 @@
                 v-if="false"
             ></WButtonCircle>
 
-            <WButtonCircle
-                :icon="'mdi-menu'"
-                :tooltip="'cht'"
-                :shadow="false"
-                @click="$store.commit($store.types.UpdateLang, 'cht')"
-                v-if="false"
-            ></WButtonCircle>
+            <div style="padding-left:5px; white-space:nowrap">
+                <div style="display:flex; align-items:center;">
 
-            <WButtonCircle
-                :icon="'mdi-menu'"
-                :tooltip="'eng'"
-                :shadow="false"
-                @click="$store.commit($store.types.UpdateLang, 'eng')"
-                v-if="false"
-            ></WButtonCircle>
+                    <div style="padding-right:10px; display:flex; align-items:center;" v-if="webLogo">
+                        <img style="width:36px; height:36px;" :src="webLogo" />
+                    </div>
+
+                    <div>
+                        <div style="font-size:1.2rem; color:#000;">{{webName}}</div>
+                        <div style="font-size:0.8rem; color:#666;">{{$t('webDescription')}}</div>
+                    </div>
+
+                </div>
 
-            <div style="padding-left:10px; font-size:1.2rem; color:#000; white-space:nowrap">
-                <div>{{webName}}</div>
             </div>
 
             <div style="width:100%;"></div>
@@ -54,6 +50,7 @@
 <script>
 import get from 'lodash/get'
 // import cloneDeep from 'lodash/cloneDeep'
+import isestr from 'wsemi/src/isestr.mjs'
 import WButtonCircle from 'w-component-vue/src/components/WButtonCircle.vue'
 import WTextSelect from 'w-component-vue/src/components/WTextSelect.vue'
 import LayoutContent from './LayoutContent.vue'
@@ -89,28 +86,44 @@ export default {
 
         }
     },
-    computed: {
+    beforeMount: function() {
+        // console.log('beforeMount')
 
-        heightToolbar: function() {
-            return get(this, `$store.state.heightToolbar`)
-        },
+        let vo = this
 
-        kpTexts: function() {
-            return this.$ui.getKpLang()
+        //setLang
+        vo.$ui.setLang(vo.tgLangSelect.id)
+
+    },
+    computed: {
+
+        viewState: function() {
+            return get(this, `$store.state.viewState`)
         },
 
-        webName: function() {
-            let name = get(this, 'kpTexts.webName', this.kpTexts.waitingData)
-            document.title = name //更換網頁title
-            return name
+        heightToolbar: function() {
+            return get(this, `$store.state.heightToolbar`)
         },
 
-        lang: function() {
-            return get(this, `$store.state.lang`)
+        webName: {
+            get() {
+                let vo = this
+                let c = vo.$t('webName')
+                // console.log('get webName1', c)
+                if (!isestr(c)) {
+                    c = vo.$t('waitingData')
+                }
+                // console.log('get webName2', c)
+                document.title = c //更換網頁title
+                return c
+            },
+            // set(value) {
+            //     return value
+            // },
         },
 
-        viewState: function() {
-            return get(this, `$store.state.viewState`)
+        webLogo: function() {
+            return get(this, `$store.state.webInfor.webLogo`)
         },
 
     },
@@ -120,7 +133,7 @@ export default {
             // console.log('methods changeLang', msg)
             let vo = this
             let lang = msg.id
-            vo.$store.commit(vo.$store.types.UpdateLang, lang)
+            vo.$ui.setLang(lang)
         },
 
     }

package/src/components/LayoutContent.vue

@@ -11,7 +11,7 @@
             style="padding:20px; font-size:0.9rem;"
             v-else
         >
-            {{kpTexts.waitingData}}
+            {{$t('waitingData')}}
         </div>
 
     </div>
@@ -49,10 +49,6 @@ export default {
     },
     computed: {
 
-        kpTexts: function() {
-            return this.$ui.getKpLang()
-        },
-
         syncState: function() {
             return get(this, '$store.state.syncState')
         },

package/src/components/LayoutContentList.vue

@@ -41,7 +41,7 @@
                             </div>
 
                             <div>
-                                {{$s.gv(getItemByKey(props.data.text),'name')}}
+                                {{$ui.gv(getItemByKey(props.data.text),'name')}}
                             </div>
 
                         </div>
@@ -67,7 +67,7 @@
                             </div>
 
                             <div style="font-size:0.8rem;">
-                                {{$s.gv(apiSelect,'url')}}
+                                {{$ui.gv(apiSelect,'url')}}
                             </div>
 
                         </div>
@@ -77,11 +77,11 @@
                     <div style="padding:10px;">
 
                         <div style="color:#485ed5;">
-                            {{$s.gv(apiSelect,'name')}}
+                            {{$ui.gv(apiSelect,'name')}}
                         </div>
 
                         <div class="bk-title" style="">
-                            {{$s.gv(apiSelect,'description')}}
+                            {{$ui.gv(apiSelect,'description')}}
                         </div>
 
                     </div>
@@ -91,11 +91,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.tokens}}
+                                {{$t('tokens')}} |
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'tokens')}}
+                                {{$ui.gv(apiSelect,'tokens')}}
                             </div>
 
                         </div>
@@ -103,11 +103,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.version}}
+                                {{$t('version')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'version')}}
+                                {{$ui.gv(apiSelect,'version')}}
                             </div>
 
                         </div>
@@ -115,11 +115,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.levels}}
+                                {{$t('levels')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'')}}
+                                {{$ui.gv(apiSelect,'')}}
                             </div>
 
                         </div>
@@ -127,11 +127,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.keywords}}
+                                {{$t('keywords')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'')}}
+                                {{$ui.gv(apiSelect,'')}}
                             </div>
 
                         </div>
@@ -139,11 +139,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.state}}
+                                {{$t('state')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'')}}
+                                {{$ui.gv(apiSelect,'')}}
                             </div>
 
                         </div>
@@ -151,11 +151,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.timeCreate}}
+                                {{$t('timeCreate')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{getDay($s.gv(apiSelect,'timeCreate'))}}
+                                {{$ui.gv(apiSelect,'timeCreate',getDay)}}
                             </div>
 
                         </div>
@@ -163,11 +163,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.timeUpdate}}
+                                {{$t('timeUpdate')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{getDay($s.gv(apiSelect,'timeUpdate'))}}
+                                {{$ui.gv(apiSelect,'timeUpdate',getDay)}}
                             </div>
 
                         </div>
@@ -175,11 +175,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.creator}}
+                                {{$t('creator')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'creator')}}
+                                {{$ui.gv(apiSelect,'creator')}}
                             </div>
 
                         </div>
@@ -187,11 +187,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.dataSource}}
+                                {{$t('dataSource')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'dataSource')}}
+                                {{$ui.gv(apiSelect,'dataSource')}}
                             </div>
 
                         </div>
@@ -199,11 +199,11 @@
                         <div class="bk" style="">
 
                             <div class="bk-title" style="">
-                                {{kpTexts.isActive}}
+                                {{$t('isActive')}}
                             </div>
 
                             <div class="bk-item" style="">
-                                {{$s.gv(apiSelect,'isActive')}}
+                                {{$ui.gv(apiSelect,'isActive')}}
                             </div>
 
                         </div>
@@ -213,12 +213,12 @@
                     <div style="padding:10px;">
 
                         <div class="bk-title" style="">
-                            {{kpTexts.mdInputParams}}
+                            {{$t('mdInputParams')}}
                         </div>
 
                         <div class="bk-item" style="padding:10px;">
                             <MdPanel
-                                :md="$s.gv(apiSelect,'mdInputParams')"
+                                :md="$ui.gv(apiSelect,'mdInputParams')"
                             ></MdPanel>
                         </div>
 
@@ -227,11 +227,11 @@
                     <div style="padding:10px;">
 
                         <div class="bk-title" style="">
-                            {{kpTexts.inputExample}}
+                            {{$t('inputExample')}}
                         </div>
 
                         <div class="bk-item" style="padding:10px;">
-                            {{$s.gv(apiSelect,'inputExample')}}
+                            {{$ui.gv(apiSelect,'inputExample')}}
                         </div>
 
                     </div>
@@ -239,12 +239,12 @@
                     <div style="padding:10px;">
 
                         <div class="bk-title" style="">
-                            {{kpTexts.mdOutputParams}}
+                            {{$t('mdOutputParams')}}
                         </div>
 
                         <div class="bk-item" style="padding:10px;">
                             <MdPanel
-                                :md="$s.gv(apiSelect,'mdOutputParams')"
+                                :md="$ui.gv(apiSelect,'mdOutputParams')"
                             ></MdPanel>
                         </div>
 
@@ -253,7 +253,7 @@
                     <div style="padding:10px;">
 
                         <div class="bk-title" style="">
-                            {{kpTexts.outputExample}}
+                            {{$t('outputExample')}}
                         </div>
 
                         <div style="padding-top:10px;">
@@ -302,7 +302,7 @@
                 style="padding:20px; font-size:0.9rem;"
                 v-else
             >
-                {{kpTexts.noSelectApi}}
+                {{$t('noSelectApi')}}
             </div>
 
         </div>
@@ -311,7 +311,7 @@
             style="padding:20px; font-size:0.9rem;"
             v-else
         >
-            {{kpTexts.waitingData}}
+            {{$t('waitingData')}}
         </div>
 
     </div>
@@ -376,10 +376,6 @@ export default {
     },
     computed: {
 
-        kpTexts: function() {
-            return this.$ui.getKpLang()
-        },
-
         apis: function() {
             return get(this, '$store.state.apis')
         },
@@ -399,12 +395,12 @@ export default {
             let ms = [
                 {
                     id: 'tree',
-                    text: vo.kpTexts.outputMenuTree,
+                    text: vo.$t('outputMenuTree'),
                     icon: 'mdi-vanity-light',
                 },
                 {
                     id: 'raw',
-                    text: vo.kpTexts.outputMenuRaw,
+                    text: vo.$t('outputMenuRaw'),
                     icon: 'mdi-lan',
                 },
             ]

package/src/main.js

@@ -41,6 +41,7 @@ let dspt = mDataSupport(Vue.prototype)
 
 //prototype
 Vue.prototype.$ui = ui
+Vue.prototype.$t = ui.getKpText
 Vue.prototype.$s = s
 Vue.prototype.$dssm = dssm
 Vue.prototype.$dspt = dspt
@@ -67,8 +68,9 @@ WServHapiClient({
         Vue.prototype.$fapi = _fapi
         _fapi.getWebInfor() //已有fapi時優先取得web資訊
             .then((wi) => {
-                // console.log('$fapi wi', wi)
+                console.log('$fapi getWebInfor', wi)
                 Vue.prototype.$store.commit(Vue.prototype.$store.types.UpdateWebInfor, wi)
+                ui.setLang() //因更新webInfor得要重刷語系才能依照語言取得顯示文字
             })
             .catch((err) => {
                 console.log(err)