w-web-api 1.0.9 → 1.0.12

package/docs/WWebApi.html

@@ -71,7 +71,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WWebApi.mjs.html">WWebApi.mjs</a>, <a href="WWebApi.mjs.html#line64">line 64</a>
+        <a href="WWebApi.mjs.html">WWebApi.mjs</a>, <a href="WWebApi.mjs.html#line68">line 68</a>
     </li></ul></dd>
     
 
@@ -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 23:36:04 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 Sun Apr 17 2022 12:09:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebApi.mjs.html

@@ -43,16 +43,20 @@
     <section>
         <article>
             <pre class="prettyprint source linenums"><code>import get from 'lodash/get'
-import map from 'lodash/map'
+// import map from 'lodash/map'
+import each from 'lodash/each'
 import keys from 'lodash/keys'
-import cloneDeep from 'lodash/cloneDeep'
+// import cloneDeep from 'lodash/cloneDeep'
 import j2o from 'wsemi/src/j2o.mjs'
 import iseobj from 'wsemi/src/iseobj'
 import isestr from 'wsemi/src/isestr'
 import ispint from 'wsemi/src/ispint'
 import isfun from 'wsemi/src/isfun'
-import fsIsFolder from 'wsemi/src/fsIsFolder'
 import cint from 'wsemi/src/cint'
+import strleft from 'wsemi/src/strleft'
+import strdelleft from 'wsemi/src/strdelleft'
+import b642str from 'wsemi/src/b642str'
+import fsIsFolder from 'wsemi/src/fsIsFolder'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import ds from '../src/schema/index.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
@@ -153,6 +157,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 +185,8 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     let getWebInfor = (userId) => {
         return {
             webName,
+            webDescription,
+            webLogo,
         }
     }
 
@@ -187,12 +201,44 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     //parsePayload
     let parsePayload = (req) => {
         let inp = get(req, 'payload')
+
+        //to obj
         if (isestr(inp)) {
             inp = j2o(inp)
         }
-        if (!iseobj(inp)) {
+
+        //cv apis for base64
+        if (iseobj(inp)) {
+
+            //spread
+            let { levels, apis } = inp
+
+            //apis
+            each(apis, (api, kapi) => {
+                console.log(kapi, api.name)
+                each(api, (v, k) => {
+                    console.log(k, v)
+                    if (isestr(v)) {
+                        console.log('b1')
+                        if (strleft(v, 7) === 'base64:') {
+                            console.log('b2')
+                            v = strdelleft(v, 7)
+                            v = b642str(v)
+                            console.log('bbb inv base64', v)
+                            apis[kapi][k] = v
+                        }
+                    }
+                })
+            })
+
+            //resave
+            inp = { levels, apis }
+
+        }
+        else {
             inp = null
         }
+
         return inp
     }
 
@@ -223,15 +269,8 @@ async function WWebApi(WOrm, url, db, opt = {}) {
         //delAll levels
         await woItems.apis.delAll({ levels })
 
-        //rsApisTemp
-        let rsApisTemp = cloneDeep(rsApis)
-        rsApisTemp = map(rsApisTemp, (v) => {
-            v.levels = levels
-            return v
-        })
-
         //insert
-        let r = await woItems.apis.insert(rsApisTemp)
+        let r = await woItems.apis.insert(rsApis)
 
         return r
     }
@@ -367,7 +406,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 23:36:04 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 Sun Apr 17 2022 12:09:30 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 23:36:04 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 Sun Apr 17 2022 12:09:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.getSettings.mjs

@@ -7,7 +7,7 @@ function getSettings() {
     return {
         'dbUsername': 'username',
         'dbPassword': 'password',
-        'dbName': 'wapis',
+        'dbName': 'rddmanager_api', //wapis
         'dbIP': 'localhost',
         'dbPort': 27017,
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-api",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "main": "dist/w-web-api.umd.js",
   "dependencies": {
     "@mdi/js": "^6.6.96",

package/server/WWebApi.mjs

@@ -1,14 +1,18 @@
 import get from 'lodash/get'
-import map from 'lodash/map'
+// import map from 'lodash/map'
+import each from 'lodash/each'
 import keys from 'lodash/keys'
-import cloneDeep from 'lodash/cloneDeep'
+// import cloneDeep from 'lodash/cloneDeep'
 import j2o from 'wsemi/src/j2o.mjs'
 import iseobj from 'wsemi/src/iseobj'
 import isestr from 'wsemi/src/isestr'
 import ispint from 'wsemi/src/ispint'
 import isfun from 'wsemi/src/isfun'
-import fsIsFolder from 'wsemi/src/fsIsFolder'
 import cint from 'wsemi/src/cint'
+import strleft from 'wsemi/src/strleft'
+import strdelleft from 'wsemi/src/strdelleft'
+import b642str from 'wsemi/src/b642str'
+import fsIsFolder from 'wsemi/src/fsIsFolder'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import ds from '../src/schema/index.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
@@ -109,6 +113,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 +141,8 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     let getWebInfor = (userId) => {
         return {
             webName,
+            webDescription,
+            webLogo,
         }
     }
 
@@ -143,12 +157,44 @@ async function WWebApi(WOrm, url, db, opt = {}) {
     //parsePayload
     let parsePayload = (req) => {
         let inp = get(req, 'payload')
+
+        //to obj
         if (isestr(inp)) {
             inp = j2o(inp)
         }
-        if (!iseobj(inp)) {
+
+        //cv apis for base64
+        if (iseobj(inp)) {
+
+            //spread
+            let { levels, apis } = inp
+
+            //apis
+            each(apis, (api, kapi) => {
+                console.log(kapi, api.name)
+                each(api, (v, k) => {
+                    console.log(k, v)
+                    if (isestr(v)) {
+                        console.log('b1')
+                        if (strleft(v, 7) === 'base64:') {
+                            console.log('b2')
+                            v = strdelleft(v, 7)
+                            v = b642str(v)
+                            console.log('bbb inv base64', v)
+                            apis[kapi][k] = v
+                        }
+                    }
+                })
+            })
+
+            //resave
+            inp = { levels, apis }
+
+        }
+        else {
             inp = null
         }
+
         return inp
     }
 
@@ -179,15 +225,8 @@ async function WWebApi(WOrm, url, db, opt = {}) {
         //delAll levels
         await woItems.apis.delAll({ levels })
 
-        //rsApisTemp
-        let rsApisTemp = cloneDeep(rsApis)
-        rsApisTemp = map(rsApisTemp, (v) => {
-            v.levels = levels
-            return v
-        })
-
         //insert
-        let r = await woItems.apis.insert(rsApisTemp)
+        let r = await woItems.apis.insert(rsApis)
 
         return r
     }

package/server/filePathToCode.mjs

@@ -0,0 +1,9 @@
+function filePathToCode(c) {
+    if (c.indexOf('\\\\') >= 0) {
+        return '```' + c + '```'
+    }
+    return c
+}
+
+
+export default filePathToCode

package/server/provideApis.mjs

@@ -1,5 +1,4 @@
 import axios from 'axios'
-import map from 'lodash/map'
 import ltdtpick from 'wsemi/src/ltdtpick.mjs'
 
 
@@ -26,12 +25,6 @@ async function provideApis(url, levels, apis) {
     //ltdtpick
     apis = ltdtpick(apis, ks)
 
-    //update levels
-    apis = map(apis, (v) => {
-        v.levels = levels
-        return v
-    })
-
     //rin
     let rin = {
         levels,

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')
         },