w-web-perm 1.0.0 → 1.0.1

package/docs/WWebPerm.html

@@ -813,7 +813,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Jul 19 2023 12:50:03 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 4.0.2</a> on Thu Jul 20 2023 00:07:52 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -286,7 +286,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         //userFind
         let userFind = await woItems.users.select({ [mappingBy]: vSelf, isActive: 'y' })
         userFind = get(userFind, 0, null)
-        console.log('userFind', userFind)
+        // console.log('userFind', userFind)
 
         //複寫isAdmin
         let isAdminSrc = get(userSelf, 'isAdmin', '')
@@ -294,7 +294,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         if (isAdminSrc !== isAdminSelf) {
             userFind.isAdmin = isAdminSelf
         }
-        console.log('userFind(isAdmin)', userFind)
+        // console.log('userFind(isAdmin)', userFind)
 
         return userFind
     }
@@ -339,7 +339,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         // console.log('userFind', userFind)
 
         //ruleGroups
-        let ruleGroups = await woItems.ruleGroups.select({})
+        let ruleGroups = await woItems.ruleGroups.select()
         // console.log('ruleGroups', ruleGroups)
 
         //targets
@@ -358,7 +358,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
 
         return {
             user: userFind,
-            roles: urs,
+            rules: urs,
         }
     }
 
@@ -545,7 +545,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Jul 19 2023 12:50:03 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 4.0.2</a> on Thu Jul 20 2023 00:07:52 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Jul 19 2023 12:50:03 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 4.0.2</a> on Thu Jul 20 2023 00:07:52 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.2.96",
@@ -72,4 +72,4 @@
   ],
   "author": "yuda-lyu(semisphere)",
   "license": "MIT"
-}
+}

package/server/WWebPerm.mjs

@@ -239,7 +239,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         //userFind
         let userFind = await woItems.users.select({ [mappingBy]: vSelf, isActive: 'y' })
         userFind = get(userFind, 0, null)
-        console.log('userFind', userFind)
+        // console.log('userFind', userFind)
 
         //複寫isAdmin
         let isAdminSrc = get(userSelf, 'isAdmin', '')
@@ -247,7 +247,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         if (isAdminSrc !== isAdminSelf) {
             userFind.isAdmin = isAdminSelf
         }
-        console.log('userFind(isAdmin)', userFind)
+        // console.log('userFind(isAdmin)', userFind)
 
         return userFind
     }
@@ -292,7 +292,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         // console.log('userFind', userFind)
 
         //ruleGroups
-        let ruleGroups = await woItems.ruleGroups.select({})
+        let ruleGroups = await woItems.ruleGroups.select()
         // console.log('ruleGroups', ruleGroups)
 
         //targets
@@ -311,7 +311,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
 
         return {
             user: userFind,
-            roles: urs,
+            rules: urs,
         }
     }
 

package/src/perm.mjs

@@ -1,6 +1,5 @@
 import axios from 'axios'
 import isestr from 'wsemi/src/isestr.mjs'
-import genPm from 'wsemi/src/genPm.mjs'
 
 
 let _url = ''
@@ -11,42 +10,48 @@ function iniPerm(url) {
 }
 
 
-async function getPerm(token) {
+function getPerm(token = '') {
 
     //check
     if (!isestr(_url)) {
         throw new Error(`invalid url, need to use iniPerm to set url`)
     }
 
-    //pm
-    let pm = genPm()
+    // //pm
+    // let pm = genPm()
 
     //url
-    let url = `${_url}?token=${token}`
+    let url = ''
+    if (isestr(token)) {
+        url = `${_url}?token=${token}`
+    }
+    else {
+        url = _url
+    }
 
     //axios
-    await axios({
+    let pm = axios({
         method: 'get',
         url,
         // headers: { 'Content-Type': 'application/json; charset=utf-8' },
         // data: rin,
     })
-        .then((res) => {
-            // console.log(res)
-            let r = {
-                msg: '成功取得使用者權限',
-                res,
-            }
-            pm.resolve(r)
-        })
-        .catch((err) => {
-            // console.log(err)
-            let r = {
-                msg: '取得使用者權限發生錯誤',
-                res: err,
-            }
-            pm.reject(r)
-        })
+    // .then((res) => {
+    //     console.log(res)
+    //     let r = {
+    //         msg: '成功取得使用者權限',
+    //         res,
+    //     }
+    //     pm.resolve(r)
+    // })
+    // .catch((err) => {
+    //     console.log(err)
+    //     let r = {
+    //         msg: '取得使用者權限發生錯誤',
+    //         res: err,
+    //     }
+    //     pm.reject(r)
+    // })
 
     return pm
 }

package/src/plugins/mShare.mjs

@@ -1,169 +1,17 @@
 //前後端共用函數區
-// import min from 'lodash/min'
-// import size from 'lodash/size'
-// import take from 'lodash/take'
-// import isEqual from 'lodash/isEqual'
-import uniq from 'lodash/uniq'
-// import set from 'lodash/set'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
 import find from 'lodash/find'
-import filter from 'lodash/filter'
-// import last from 'lodash/last'
-// import size from 'lodash/size'
-import split from 'lodash/split'
 import join from 'lodash/join'
 import cloneDeep from 'lodash/cloneDeep'
 import takeRight from 'lodash/takeRight'
 import dropRight from 'lodash/dropRight'
 import sortBy from 'lodash/sortBy'
 import sep from 'wsemi/src/sep.mjs'
-import isarr from 'wsemi/src/isarr.mjs'
-import isstr from 'wsemi/src/isstr.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import composeToTree from 'wsemi/src/composeToTree.mjs'
-// import getFileAccept from 'wsemi/src/getFileAccept.mjs'
-
-
-// function atSep(attachmentsIds) {
-
-//     //ts
-//     let ts = sep(attachmentsIds, ';')
-
-//     return ts
-// }
-
-
-// function atJoin(ts) {
-
-//     //uniq
-//     ts = uniq(ts)
-
-//     //str
-//     let str = join(ts, ';')
-
-//     return str
-// }
-
-
-// function atParse(attachmentsIds) {
-
-//     //ts
-//     let ts = atSep(attachmentsIds)
-
-//     //ids
-//     let ids = map(ts, (v) => {
-//         let s = sep(v, '@')
-//         let table = get(s, 0, '')
-//         let id = get(s, 1, '')
-//         if (table === '') {
-//             console.log('atParse: invalid table in attachmentsIds', attachmentsIds)
-//         }
-//         if (id === '') {
-//             console.log('atParse: invalid id in attachmentsIds', attachmentsIds)
-//         }
-//         return {
-//             table,
-//             id,
-//         }
-//     })
-
-//     return ids
-// }
-
-
-// function atRemove(inp, removeId, opt = {}) {
-
-//     //removeId
-//     if (!isstr(removeId)) {
-//         removeId = ''
-//     }
-//     if (removeId.indexOf('@') >= 0) {
-//         removeId = split(removeId, '@')[1] //取後面id
-//     }
-
-//     //ids
-//     let ids = []
-//     let returnTypeTemp = ''
-//     if (isarr(inp)) {
-//         ids = inp
-//         returnTypeTemp = 'array'
-//     }
-//     else if (isstr(inp)) {
-//         ids = atParse(inp)
-//         returnTypeTemp = 'string'
-//     }
-
-//     //returnType
-//     let returnType = get(opt, 'returnType', null)
-//     if (returnType !== 'array' && returnType !== 'string') {
-//         returnType = returnTypeTemp
-//     }
-
-
-//     //filter
-//     ids = filter(ids, (v) => {
-//         return v.id !== removeId
-//     })
-
-//     if (returnType === 'array') {
-//         return ids
-//     }
-//     return atMerge(ids)
-// }
-
-
-// function atMerge(ids) {
-
-//     //ts
-//     let ts = map(ids, (v) => {
-//         let table = get(v, 'table', '')
-//         let id = get(v, 'id', '')
-//         if (table === '') {
-//             console.log('atMerge: invalid table in ids', ids)
-//         }
-//         if (id === '') {
-//             console.log('atMerge: invalid id in ids', ids)
-//         }
-//         return `${table}@${id}`
-//     })
-
-//     return atJoin(ts)
-// }
-
-
-// function isNumOrEng(str) {
-//     let regExp = /^[\d|a-zA-Z]+$/
-//     if (regExp.test(str)) {
-//         return true
-//     }
-//     else {
-//         return false
-//     }
-// }
-
-
-// function extractFileType(fileName, fileType) {
-//     let r = ''
-
-//     //find
-//     let ar = getFileAccept()
-//     for (let i = 0; i < ar.length; i++) {
-//         if (ar[i].acp === fileType) {
-//             return ar[i].name
-//         }
-//     }
-
-//     //from name ext
-//     let s = split(fileName, '.')
-//     if (size(s) > 1) {
-//         return last(s)
-//     }
-
-//     return r
-// }
 
 
 function getAllBlocks(targets) {

package/src/schema/tables/ruleGroups.mjs

@@ -61,7 +61,7 @@ let funNew = (ndata = {}) => {
     o.userIdUpdate = o.userId
     o.timeCreate = nowms2str()
     o.timeUpdate = o.timeCreate
-    o.isActive = 'y'
+    // o.isActive = 'y'
     return o
 }
 

package/src/schema/tables/targets.mjs

@@ -3,7 +3,7 @@ import keys from 'lodash/keys'
 import genID from 'wsemi/src/genID.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
-import nowms2str from 'wsemi/src/nowms2str.mjs'
+// import nowms2str from 'wsemi/src/nowms2str.mjs'
 import now2strp from 'wsemi/src/now2strp.mjs'
 
 
@@ -38,9 +38,9 @@ let settings = {
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
     o.id = `${now2strp()}-${genID()}`
-    o.timeCreate = nowms2str()
-    o.timeUpdate = o.timeCreate
-    o.isActive = 'y'
+    // o.timeCreate = nowms2str()
+    // o.timeUpdate = o.timeCreate
+    // o.isActive = 'y'
     return o
 }
 

package/src/schema/tables/users.mjs

@@ -104,7 +104,7 @@ let funTest = () => {
     rs[3].from = 'teamB'
     rs[4].from = 'teamB'
     rs[4].isActive = 'n'
-    rs[5].ruleGroupsIds = `id-for-L1權限群組`
+    rs[5].ruleGroupsIds = `id-for-權限群組1`
     rs[5].description = '測試系統管理員描述說明'
     rs[5].isAdmin = 'y' //admin
     console.log(`已產生: ${keyTable} 測試資料`, rs)

package/tableTags-web-perm.json

@@ -1 +1 @@
-{"ruleGroups":"t5bra2","targets":"OxwFDJ","users":"t7oXtY"}
+{"ruleGroups":"rXJNLB","targets":"4GLDb2","users":"AG7IvW"}