w-web-api 1.0.38 → 1.0.40

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

package/src/plugins/mLang.mjs

@@ -0,0 +1,250 @@
+
+
+let kpLang = {
+
+    csIng: {
+        eng: 'Connecting...',
+        cht: '連線中...',
+    },
+    csLogin: {
+        eng: 'Logged in',
+        cht: '已登入',
+    },
+    csLogout: {
+        eng: 'Logged out',
+        cht: '已登出',
+    },
+    csErrConn: {
+        eng: 'Unable to connect',
+        cht: '無法連線',
+    },
+    csErrLogin: {
+        eng: 'Login denied',
+        cht: '拒絕登入',
+    },
+
+    aggridLanguage: {
+        eng: 'en',
+        cht: 'zh-tw',
+    },
+
+    systemMessage: {
+        eng: 'System message',
+        cht: '系統確認訊息',
+    },
+    ok: {
+        eng: 'OK',
+        cht: '確認',
+    },
+    no: {
+        eng: 'No',
+        cht: '取消',
+    },
+    yes: {
+        eng: 'Yes',
+        cht: '確定',
+    },
+
+    empty: {
+        eng: 'Empty',
+        cht: '無',
+    },
+    waitingData: {
+        eng: 'Waiting data...',
+        cht: '等待數據中...',
+    },
+
+    isEditabled: {
+        eng: 'Editable',
+        cht: '是否編輯',
+    },
+    saveChanges: {
+        eng: `Save changes`,
+        cht: `儲存變更`,
+    },
+    id: {
+        eng: `Id`,
+        cht: `主鍵`,
+    },
+    from: {
+        eng: `From`,
+        cht: `來源`,
+    },
+    save: {
+        eng: `Save`,
+        cht: `儲存`,
+    },
+    close: {
+        eng: `Close`,
+        cht: `關閉`,
+    },
+    delete: {
+        eng: `Delete`,
+        cht: `刪除`,
+    },
+    cancel: {
+        eng: `Cancel`,
+        cht: `取消`,
+    },
+    screenFull: {
+        eng: `Max size`,
+        cht: `最大化尺寸`,
+    },
+    screenNormal: {
+        eng: `Normal size`,
+        cht: `預設尺寸`,
+    },
+    checkAllYes: {
+        eng: `Check all`,
+        cht: `全選使用`,
+    },
+    checkAllNo: {
+        eng: `Uncheck all`,
+        cht: `全不選使用`,
+    },
+    checkAllInv: {
+        eng: `Reverse all`,
+        cht: `全反選使用`,
+    },
+    operMode: {
+        eng: `Enable`,
+        cht: `是否使用`,
+    },
+    operPemiEnable: {
+        eng: `Operator`,
+        cht: `合併權限模式`,
+    },
+    operGrupEnable: {
+        eng: `Operator`,
+        cht: `合併權限群組模式`,
+    },
+
+    processing: {
+        eng: `Processing...`,
+        cht: `處理中請稍後...`,
+    },
+    anUnexpectedErrorOccurred: {
+        eng: `An unexpected error occurred, please contact the administrator`,
+        cht: `發生非預期錯誤，請洽管理員`,
+    },
+    unknow: {
+        eng: `Unknow`,
+        cht: `未知`,
+    },
+
+    username: {
+        eng: `Username`,
+        cht: `使用者姓名`,
+    },
+    email: {
+        eng: `Email`,
+        cht: `電子郵件`,
+    },
+    name: {
+        eng: `Name`,
+        cht: `名稱`,
+    },
+    description: {
+        eng: `Description`,
+        cht: `說明`,
+    },
+    // noDescription: {
+    //     eng: `No description`,
+    //     cht: `無說明`,
+    // },
+    modeEdit: {
+        eng: `Edit mode`,
+        cht: `編輯模式`,
+    },
+    showTabCols: {
+        eng: `Show columns`,
+        cht: `顯示欄位`,
+    },
+
+    menuTreeShow: {
+        eng: 'Show API list',
+        cht: '顯示API清單',
+    },
+    menuTreeHide: {
+        eng: 'Hide API list',
+        cht: '隱藏API清單',
+    },
+
+    noSelectApi: {
+        eng: 'No Select',
+        cht: '尚未選擇API',
+    },
+    tokens: {
+        eng: 'Tokens',
+        cht: '授權金鑰',
+    },
+    apiUrl: {
+        eng: 'API url',
+        cht: 'API網址',
+    },
+    version: {
+        eng: 'Version',
+        cht: '版本',
+    },
+    levels: {
+        eng: 'Levels',
+        cht: '所屬階層',
+    },
+    keywords: {
+        eng: 'Keywords',
+        cht: '關鍵字',
+    },
+    state: {
+        eng: 'State',
+        cht: '狀態',
+    },
+    timeCreate: {
+        eng: 'Create time',
+        cht: '創建時間',
+    },
+    timeUpdate: {
+        eng: 'Update time',
+        cht: '更新時間',
+    },
+    creator: {
+        eng: 'Creator',
+        cht: 'API創建者',
+    },
+    dataSource: {
+        eng: 'Source',
+        cht: '資料提供者',
+    },
+    isActive: {
+        eng: 'Active',
+        cht: '有效',
+    },
+    mdInputParams: {
+        eng: 'Input',
+        cht: '輸入參數資訊或結構',
+    },
+    inputExample: {
+        eng: 'Input example',
+        cht: '輸入範例',
+    },
+    mdOutputParams: {
+        eng: 'Output',
+        cht: '回傳數據結構',
+    },
+    outputExample: {
+        eng: 'Output example',
+        cht: '回傳數據範例',
+    },
+
+    outputMenuTree: {
+        eng: 'Tree',
+        cht: '樹狀組件',
+    },
+    outputMenuRaw: {
+        eng: 'Raw',
+        cht: '原始數據',
+    },
+
+}
+
+
+export default kpLang

package/src/plugins/mUI.mjs

@@ -1,22 +1,22 @@
 import Vue from 'vue'
-import min from 'lodash-es/min.js'
-import size from 'lodash-es/size.js'
-import take from 'lodash-es/take.js'
-import isEqual from 'lodash-es/isEqual.js'
-import uniq from 'lodash-es/uniq.js'
-import set from 'lodash-es/set.js'
-import get from 'lodash-es/get.js'
-import each from 'lodash-es/each.js'
-import map from 'lodash-es/map.js'
-import filter from 'lodash-es/filter.js'
-import last from 'lodash-es/last.js'
-import split from 'lodash-es/split.js'
-import join from 'lodash-es/join.js'
-import drop from 'lodash-es/drop.js'
-import dropRight from 'lodash-es/dropRight.js'
-import groupBy from 'lodash-es/groupBy.js'
-import sortBy from 'lodash-es/sortBy.js'
-import cloneDeep from 'lodash-es/cloneDeep.js'
+import min from 'lodash-es/min.js'
+import size from 'lodash-es/size.js'
+import take from 'lodash-es/take.js'
+import isEqual from 'lodash-es/isEqual.js'
+import uniq from 'lodash-es/uniq.js'
+import set from 'lodash-es/set.js'
+import get from 'lodash-es/get.js'
+import each from 'lodash-es/each.js'
+import map from 'lodash-es/map.js'
+import filter from 'lodash-es/filter.js'
+import last from 'lodash-es/last.js'
+import split from 'lodash-es/split.js'
+import join from 'lodash-es/join.js'
+import drop from 'lodash-es/drop.js'
+import dropRight from 'lodash-es/dropRight.js'
+import groupBy from 'lodash-es/groupBy.js'
+import sortBy from 'lodash-es/sortBy.js'
+import cloneDeep from 'lodash-es/cloneDeep.js'
 import cint from 'wsemi/src/cint.mjs'
 import delay from 'wsemi/src/delay.mjs'
 import isarr from 'wsemi/src/isarr.mjs'
@@ -42,6 +42,7 @@ import replace from 'wsemi/src/replace.mjs'
 import timemsTZ2past from 'wsemi/src/timemsTZ2past.mjs'
 import convertToTree from 'wsemi/src/convertToTree.mjs'
 // import WUiDwload from 'w-ui-dwload/src/WUiDwload.mjs'
+import kpLang from './mLang.mjs'
 
 
 let vo = Vue.prototype
@@ -62,9 +63,9 @@ function updateLoading(loading) {
 }
 
 
-function updateViewState(viewState) {
-    vo.$store.commit(vo.$store.types.UpdateViewState, viewState)
-}
+// function updateViewState(viewState) {
+//     vo.$store.commit(vo.$store.types.UpdateViewState, viewState)
+// }
 
 
 function updateUserToken(userToken) {
@@ -78,7 +79,7 @@ function updateUserSelf(userSelf) {
 
 
 function forceUpdate() {
-    // console.log('call forceUpdate')
+    // console.log('forceUpdate')
 
     function broadcast(chs) {
         each(chs, (v) => {
@@ -96,16 +97,67 @@ function forceUpdate() {
 }
 
 
-function setLang(lang = null) {
-    // console.log('call setLang')
+function validLang(lang) {
+    if (lang !== 'eng' && lang !== 'cht') {
+        // console.log(`invalid lang[${lang}]`)
+        lang = 'eng'
+    }
+    return lang
+}
+
+
+function getLang() {
+    let lang = ''
+
+    //from window
+    if (!isestr(lang)) {
+        let _lang = get(window, '___pmwperm___.language', '')
+        // console.log('_lang(from window)', _lang)
+        if (isestr(_lang)) {
+            lang = validLang(_lang) //有可能取到未取代前模板符號
+        }
+    }
+
+    //from store
+    if (!isestr(lang)) {
+        let _lang = get(vo, '$store.state.lang', '')
+        // console.log('_lang(from store)', _lang)
+        if (isestr(_lang)) {
+            lang = validLang(_lang) //有可能給予非預期lang
+        }
+    }
 
-    //check lang, 若有輸入才commit
-    if (isestr(lang)) {
-        vo.$store.commit(vo.$store.types.UpdateLang, lang)
+    //return
+    if (!isestr(lang)) {
+        return 'eng'
     }
+    return lang
+}
+
 
-    //getKpLang, 切換lang得調用getKpLang重算kpText
-    getKpLang()
+function setLang(lang = null, from = '') {
+    // console.log('setLang', lang, from)
+
+    //check
+    if (!isestr(lang)) {
+        lang = getLang()
+    }
+    else {
+        lang = validLang(lang)
+    }
+    // console.log('get lang', lang)
+
+    //check, 若有變更才commit
+    if (true) {
+        let _lang = get(vo, '$store.state.lang')
+        if (lang !== _lang) {
+            vo.$store.commit(vo.$store.types.UpdateLang, lang)
+            // console.log('commit lang', lang)
+        }
+    }
+
+    //genKpText, 切換lang得調用getKpLang重算kpText
+    genKpText(lang)
 
     //forceUpdate
     forceUpdate()
@@ -113,43 +165,81 @@ function setLang(lang = null) {
 }
 
 
-function getKpLang() {
-    // console.log('call getKpLang')
+function genKpText(lang) {
+    // console.log('genKpText', lang)
 
-    //merge keyLangs
-    let keyLangs = get(vo, '$store.state.keyLangs')
-    let webName = get(vo, '$store.state.webInfor.webName')
-    let webDescription = get(vo, '$store.state.webInfor.webDescription')
-    let kls = {
-        ...keyLangs,
-        webName: {
-            ...webName,
-        },
-        webDescription: {
-            ...webDescription,
-        },
+    //kp
+    let kp = {}
+
+    //kpLang
+    kp = {
+        ...kp,
+        ...kpLang,
     }
 
-    //lang
-    let lang = get(vo, '$store.state.lang')
+    //kpLangExt
+    let kpLangExt = get(vo, '$store.state.webInfor.kpLangExt', {})
+    // console.log('kpLangExt', kpLangExt)
+    if (iseobj(kpLangExt)) {
+        kp = {
+            ...kp,
+            ...kpLangExt,
+        }
+    }
+
+    //webName
+    let webName = get(vo, '$store.state.webInfor.webName', {})
+    // console.log('webName', webName)
+    if (iseobj(webName)) {
+        kp = {
+            ...kp,
+            webName: {
+                ...webName,
+            },
+        }
+    }
+
+    //webDescription
+    let webDescription = get(vo, '$store.state.webInfor.webDescription', {})
+    // console.log('webDescription', webDescription)
+    if (iseobj(webDescription)) {
+        kp = {
+            ...kp,
+            webDescription: {
+                ...webDescription,
+            },
+        }
+    }
 
     //kpText
     let kpText = {}
-    each(kls, (v, k) => {
+    each(kp, (v, k) => {
         kpText[k] = v[lang]
     })
+    // console.log('kp', kp)
+    // console.log('kpText', kpText)
 
     //commit
     vo.$store.commit(vo.$store.types.UpdateKpText, kpText)
+    // console.log('commit kpText', kpText)
 
-    return kpText
 }
 
 
 function getKpText(key) {
-    // console.log('call getKpText')
+    // console.log('getKpText', key)
+
+    //kpText
     let kpText = get(vo, '$store.state.kpText')
-    return get(kpText, key, '')
+    // console.log('kpText', cloneDeep(kpText))
+
+    //t
+    let t = get(kpText, key, '')
+    if (!isestr(t)) {
+        t = key
+    }
+
+    return t
 }
 
 
@@ -209,13 +299,12 @@ let mUI = {
 
     updateConnState,
     updateLoading,
-    updateViewState,
+    // updateViewState,
     updateUserToken,
     updateUserSelf,
     forceUpdate,
 
     setLang,
-    getKpLang,
     getKpText,
 
     gv,

package/src/schema/tables/apis.mjs

@@ -1,12 +1,10 @@
-import map from 'lodash-es/map.js'
-import keys from 'lodash-es/keys.js'
-// import get from 'lodash-es/get.js'
-import genID from 'wsemi/src/genID.mjs'
+import map from 'lodash-es/map.js'
+import keys from 'lodash-es/keys.js'
+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'
-import now2strp from 'wsemi/src/now2strp.mjs'
-import isestr from 'wsemi/src/isestr.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
 import filePathToCode from '../../../server/filePathToCode.mjs'
 
 
@@ -104,7 +102,7 @@ let settings = {
 
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
-    o.id = `${now2strp()}-${genID()}`
+    o.id = `${genIDSeq()}`
     o.timeCreate = nowms2str()
     o.timeUpdate = o.timeCreate
     o.isActive = 'y'
@@ -969,7 +967,7 @@ let funTest = () => {
         },
     ], (item, k) => {
         let v = funNew({ ...item, order: k })
-        v.id = item.id
+        // v.id = item.id
         if (isestr(item.timeUpdate)) {
             v.timeUpdate = item.timeUpdate
         }