w-web-api 1.0.39 → 1.0.41

package/server/provideApis.mjs

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import get from 'lodash-es/get.js'
 import ltdtpick from 'wsemi/src/ltdtpick.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
 
@@ -32,13 +33,14 @@ async function provideApis(url, group, apis) {
 
     //ltdtpick
     apis = ltdtpick(apis, ks)
+    // console.log('apis', apis)
 
     //rin
     let rin = {
         group,
         apis,
     }
-    // rin = JSON.stringify(rin)
+    // console.log('rin', rin)
 
     //axios
     await axios({
@@ -48,20 +50,21 @@ async function provideApis(url, group, apis) {
         data: rin,
     })
         .then((res) => {
-            // console.log(res)
-            let r = {
-                msg: '成功傳輸API清單',
-                res,
+            // console.log('then', res)
+            let data = get(res, 'data')
+            let state = get(data, 'state')
+            let msg = get(data, 'msg', '')
+            if (state === 'success') {
+                pm.resolve(msg)
             }
-            pm.resolve(r)
+            else {
+                pm.reject(msg)
+            }
+
         })
         .catch((err) => {
-            // console.log(err)
-            let r = {
-                msg: '無法傳輸API清單',
-                res: err,
-            }
-            pm.reject(r)
+            // console.log('catch', err)
+            pm.reject(err)
         })
 
     return pm

package/src/App.vue

@@ -10,6 +10,11 @@
             <Layout v-if="ready"></Layout>
         </transition>
 
+<!--
+        <LoadingWinBar></LoadingWinBar>
+        <CheckYesNo></CheckYesNo>
+        <CheckYes></CheckYes> -->
+
     </div>
 </template>
 
@@ -17,6 +22,7 @@
 import get from 'lodash-es/get.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import isestr from 'wsemi/src/isestr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
 import isDev from 'wsemi/src/isDev.mjs'
 import wui from 'w-ui-loginout/src/WUiLoginout.mjs'
 import Layout from './components/Layout.vue'
@@ -41,16 +47,21 @@ export default {
         //setVo, 更換ui內vo, 才能使用廣播技術, 更換語系才能用廣播通知全部組件forceUpdate
         vo.$ui.setVo(vo)
 
+        //setLang
+        let lang = get(window, '___pmwperm___.language', '')
+        vo.$ui.setLang(lang, 'app init') //初始化先讀取html內語系設定進行變更
+        // console.log('lang', lang)
+
         function loginSuccess(data) {
             console.log('login success', cloneDeep(data.user))
-            vo.$ui.updateConnState('已連線')
+            vo.$ui.updateConnState('csLogin')
             vo.$ui.updateUserToken(data.token)
             vo.$ui.updateUserSelf(data.user)
         }
 
         function loginError(data) {
             console.log('login error', cloneDeep(data))
-            vo.$ui.updateConnState(data.text)
+            vo.$ui.updateConnState('csErrLogin')
             vo.$ui.updateUserToken('')
             let urlRedirect = get(window, '___pmwapi___.urlRedirect', '')
             if (!isestr(urlRedirect)) {
@@ -86,8 +97,18 @@ export default {
     computed: {
 
         ready: function() {
-            let connState = get(this, `$store.state.connState`)
-            return connState === '已連線'
+            //console.log('computed ready')
+
+            let vo = this
+
+            let connState = get(vo, `$store.state.connState`)
+            let webInfor = get(vo, `$store.state.webInfor`)
+
+            let b1 = connState === 'csLogin'
+            let b2 = iseobj(webInfor)
+            let b = b1 && b2
+
+            return b
         },
 
     },

package/src/components/Layout.vue

@@ -16,7 +16,7 @@
                 <div style="display:flex; align-items:center;">
 
                     <div style="padding-right:10px; display:flex; align-items:center;" v-if="webLogo">
-                        <img style="width:36px; height:36px;" :src="webLogo" />
+                        <img style="width:36px; _min-width:36px; height:36px;" :src="webLogo" />
                     </div>
 
                     <div>
@@ -29,13 +29,23 @@
 
             <div style="width:100%;"></div>
 
-            <div style="padding-right:10px; white-space:nowrap">
+            <div
+                style="padding-right:10px; white-space:nowrap;"
+                v-if="showLangSelect"
+            >
                 <WTextSelect
                     style="width:100px;"
-                    :items="tgLangs"
-                    v-model="tgLangSelect"
-                    @input="changeLang"
-                ></WTextSelect>
+                    :items="keysLang"
+                    :value="lang"
+                    @input="toggleLang"
+                >
+                    <template v-slot:select="props">
+                        {{getLangText(props.item)}}
+                    </template>
+                    <template v-slot:item="props">
+                        {{getLangText(props.item)}}
+                    </template>
+                </WTextSelect>
             </div>
 
         </div>
@@ -70,30 +80,37 @@ export default {
 
             drawer: false, //null,
 
-            tgLangs: [
-                {
-                    id: 'cht',
-                    text: '中文',
-                },
-                {
-                    id: 'eng',
-                    text: 'English',
-                },
+            firstSetting: true,
+
+            showLangSelect: false,
+
+            keysLang: [
+                'eng',
+                'cht',
             ],
-            tgLangSelect: {
-                id: 'cht',
-                text: '中文',
+            kpLangSelect: {
+                'eng': 'English',
+                'cht': '中文',
             },
 
         }
     },
-    beforeMount: function() {
-        // console.log('beforeMount')
+    mounted: function() {
+        // console.log('mounted')
 
         let vo = this
 
-        //setLang
-        vo.$ui.setLang(vo.tgLangSelect.id)
+        //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: {
@@ -138,11 +155,24 @@ export default {
     },
     methods: {
 
-        changeLang: function(msg) {
-            // console.log('methods changeLang', msg)
+        getLangText: function(lang) {
+            // console.log('methods getLangText', lang)
+
+            let vo = this
+
+            let t = get(vo, `kpLangSelect.${lang}`, '')
+
+            return t
+        },
+
+        toggleLang: function(lang) {
+            // console.log('methods toggleLang', lang)
+
             let vo = this
-            let lang = msg.id
-            vo.$ui.setLang(lang)
+
+            //setLang
+            vo.$ui.setLang(lang, 'toggle')
+
         },
 
     }

package/src/components/LayoutContent.vue

@@ -1,9 +1,9 @@
 <template>
     <div
         style="height:100%; width:100%;"
-        :changeApis="changeApis"
         v-domresize
         @domresize="resize"
+        :changeApis="changeApis"
     >
 
         <template v-if="syncState">
@@ -25,47 +25,55 @@
                 <template v-slot:drawer="props">
                     <div :style="`height:${props.height}px; background:#fff; position:relative;`">
 
-                        <WTree
-                            :style="`height:${props.height}px;`"
-                            :viewHeightMax="props.height"
-                            :data="apisTree"
-                            :iconHeight="lineHeightTree"
-                            :defItemHeight="lineHeightTree"
-                            :activable="true"
-                            :itemActive="apiActive"
-                            :funActive="funActive"
-                            :itemTextColorActive="'#000'"
-                            :itemBackgroundColorActive ="'rgba(100,100,100,0.15)'"
-                        >
-                            <template v-slot:item="props">
+                        <template v-if="apisTree.length>0">
+                            <WTree
+                                :style="`height:${props.height}px;`"
+                                :viewHeightMax="props.height"
+                                :data="apisTree"
+                                :iconHeight="lineHeightTree"
+                                :defItemHeight="lineHeightTree"
+                                :activable="true"
+                                :itemActive="apiActive"
+                                :funActive="funActive"
+                                :itemTextColorActive="'#000'"
+                                :itemBackgroundColorActive ="'rgba(100,100,100,0.15)'"
+                            >
+                                <template v-slot:item="props">
 
-                                <div
-                                    :style="`display:flex; align-items:center; min-height:${lineHeightTree}px;`"
-                                    v-if="props.data.type!=='node'"
-                                >
-                                    {{props.data.key}}
-                                </div>
+                                    <div
+                                        :style="`display:flex; align-items:center; min-height:${lineHeightTree}px;`"
+                                        v-if="props.data.type!=='node'"
+                                    >
+                                        {{props.data.key}}
+                                    </div>
 
-                                <div
-                                    :style="`display:flex; align-items:center; min-height:${lineHeightTree}px; cursor:pointer;`"
-                                    @click="ckItem(getItemByKey(props.data.text))"
-                                    v-else
-                                >
+                                    <div
+                                        :style="`display:flex; align-items:center; min-height:${lineHeightTree}px; cursor:pointer;`"
+                                        @click="ckItem(getItemByKey(props.data.text))"
+                                        v-else
+                                    >
 
-                                    <div style="padding-right:5px;">
-                                        <div :style="`padding:0px 6px; font-size:0.7rem; border-radius:10px; border:1px solid #ddd; color:#fff; background:${getMethodColorByKey(props.data.text)};`">
-                                            {{getMethodByKey(props.data.text)}}
+                                        <div style="padding-right:5px;">
+                                            <div :style="`padding:0px 6px; font-size:0.7rem; border-radius:10px; border:1px solid #ddd; color:#fff; background:${getMethodColorByKey(props.data.text)};`">
+                                                {{getMethodByKey(props.data.text)}}
+                                            </div>
                                         </div>
-                                    </div>
 
-                                    <div>
-                                        {{$ui.gv(getItemByKey(props.data.text),'name')}}
-                                    </div>
+                                        <div>
+                                            {{$ui.gv(getItemByKey(props.data.text),'name')}}
+                                        </div>
 
-                                </div>
+                                    </div>
 
-                            </template>
-                        </WTree>
+                                </template>
+                            </WTree>
+                        </template>
+                        <div
+                            style="padding:20px; font-size:0.9rem;"
+                            v-else
+                        >
+                            {{$t('waitingData')}}
+                        </div>
 
                         <div
                             :style="`position:absolute; top:1px; right:12px;`"
@@ -405,6 +413,7 @@
 import get from 'lodash-es/get.js'
 import set from 'lodash-es/set.js'
 import each from 'lodash-es/each.js'
+import size from 'lodash-es/size.js'
 import trim from 'lodash-es/trim.js'
 import find from 'lodash-es/find.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
@@ -522,9 +531,16 @@ export default {
             let vo = this
 
             //default
+            vo.apiActive = null
+            vo.apiSelect = null
             vo.apisTree = []
             vo.kpApisTree = {}
 
+            //check
+            if (size(vo.apis) === 0) {
+                return
+            }
+
             //cloneDeep
             let apis = cloneDeep(vo.apis)
             // console.log('apis', cloneDeep(apis))
@@ -554,8 +570,6 @@ export default {
             let tree = convertToTree(tr, { bindRoot: '全部' })
             // console.log('tree', cloneDeep(tree))
 
-            //filepathToTree
-
             //apiSelect, 預先選定api項目, 非tree選單active物件, 因id由convertToTree轉換提供, 故不能直接算得active選單物件id
             let apiSelect = get(apis, 0, null)
             // console.log('apiSelect', cloneDeep(apiSelect))

package/src/components/LayoutState.vue

@@ -3,37 +3,49 @@
         :style="`position:absolute; top:0px; left:0px; width:100%; height:100%; transition:all 0.5s linear; display:flex; align-items:center; justify-content:center;`"
     >
 
-        <template v-if="connState==='已連線' || connState==='連線中...'">
+        <template v-if="connState==='csIng'">
 
             <img style="width:100px; height:100px;" :src="img_connection">
 
             <div style="margin-left:10px;">
                 <div style="color:#aaa;">
-                    {{connState}}
+                    {{$t('csIng')}}
                 </div>
             </div>
 
         </template>
 
-        <template v-else-if="connState==='已登出'">
+        <template v-else-if="connState==='csLogin'">
+
+            <img style="width:100px; height:100px;" :src="img_connection">
+
+            <div style="margin-left:10px;">
+                <div style="color:#aaa;">
+                    {{$t('csLogin')}}
+                </div>
+            </div>
+
+        </template>
+
+        <template v-else-if="connState==='csLogout'">
 
             <img style="width:75px; height:75px;" :src="img_logout">
 
             <div style="margin-left:10px;">
                 <div style="color:#aaa;">
-                    {{connState}}
+                    {{$t('csLogout')}}
                 </div>
             </div>
 
         </template>
 
-        <template v-else-if="connState==='無法連線'">
+        <template v-else-if="connState==='csErrConn'">
 
             <img style="width:75px; height:75px;" :src="img_dissconnection">
 
             <div style="margin-left:10px;">
                 <div style="color:#aaa;">
-                    {{connState}}
+                    {{$t('csErrConn')}}
                 </div>
             </div>
 
@@ -45,7 +57,7 @@
 
             <div style="margin-left:10px;">
                 <div style="color:#aaa;">
-                    {{connState}}
+                    {{$t('csErrLogin')}}
                 </div>
             </div>
 
@@ -55,7 +67,7 @@
 </template>
 
 <script>
-import get from 'lodash-es/get.js'
+import get from 'lodash-es/get.js'
 
 
 export default {

package/src/main.js

@@ -13,7 +13,6 @@ import App from './App.vue'
 import store from './store/index.mjs'
 import ui from './plugins/mUI.mjs'
 import mDataSelectorSchema from './plugins/mDataSelectorSchema.mjs'
-import mDataSupport from './plugins/mDataSupport.mjs'
 import * as s from './plugins/mShare.mjs'
 import ds from './schema/index.mjs'
 // console.log('globalState', globalState)
@@ -35,16 +34,12 @@ Vue.prototype.$alert = function() {
 //dssm
 let dssm = mDataSelectorSchema(ds)
 
-//dspt
-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
-// Vue.prototype.$ds = ds
+Vue.prototype.$ds = ds
 Vue.prototype.$dg = {}
 
 //directive
@@ -53,43 +48,45 @@ Vue.directive('dommutation', domMutation())
 Vue.directive('domdragdrop', domDragDrop())
 
 //WServHapiClient
-let bFirstSync = false
+// let bFirstSync = false //不需要bFirstSync, 由getWebInfor結束代表第1次完成同步
 WServHapiClient({
     showLog: false,
     url: window.location.origin + window.location.pathname,
     useWaitToken: true,
     apiName: 'api',
+    tokenType: 'Bearer',
     getToken: () => {
         let token = get(Vue.prototype, `$store.state.userToken`, '')
         // console.log('getToken', token)
         return token
     },
     getServerMethods: (_fapi) => {
-        console.log('$fapi', _fapi)
+        // console.log('$fapi', _fapi)
+
+        //save $fapi
         Vue.prototype.$fapi = _fapi
+
+        //getWebInfor
         _fapi.getWebInfor() //已有fapi時優先取得web資訊
             .then((wi) => {
-                console.log('$fapi getWebInfor', wi)
+                // console.log('$fapi getWebInfor', wi)
+
                 Vue.prototype.$store.commit(Vue.prototype.$store.types.UpdateWebInfor, wi)
-                ui.setLang() //因更新webInfor得要重刷語系才能依照語言取得顯示文字
+                ui.setLang(null, 'get webInfor') //因更新webInfor可取得webName與webDescription, 得要重刷語系才能依照語言取得顯示文字
+
+                //commit syncState
+                Vue.prototype.$store.commit(Vue.prototype.$store.types.UpdateSyncState, true)
+
             })
             .catch((err) => {
                 console.log(err)
             })
+
     },
     recvData: (r) => {
-        console.log('sync data', r.tableName, r.data)
+        // console.log('sync data', r.tableName, r.data)
         Vue.prototype.$store.commit(Vue.prototype.$store.types.UpdateTableData, r)
     },
-    getAfterUpdateTableTags: (r) => {
-        // console.log('getAfterUpdateTableTags', r, 'needToRefresh', JSON.stringify(r.oldTableTags) !== JSON.stringify(r.newTableTags))
-        if (bFirstSync) {
-            return
-        }
-        bFirstSync = true
-        console.log('first-sync')
-        Vue.prototype.$store.commit(Vue.prototype.$store.types.UpdateSyncState, true)
-    },
 })
 
 //new