w-web-api 1.0.52 → 1.0.53

package/src/components/MdPanel.vue

@@ -5,14 +5,14 @@
 </template>
 
 <script>
-// import get from 'lodash-es/get.js'
-// import find from 'lodash-es/find.js'
-// import each from 'lodash-es/each.js'
-// import map from 'lodash-es/map.js'
-// import size from 'lodash-es/size.js'
-// import sortBy from 'lodash-es/sortBy.js'
-// import isNumber from 'lodash-es/isNumber.js'
-// import cloneDeep from 'lodash-es/cloneDeep.js'
+// import get from 'lodash-es/get.js'
+// import find from 'lodash-es/find.js'
+// import each from 'lodash-es/each.js'
+// import map from 'lodash-es/map.js'
+// import size from 'lodash-es/size.js'
+// import sortBy from 'lodash-es/sortBy.js'
+// import isNumber from 'lodash-es/isNumber.js'
+// import cloneDeep from 'lodash-es/cloneDeep.js'
 // import sep from 'wsemi/src/sep.mjs'
 // import isobj from 'wsemi/src/isobj.mjs'
 // import iseobj from 'wsemi/src/iseobj.mjs'
@@ -73,80 +73,102 @@ export default {
 </script>
 
 <style scoped>
+/* Scalar 風格 markdown 渲染：無外框、細列分隔、等寬欄、名稱欄加粗、標題退場感 */
+.md {
+    font-size: 13px;
+    color: var(--c-1, #1b1b1b);
+}
 
 .md >>> table {
     border-collapse: collapse;
-    margin: 0;
-    padding: 0;
+    width: 100%;
+    font-size: 13px;
+    margin: 2px 0 8px;
     word-break: initial;
 }
 
-.md >>> tr {
-    margin: 0;
-    padding: 0;
-}
-
 .md >>> table tr th {
-    font-weight: bold;
-    background: #eee;
-    border: 1px solid #ddd;
-    border-bottom: 0;
+    text-align: left;
+    font-weight: 600;
+    font-size: 11.5px;
+    letter-spacing: .03em;
+    color: var(--c-2, #6b7280);
+    background: transparent;
+    border: none;
+    border-bottom: 1px solid var(--border, #e6e8ec);
     margin: 0;
-    padding: 6px 13px;
+    padding: 8px 18px 8px 0;
 }
 
 .md >>> table tr td {
-    border: 1px solid #ddd;
+    border: none;
+    border-bottom: 1px solid var(--border-soft, #eef0f3);
+    color: var(--c-1, #1b1b1b);
+    font-family: var(--font-code, ui-monospace, Menlo, Consolas, monospace);
+    font-size: 12.5px;
+    vertical-align: top;
     margin: 0;
-    padding: 6px 13px;
+    padding: 8px 18px 8px 0;
+}
+
+.md >>> table tbody tr:last-child td {
+    border-bottom: none;
 }
 
-.md >>> h1 {
-    font-weight: bold;
-    font-size: 1.2rem;
-    line-height: 1.2rem;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+.md >>> table tr td:first-child {
+    font-weight: 600;
+    color: var(--c-1, #1b1b1b);
 }
 
-.md >>> h2 {
-    font-weight: bold;
-    font-size: 1.1rem;
-    line-height: 1.1rem;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+/* 對齊 mockup：型別欄(第2欄)綠字、範例欄(第3欄)灰字 */
+.md >>> table tr td:nth-child(2) {
+    color: var(--m-post, #069061);
 }
 
-.md >>> h3 {
-    font-weight: bold;
-    font-size: 1rem;
-    line-height: 1rem;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+.md >>> table tr td:nth-child(3) {
+    color: var(--c-2, #6b7280);
 }
 
-.md >>> h4 {
-    font-weight: bold;
-    font-size: 1rem;
-    line-height: 1rem;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+.md >>> h1,
+.md >>> h2,
+.md >>> h3,
+.md >>> h4,
+.md >>> h5,
+.md >>> h6 {
+    font-weight: 600;
+    font-size: 13px;
+    line-height: 1.4;
+    color: var(--c-2, #6b7280);
+    margin: 8px 0 6px;
 }
 
-.md >>> h5 {
-    font-weight: bold;
-    font-size: 1rem;
-    line-height: 1rem;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+.md >>> p {
+    color: var(--c-2, #6b7280);
+    line-height: 1.6;
+    margin: 4px 0;
 }
 
-.md >>> h6 {
-    font-weight: bold;
-    font-size: 1rem;
-    line-height: 1rem;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
+.md >>> code {
+    font-family: var(--font-code, ui-monospace, Menlo, Consolas, monospace);
+    font-size: 12px;
+    background: var(--bg-3, #eceef1);
+    border-radius: 4px;
+    padding: 1px 5px;
+}
+
+.md >>> pre {
+    font-family: var(--font-code, ui-monospace, Menlo, Consolas, monospace);
+    font-size: 12px;
+    background: var(--bg-2, #f7f8fa);
+    border: 1px solid var(--border, #e6e8ec);
+    border-radius: 8px;
+    padding: 12px 14px;
+    overflow: auto;
+}
+
+.md >>> pre code {
+    background: transparent;
+    padding: 0;
 }
 
 </style>

package/src/main.js

@@ -4,6 +4,7 @@ import get from 'lodash-es/get.js'
 // import 'regenerator-runtime/runtime'
 // import 'intersection-observer' //需供Vuetify的Intersection Observer, 專案內有使用v-intersect才需引入, 而w-component-vue沒用v-intersect
 import Vue from 'vue'
+import './assets/scalar-ui.css'
 import WServHapiClient from 'w-serv-hapi/src/WServHapiClient.mjs'
 import WAlert from 'w-component-vue/src/components/WAlert.mjs'
 import domMutation from 'w-component-vue/src/js/domMutation.mjs'
@@ -37,6 +38,13 @@ let dssm = mDataSelectorSchema(ds)
 //prototype
 Vue.prototype.$ui = ui
 Vue.prototype.$t = ui.getKpText
+//$transErr：後端 reject 之 err-key → 依當前 lang 反查顯示文字。
+//非字串或查無對應 key（getKpText 查不到會原樣回 key）則 fallback 'anUnexpectedErrorOccurred'，避免顯示生 key。
+Vue.prototype.$transErr = (err) => {
+    let key = (typeof err === 'string' && err) ? err : 'anUnexpectedErrorOccurred'
+    let msg = ui.getKpText(key)
+    return (msg && msg !== key) ? msg : ui.getKpText('anUnexpectedErrorOccurred')
+}
 Vue.prototype.$s = s
 Vue.prototype.$dssm = dssm
 Vue.prototype.$ds = ds

package/src/plugins/mUI.mjs

@@ -132,16 +132,31 @@ function validLang(lang) {
 function getLang() {
     let lang = ''
 
-    //from window
+    //from URL ?lang=（最高優先；供「以指定語系載入初始畫面」用，如分享連結 /?lang=cht，對齊 w-web-sso getLang）
+    if (!isestr(lang)) {
+        let _lang = ''
+        try {
+            _lang = new URLSearchParams(get(window, 'location.search', '')).get('lang') || ''
+        }
+        catch (err) {
+            _lang = ''
+        }
+        if (isestr(_lang)) {
+            lang = validLang(_lang) //URL 帶非預期 lang 時 validLang 退回 eng
+        }
+    }
+
+    //from window ___pmwperm___.language（server 注入之初始語系；對齊 w-web-sso window 注入來源）。
+    //須在 store 之前：store.state.lang 預設為非空 'eng'（mutations.mjs），若 store 在前會永遠 shadow 掉 window 注入值。
+    //dev 未注入時為模板符號 {language} → validLang 退回 eng。
     if (!isestr(lang)) {
         let _lang = get(window, '___pmwperm___.language', '')
-        // console.log('_lang(from window)', _lang)
         if (isestr(_lang)) {
-            lang = validLang(_lang) //有可能取到未取代前模板符號
+            lang = validLang(_lang)
         }
     }
 
-    //from store
+    //from store（使用者執行期切換之語系；切換以 setLang(明確值) 直接寫入、其後無 setLang(null) 故能持久）
     if (!isestr(lang)) {
         let _lang = get(vo, '$store.state.lang', '')
         // console.log('_lang(from store)', _lang)

package/src/schema/tables/apis.mjs

@@ -86,6 +86,34 @@ let settings = {
         name: '輸出範例',
         type: 'STRING',
     },
+    'testBaseUrl': {
+        name: '測試基底網址',
+        type: 'STRING',
+    },
+    'authType': {
+        name: '認證類型',
+        type: 'STRING',
+    },
+    'authConfigJson': {
+        name: '認證設定JSON',
+        type: 'TEXT',
+    },
+    'defaultHeadersJson': {
+        name: '預設標頭JSON',
+        type: 'TEXT',
+    },
+    'defaultQueryJson': {
+        name: '預設查詢參數JSON',
+        type: 'TEXT',
+    },
+    'defaultBodyJson': {
+        name: '預設請求內容JSON',
+        type: 'TEXT',
+    },
+    'contentType': {
+        name: '內容類型',
+        type: 'STRING',
+    },
     'timeCreate': {
         name: '創建時間',
         type: 'STRING',
@@ -106,6 +134,8 @@ let funNew = (ndata = {}) => {
     o.timeCreate = nowms2str()
     o.timeUpdate = o.timeCreate
     o.isActive = 'y'
+    o.authType = isestr(o.authType) ? o.authType : 'none'
+    o.contentType = isestr(o.contentType) ? o.contentType : 'application/json'
     return o
 }
 

package/srv.mjs

@@ -1,22 +1,44 @@
 import WOrm from 'w-orm-lmdb/src/WOrmLmdb.mjs'
 import WWebApi from './server/WWebApi.mjs'
 import getSettings from './g.getSettings.mjs'
+import get from 'lodash-es/get.js'
+import iseobj from 'wsemi/src/iseobj.mjs'
+import axios from 'axios'
+import JSON5 from 'json5'
+import fs from 'fs'
 
 
-//st
+//st（db 等系統參數由 g.getSettings 提供，供 g.mOrm 共用）
 let st = getSettings()
 
+//pathSettings：app 設定檔路徑，預設 ./settings.json；可由 `node srv.mjs <path>` 覆寫
+//（供 e2e restartBackend / 部署帶不同設定，日後更細緻功能便於擴充）。settings.json 為 JSON5 格式。
+let pathSettings = process.argv[2] || './settings.json'
+let stApp = JSON5.parse(fs.readFileSync(pathSettings, 'utf8'))
+
 let url = st.dbUrl
 let db = st.dbName
+let ssoBaseUrl = st.ssoBaseUrl
+let ssoAppToken = st.ssoAppToken
+let ssoLoginUrl = st.ssoLoginUrl
 let opt = {
 
     useCheckUser: false,
     getUserById: null,
     useExcludeWhenNotAdmin: false,
 
-    serverPort: 11005,
+    serverPort: get(stApp, 'serverPort', 11005),
     subfolder: '', //mapi
-    urlRedirect: 'https://www.google.com/', //本機測試時得先編譯, 再瀏覽: http://localhost:11005/
+    urlRedirect: ssoLoginUrl, //未登入時導向SSO登入頁, 本機測試時得先編譯, 再瀏覽: http://localhost:11005/
+
+    //語系（來自 settings.json）：language 由 WWebApi 注入 index.html ({language}) → 初始畫面即此語系；
+    //showLanguage 控右上語系選單顯隱。e2e 可用 restartBackend(genTempSettings({language})) 改 server 初始語系。
+    showLanguage: get(stApp, 'showLanguage', 'y'),
+    language: get(stApp, 'language', 'eng'),
+
+    //log 資料夾與輪檔間隔（srLog 寫入 + staEvent 統計皆讀此）。e2e 可用 genTempSettings({logFd}) 指向合成 log 達 hermetic。
+    logFd: get(stApp, 'logFd', './_logs'),
+    logInterval: get(stApp, 'logInterval', 'hr'),
 
     webName: {
         'eng': 'API Service',
@@ -32,25 +54,31 @@ let opt = {
 
 let getUserByToken = async (token) => {
     // return {} //測試無法登入
-    if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
-        return {
-            id: 'id-for-application',
-            name: 'application',
-            email: 'application@example.com',
-            isAdmin: 'y',
-        }
+    //開發階段 w-ui-loginout 於 localhost 自動給 token 'sys'
+    if (token === 'sys') {
+        return { id: 'id-for-admin', name: '測試者', email: 'admin@example.com', isAdmin: 'y' }
+    }
+    //未設定 SSO app token 時(本機開發未接SSO), 不打SSO直接拒絕
+    if (!ssoAppToken) {
+        console.log('ssoAppToken 未設定, 略過 SSO 驗證')
+        return {}
     }
-    if (token === 'sys') { //開發階段w-ui-loginout自動給予browser使用者(且位於localhost)的token為sys
-        return {
-            id: 'id-for-admin',
-            name: '測試者',
-            email: 'admin@example.com',
-            isAdmin: 'y',
+    //呼叫 SSO 解析 token -> user
+    try {
+        let url = `${ssoBaseUrl}/api/getSsoUserInfor?token=${encodeURIComponent(ssoAppToken)}&key=token&value=${encodeURIComponent(token)}`
+        let res = await axios.get(url)
+        let state = get(res, 'data.state', '')
+        let u = get(res, 'data.msg', null)
+        if (state !== 'success' || !iseobj(u)) {
+            console.log('SSO getSsoUserInfor 失敗', state)
+            return {}
         }
+        return { id: u.id, name: u.name, email: u.email, isAdmin: u.isAdmin }
+    }
+    catch (err) {
+        console.log('SSO getSsoUserInfor error', err.message)
+        return {}
     }
-    console.log('invalid token', token)
-    console.log('於生產環境時得加入SSO等驗證token機制')
-    return {}
 }
 
 let verifyClientUser = (user, from) => {

package/tableTags.json

@@ -1 +1 @@
-{"apis":"2026-03-28T23:37:07+08:00|m2kF53"}
+{"apis":"2026-06-22T12:43:06+08:00|Yl6xfX"}

package/.github/workflows/ci-test.yml

@@ -1,24 +0,0 @@
-name: Node.js CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [22.x]
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm cache clean -f
-    - run: npm install
-    - run: npm test
-      env:
-        CI: true

package/.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // 使用 IntelliSense 以得知可用的屬性。
-    // 暫留以檢視現有屬性的描述。
-    // 如需詳細資訊，請瀏覽: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "啟動程式",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/srv.mjs",
-            "runtimeArgs": []
-        }
-    ]
-}

package/dist/css/app.b5cf2ef5.css

@@ -1 +0,0 @@
-.pgc-rotate[data-v-5b4e8bee]{width:100%;height:100%;margin:auto;position:absolute;top:0;bottom:0;left:0;right:0;z-index:1;-webkit-transition:all .6s ease-in-out;transition:all .6s ease-in-out;-webkit-animation:progress-circular-rotate-5b4e8bee 1.4s linear infinite;animation:progress-circular-rotate-5b4e8bee 1.4s linear infinite;-webkit-transform-origin:center center;transform-origin:center center}.pgc-dash[data-v-5b4e8bee]{-webkit-animation:progress-circular-dash-5b4e8bee 1.4s ease-in-out infinite;animation:progress-circular-dash-5b4e8bee 1.4s ease-in-out infinite;stroke-linecap:round;stroke-dasharray:80,200;stroke-dashoffset:0px}@-webkit-keyframes progress-circular-dash-5b4e8bee{0%{stroke-dasharray:1,200;stroke-dashoffset:0px}50%{stroke-dasharray:100,200;stroke-dashoffset:-15px}to{stroke-dasharray:100,200;stroke-dashoffset:-124px}}@keyframes progress-circular-dash-5b4e8bee{0%{stroke-dasharray:1,200;stroke-dashoffset:0px}50%{stroke-dasharray:100,200;stroke-dashoffset:-15px}to{stroke-dasharray:100,200;stroke-dashoffset:-124px}}@-webkit-keyframes progress-circular-rotate-5b4e8bee{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes progress-circular-rotate-5b4e8bee{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.WPopperFix[data-popper-reference-hidden][data-v-14d6bcb4]{visibility:hidden;pointer-events:none}.sb[data-v-6ce5bdb1]{-webkit-transition:opacity .3s;transition:opacity .3s;scrollbar-width:thin;scrollbar-color:rgba(0,0,0,.3) transparent}.sb[data-v-6ce5bdb1]::-webkit-scrollbar{width:8px;height:8px}.sb[data-v-6ce5bdb1]::-webkit-scrollbar-track{background:transparent}.sb[data-v-6ce5bdb1]::-webkit-scrollbar-thumb{background:rgba(0,0,0,.3);border-radius:20px;border:3px solid transparent}.ts[data-v-9a483320]{-webkit-transition:all .3s cubic-bezier(.25,.8,.5,1);transition:all .3s cubic-bezier(.25,.8,.5,1)}.bs[data-v-9a483320]{-webkit-box-shadow:0 8px 2px -8px rgba(0,0,0,.3),0 16px 24px 2px rgba(0,0,0,.3),0 6px 30px 5px rgba(0,0,0,.3);box-shadow:0 8px 2px -8px rgba(0,0,0,.3),0 16px 24px 2px rgba(0,0,0,.3),0 6px 30px 5px rgba(0,0,0,.3)}.fade-enter-active[data-v-a0c94508],.fade-leave-active[data-v-a0c94508]{-webkit-transition:all .3s;transition:all .3s}.fade-enter[data-v-a0c94508],.fade-leave-to[data-v-a0c94508]{-webkit-transform:scaleX(0);transform:scaleX(0)}.fade-enter-to[data-v-a0c94508],.fade-leave[data-v-a0c94508]{-webkit-transform:scaleX(100%);transform:scaleX(100%)}.caretRight[data-v-26dfca3e]{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;display:inline-block}.cc[data-v-26dfca3e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.circle[data-v-26dfca3e]{width:22px;height:22px;min-width:22px;min-height:22px;max-width:22px;max-height:22px;border-radius:50%}.md[data-v-1a0f86f5] table{border-collapse:collapse;margin:0;padding:0;word-break:normal}.md[data-v-1a0f86f5] tr{margin:0;padding:0}.md[data-v-1a0f86f5] table tr th{font-weight:700;background:#eee;border:1px solid #ddd;border-bottom:0;margin:0;padding:6px 13px}.md[data-v-1a0f86f5] table tr td{border:1px solid #ddd;margin:0;padding:6px 13px}.md[data-v-1a0f86f5] h1{font-size:1.2rem;line-height:1.2rem}.md[data-v-1a0f86f5] h1,.md[data-v-1a0f86f5] h2{font-weight:700;margin-top:.5rem;margin-bottom:.5rem}.md[data-v-1a0f86f5] h2{font-size:1.1rem;line-height:1.1rem}.md[data-v-1a0f86f5] h3,.md[data-v-1a0f86f5] h4,.md[data-v-1a0f86f5] h5,.md[data-v-1a0f86f5] h6{font-weight:700;font-size:1rem;line-height:1rem;margin-top:.5rem;margin-bottom:.5rem}.bk[data-v-56f2385e]{display:inline-block;width:200px;padding:0 10px 10px 0;vertical-align:top}.bk-title[data-v-56f2385e]{padding:3px;font-size:.8rem;color:#888}.bk-item[data-v-56f2385e]{padding:3px 5px;font-size:.9rem;line-height:.9rem;border-radius:5px;border:1px solid #ddd;background:#fff}body,html{font-family:微軟正黑體,Microsoft JhengHei,MicrosoftJhengHeiRegular,Avenir,Helvetica,Arial,sans-serif;overflow-y:hidden}a,button,div,input,p,pre,span,textarea{font-family:inherit}.fade-enter-active{-webkit-animation:go 1s;animation:go 1s}.fade-leave-active{-webkit-animation:back 1s;animation:back 1s}@-webkit-keyframes go{0%{opacity:0}to{opacity:1}}@keyframes go{0%{opacity:0}to{opacity:1}}@-webkit-keyframes back{0%{opacity:1}to{opacity:0}}@keyframes back{0%{opacity:1}to{opacity:0}}