w-web-perm 1.0.25 → 1.0.26

package/docs/WWebPerm.html

@@ -925,7 +925,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Dec 26 2024 15:14:33 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 Mon Jan 27 2025 12:59:51 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -271,7 +271,18 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //urlRedirect
     let urlRedirect = get(opt, 'urlRedirect', '')
-    console.log('urlRedirect', urlRedirect)
+    // console.log('urlRedirect', urlRedirect)
+
+
+    //params
+    let showModeEditTargets = get(opt, 'showModeEditTargets', 'n')
+    let showModeEditPemis = get(opt, 'showModeEditPemis', 'n')
+    let showModeEditGrups = get(opt, 'showModeEditGrups', 'n')
+    let showModeEditUsers = get(opt, 'showModeEditUsers', 'n')
+    let modeEditTargets = get(opt, 'modeEditTargets', 'n')
+    let modeEditPemis = get(opt, 'modeEditPemis', 'n')
+    let modeEditGrups = get(opt, 'modeEditGrups', 'n')
+    let modeEditUsers = get(opt, 'modeEditUsers', 'n')
 
 
     //mappingBy
@@ -304,6 +315,15 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
             webName,
             webDescription,
             webLogo,
+            // urlRedirect, //登入失敗就需要轉址, 故須通過html模板取代提供, 無法用api提供
+            showModeEditTargets,
+            showModeEditPemis,
+            showModeEditGrups,
+            showModeEditUsers,
+            modeEditTargets,
+            modeEditPemis,
+            modeEditGrups,
+            modeEditUsers,
         }
     }
 
@@ -818,6 +838,14 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         c = replace(c, '/mperm/', '{sfd}/') //方法同genEntry
         c = replace(c, '{sfd}', subfolder)
         c = replace(c, '{urlRedirect}', urlRedirect)
+        c = replace(c, '{showModeEditTargets}', showModeEditTargets)
+        c = replace(c, '{showModeEditPemis}', showModeEditPemis)
+        c = replace(c, '{showModeEditGrups}', showModeEditGrups)
+        c = replace(c, '{showModeEditUsers}', showModeEditUsers)
+        c = replace(c, '{modeEditTargets}', modeEditTargets)
+        c = replace(c, '{modeEditPemis}', modeEditPemis)
+        c = replace(c, '{modeEditGrups}', modeEditGrups)
+        c = replace(c, '{modeEditUsers}', modeEditUsers)
         fs.writeFileSync(fpEntryOut, c, 'utf8')
     }
     catch (err) {
@@ -1234,7 +1262,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Dec 26 2024 15:14:33 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 Mon Jan 27 2025 12:59:51 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 Thu Dec 26 2024 15:14:33 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 Mon Jan 27 2025 12:59:51 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.25",
+  "version": "1.0.26",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
@@ -8,12 +8,12 @@
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.4.2",
+    "w-component-vue": "^2.4.7",
     "w-data-collector": "^1.0.22",
     "w-serv-hapi": "^1.0.13",
-    "w-serv-orm": "^1.0.11",
+    "w-serv-orm": "^1.0.12",
     "w-ui-loginout": "^1.0.8",
-    "wsemi": "^1.7.61"
+    "wsemi": "^1.7.64"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -30,7 +30,7 @@
     "vue": "^2.6.14",
     "vuex": "^3.6.2",
     "w-orm-mongodb": "^1.1.32",
-    "w-package-tools": "^1.0.80"
+    "w-package-tools": "^1.0.82"
   },
   "scripts": {
     "serve": "vue-cli-service serve",

package/public/index.html

@@ -16,6 +16,14 @@
         <script>
             window.___pmwperm___={
                 urlRedirect: '{urlRedirect}',
+                showModeEditTargets: '{showModeEditTargets}',
+                showModeEditPemis:   '{showModeEditPemis}',
+                showModeEditGrups:   '{showModeEditGrups}',
+                showModeEditUsers:   '{showModeEditUsers}',
+                modeEditTargets: '{modeEditTargets}',
+                modeEditPemis:   '{modeEditPemis}',
+                modeEditGrups:   '{modeEditGrups}',
+                modeEditUsers:   '{modeEditUsers}',
             }
         </script>
 

package/server/WWebPerm.mjs

@@ -224,7 +224,18 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //urlRedirect
     let urlRedirect = get(opt, 'urlRedirect', '')
-    console.log('urlRedirect', urlRedirect)
+    // console.log('urlRedirect', urlRedirect)
+
+
+    //params
+    let showModeEditTargets = get(opt, 'showModeEditTargets', 'n')
+    let showModeEditPemis = get(opt, 'showModeEditPemis', 'n')
+    let showModeEditGrups = get(opt, 'showModeEditGrups', 'n')
+    let showModeEditUsers = get(opt, 'showModeEditUsers', 'n')
+    let modeEditTargets = get(opt, 'modeEditTargets', 'n')
+    let modeEditPemis = get(opt, 'modeEditPemis', 'n')
+    let modeEditGrups = get(opt, 'modeEditGrups', 'n')
+    let modeEditUsers = get(opt, 'modeEditUsers', 'n')
 
 
     //mappingBy
@@ -257,6 +268,15 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
             webName,
             webDescription,
             webLogo,
+            // urlRedirect, //登入失敗就需要轉址, 故須通過html模板取代提供, 無法用api提供
+            showModeEditTargets,
+            showModeEditPemis,
+            showModeEditGrups,
+            showModeEditUsers,
+            modeEditTargets,
+            modeEditPemis,
+            modeEditGrups,
+            modeEditUsers,
         }
     }
 
@@ -771,6 +791,14 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         c = replace(c, '/mperm/', '{sfd}/') //方法同genEntry
         c = replace(c, '{sfd}', subfolder)
         c = replace(c, '{urlRedirect}', urlRedirect)
+        c = replace(c, '{showModeEditTargets}', showModeEditTargets)
+        c = replace(c, '{showModeEditPemis}', showModeEditPemis)
+        c = replace(c, '{showModeEditGrups}', showModeEditGrups)
+        c = replace(c, '{showModeEditUsers}', showModeEditUsers)
+        c = replace(c, '{modeEditTargets}', modeEditTargets)
+        c = replace(c, '{modeEditPemis}', modeEditPemis)
+        c = replace(c, '{modeEditGrups}', modeEditGrups)
+        c = replace(c, '{modeEditUsers}', modeEditUsers)
         fs.writeFileSync(fpEntryOut, c, 'utf8')
     }
     catch (err) {

package/src/App.vue

@@ -28,6 +28,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 LoadingWinBar from './components/Common/LoadingWinBar.vue'
@@ -121,7 +122,11 @@ export default {
 
         ready: function() {
             let connState = get(this, `$store.state.connState`)
-            return connState === '已連線'
+            let webInfor = get(this, `$store.state.webInfor`)
+            let b1 = connState === '已連線'
+            let b2 = iseobj(webInfor)
+            let b = b1 && b2
+            return b
         },
 
     },

package/src/components/Layout.vue

@@ -4,14 +4,6 @@
         <!-- menu top, 因窄版導致名稱換行故須使用overflow-y:hidden -->
         <div :style="`height:${heightToolbar}px; overflow-y:hidden; padding:0px 10px; background:#fff; border-bottom:1px solid #ccc; display:flex; align-items:center;`">
 
-            <WButtonCircle
-                :icon="'mdi-menu'"
-                :tooltip="'左側選單'"
-                :shadow="false"
-                @click="drawer=!drawer"
-                v-if="false"
-            ></WButtonCircle>
-
             <div style="padding-left:5px; white-space:nowrap">
                 <div style="display:flex; align-items:center;">
 
@@ -71,12 +63,9 @@ export default {
         return {
 
             mdiMenu,
-            // drawer: null, //null false
             // menuKey: 'blocks',
             userName: 'tester',
 
-            drawer: true, //null,
-
             tgLangs: [
                 {
                     id: 'cht',

package/src/components/LayoutContent.vue

@@ -40,21 +40,21 @@
                         ></WListVertical>
 
                         <div
-                            :style="`position:absolute; top:1px; right:4px;`"
+                            :style="`position:absolute; top:2px; right:4px;`"
                             v-if="drawer"
                         >
                             <WButtonCircle
-                                :paddingStyle="{v:3,h:3}"
-                                :icon="'mdi-arrow-left'"
-                                :iconSize="16"
-                                :backgroundColor="'#fff'"
-                                :backgroundColorHover="'#eee'"
-                                :backgroundColorFocus="'#fff'"
+                                :paddingStyle="{h:2,v:2}"
+                                :icon="'mdi-arrow-left-bold-hexagon-outline'"
+                                :iconSize="20"
+                                :backgroundColor="'rgba(255,255,255,0.9)'"
+                                :backgroundColorHover="'rgba(255,255,255,0.7)'"
+                                :backgroundColorFocus="'rgba(255,255,255,0.5)'"
                                 :borderColor="'transparent'"
-                                :borderColorHover="'#eee'"
-                                :borderColorFocus="'#eee'"
-                                :tooltip="$t('menuTreeHide')"
-                                :shadow="true"
+                                :borderColorHover="'transparent'"
+                                :borderColorFocus="'transparent'"
+                                _tooltip="$t('menuTreeHide')"
+                                :shadow="false"
                                 @click="drawer=false"
                             ></WButtonCircle>
                         </div>
@@ -90,21 +90,21 @@
                         </template>
 
                         <div
-                            :style="`position:absolute; top:1px; left:4px;`"
+                            :style="`position:absolute; top:3px; left:5px;`"
                             v-if="!drawer"
                         >
                             <WButtonCircle
-                                :paddingStyle="{v:3,h:3}"
-                                :icon="'mdi-arrow-right'"
-                                :iconSize="16"
-                                :backgroundColor="'#fff'"
-                                :backgroundColorHover="'#eee'"
-                                :backgroundColorFocus="'#fff'"
+                                :paddingStyle="{h:2,v:2}"
+                                :icon="'mdi-arrow-right-bold-hexagon-outline'"
+                                :iconSize="20"
+                                :backgroundColor="'rgba(255,255,255,0.9)'"
+                                :backgroundColorHover="'rgba(255,255,255,0.7)'"
+                                :backgroundColorFocus="'rgba(255,255,255,0.5)'"
                                 :borderColor="'transparent'"
-                                :borderColorHover="'#eee'"
-                                :borderColorFocus="'#eee'"
-                                :tooltip="$t('menuTreeShow')"
-                                :shadow="true"
+                                :borderColorHover="'transparent'"
+                                :borderColorFocus="'transparent'"
+                                _tooltip="$t('menuTreeShow')"
+                                :shadow="false"
                                 @click="drawer=true"
                             ></WButtonCircle>
                         </div>