w-web-api 1.0.11 → 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 Fri Apr 15 2022 15:15:12 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'
@@ -197,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
     }
 
@@ -233,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
     }
@@ -377,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 Fri Apr 15 2022 15:15:12 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 Fri Apr 15 2022 15:15:12 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.11",
+  "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'
@@ -153,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
     }
 
@@ -189,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/components/LayoutContentList.vue

@@ -6,10 +6,14 @@
 
         <div style="display:flex; height:100%;" v-if="hasApis">
 
-            <div style="min-width:400px; height:100%; _font-size:10pt; color:#444; background:#fff; overflow-y:auto;">
+            <div
+                style="min-width:400px; height:100%; color:#444; background:#fff;"
+                v-domresize
+                @domresize="resizeTree"
+            >
 
                 <WTree
-                    :viewHeightMax="null"
+                    :viewHeightMax="heightTree"
                     :data="apisTree"
                     :iconHeight="lineHeightTree"
                     :defItemHeight="lineHeightTree"
@@ -356,6 +360,7 @@ export default {
     data: function() {
         return {
 
+            heightTree: 2,
             lineHeightTree: 38,
 
             apisTree: [],
@@ -417,6 +422,20 @@ export default {
     },
     methods: {
 
+        resizeTree: function(msg) {
+            // console.log('methods resizeTree', msg)
+
+            let vo = this
+
+            //h
+            let h = get(msg, 'snew.clientHeight')
+            // console.log(h)
+
+            //update
+            vo.heightTree = h
+
+        },
+
         genTree: function () {
             let vo = this
 
@@ -514,6 +533,7 @@ export default {
         getOutputJsonObj: function(item) {
             // let vo = this
             let j = this.getOutputJson(item)
+            // console.log(j)
             let o = j2o(j)
             return o
         },