w-web-perm 1.0.1 → 1.0.3

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 Thu Jul 20 2023 00:07:52 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 Jul 31 2023 10:16:16 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -357,8 +357,11 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         }
 
         return {
-            user: userFind,
-            rules: urs,
+            user: {
+                ...userFind,
+                ruleGroupsNames: urs.ruleGroupsNames, //ruleGroupsNames併入user內顯示
+            },
+            rules: urs.rules,
         }
     }
 
@@ -410,11 +413,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getUserByToken', //未登入界面需先檢測token是否為系統管理員, 確認後回傳為系統管理員資訊物件, getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
+            path: '/api/getUserByToken', //名稱getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
             handler: async function (req, res) {
-                // console.log('verifyIdentity', req)
+                // console.log('getUserByToken', req)
 
                 async function core() {
+                    //提供對象為browser使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 確認後回傳該使用者(系統管理員)資訊物件
 
                     //token
                     let token = get(req, 'query.token', '')
@@ -425,7 +429,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                     // console.log('userSelf', userSelf)
 
                     //check
-                    if (get(userSelf, 'isAdmin') !== 'y') { //界面須系統管理員才能使用
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
                         return Promise.reject(`user does not have permission`)
                     }
 
@@ -433,7 +437,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 }
 
                 //pm2resolve core
-                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 會提取state進行判斷
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
                 // console.log('getUserByToken', r)
 
                 return r
@@ -441,11 +445,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getPerm', //外部系統呼叫會須先檢測token是否有效, 再依照token所代表的使用者userId提供權限資訊物件
+            path: '/api/getPerm',
             handler: async function (req, res) {
                 // console.log('getPerm', req)
 
                 async function core() {
+                    //提供對象為node與browser使用者, 須先檢測token是否有效, 再依照token取得使用者資訊物件, 再由其userId查詢回傳該使用者權限資訊物件
 
                     //parseToken
                     let token = parseToken(req)
@@ -485,6 +490,51 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 let r = await pm2resolve(core)()
                 // console.log('getPerm r', r)
 
+                return r
+            },
+        },
+        {
+            method: 'GET',
+            path: '/api/getPermById',
+            handler: async function (req, res) {
+                // console.log('getPermById', req)
+
+                async function core() {
+                    //提供對象為node使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 再由query取得欲查詢的使用者userId, 再由其userId查詢回傳該使用者權限資訊物件
+
+                    //token
+                    let token = get(req, 'query.token', '')
+                    // console.log('token', token)
+
+                    //getGenUserByUserId
+                    let userSelf = await getTokenUserForSelf(token)
+                    // console.log('userSelf', userSelf)
+
+                    //check
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
+                        return Promise.reject(`user does not have permission`)
+                    }
+
+                    //userId
+                    let userId = get(req, 'query.userId', '')
+                    // console.log('userId', userId)
+
+                    //getGenUserAndRulesByUserId
+                    let r = await getGenUserAndRulesByUserId(userId)
+                    // console.log('getGenUserAndRulesByUserId', r)
+
+                    //check
+                    if (!iseobj(r)) {
+                        return Promise.reject(`user does not have permrules`)
+                    }
+
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
+                // console.log('getUserByToken', r)
+
                 return r
             },
         },
@@ -545,7 +595,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 Jul 20 2023 00:07:52 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 Jul 31 2023 10:16:16 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 Jul 20 2023 00:07:52 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 Jul 31 2023 10:16:16 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.mInitialData.mjs

@@ -0,0 +1,147 @@
+import map from 'lodash/map'
+import ds from './src/schema/index.mjs'
+import { woItems } from './g.mOrm.mjs'
+
+
+async function initialData() {
+    let rs
+
+
+    //人工建置數據時得要嚴格建立各階分層, 否則會無法查找到自動建立之parentId
+    rs = [
+        '主要資訊',
+        '主要資訊/主選單區',
+        '主要資訊/內容區',
+        '主要資訊/內容區/待處理任務區',
+        '計畫資料管理系統',
+        '計畫資料管理系統/主選單區',
+        '計畫資料管理系統/內容區',
+        '計畫資料管理系統/內容區/另存按鈕',
+        '計畫資料管理系統/內容區/刪除按鈕',
+        '計畫資料管理系統/內容區/查詢',
+        // '計畫資料管理系統/內容區/查詢/關鍵字功能',
+        '計畫資料管理系統/內容區/查詢/分類功能',
+        '計畫資料管理系統/內容區/查詢/計畫功能',
+        '計畫資料管理系統/內容區/查詢/欄位功能',
+        '輔助參考文獻系統',
+        '輔助參考文獻系統/主選單區',
+        '需求管理系統',
+        '需求管理系統/主選單區',
+        '需求管理系統/內容區',
+        '需求管理系統/內容區/編輯按鈕',
+        '知識管理系統',
+        '知識管理系統/主選單區',
+        '知識管理系統/內容區',
+        '知識管理系統/內容區/編輯按鈕',
+        'GIS(2D)',
+        'GIS(2D)/主選單區',
+        '模板下載',
+        '模板下載/主選單區',
+        '批次上傳系統',
+        '批次上傳系統/主選單區',
+        'API管理系統',
+        'API管理系統/主選單區',
+        '後台管理系統',
+        '後台管理系統/主選單區',
+    ]
+    rs = map(rs, (key, k) => {
+        let v = ds.targets.funNew({
+            description: key,
+        })
+        v.id = key
+        return v
+    })
+    await woItems.targets.delAll()
+    await woItems.targets.insert(rs)
+
+
+    rs = [
+        ['L0權限群組', '普通瀏覽者用之權限群組',
+            `{ "___all___": { "show": "n", "active": "n" }, 
+            "主要資訊": { "show": "y", "active": "y" }, 
+            "主要資訊/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/內容區": { "show": "y", "active": "y" }, 
+            "需求管理系統": { "show": "y", "active": "y" }, 
+            "需求管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "知識管理系統": { "show": "y", "active": "y" }, 
+            "知識管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "GIS": { "show": "y", "active": "y" }, 
+            "GIS/主選單區": { "show": "y", "active": "y" }, 
+            "模板下載": { "show": "y", "active": "y" }, 
+            "模板下載/主選單區": { "show": "y", "active": "y" }, 
+        }`],
+        ['L1權限群組', '一般使用者用之權限群組',
+            `{ "___all___": { "show": "n", "active": "n" }, 
+            "主要資訊": { "show": "y", "active": "y" }, 
+            "主要資訊/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/內容區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/內容區/編輯按鈕": { "show": "y", "active": "n" }, 
+            "輔助參考文獻系統": { "show": "y", "active": "y" }, 
+            "輔助參考文獻系統/主選單區": { "show": "y", "active": "y" }, 
+            "需求管理系統": { "show": "y", "active": "y" }, 
+            "需求管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "需求管理系統/內容區": { "show": "y", "active": "y" },
+            "需求管理系統/內容區/編輯按鈕": { "show": "y", "active": "n" },
+            "知識管理系統": { "show": "y", "active": "y" }, 
+            "知識管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "知識管理系統/內容區": { "show": "y", "active": "y" },
+            "知識管理系統/內容區/編輯按鈕": { "show": "y", "active": "n" },
+            "GIS": { "show": "y", "active": "y" }, 
+            "GIS/主選單區": { "show": "y", "active": "y" }, 
+            "模板下載": { "show": "y", "active": "y" }, 
+            "模板下載/主選單區": { "show": "y", "active": "y" }, 
+        }`],
+        ['L2權限群組', '系統管理者用之權限群組',
+            `{ "___all___": { "show": "y", "active": "y" } }`],
+    ]
+    rs = map(rs, ([name, description, crules], k) => {
+        let v = ds.ruleGroups.funNew({
+            userId: 'id-for-admin',
+            name,
+            description,
+            crules,
+        })
+        v.id = `id-for-${name}`
+        v.order = k
+        return v
+    })
+    await woItems.ruleGroups.delAll()
+    await woItems.ruleGroups.insert(rs)
+
+
+    rs = [
+        ['viewer', '普通瀏覽者', 'id-for-L0權限群組'],
+        ['basic', '一般使用者', 'id-for-L1權限群組'],
+        ['admin', '系統管理者', 'id-for-L2權限群組'],
+    ]
+    rs = map(rs, ([key, name, ruleGroupsIds], k) => {
+        let v = ds.users.funNew({
+            userId: 'id-for-admin',
+            name,
+            email: `${key}@example.com`,
+            ruleGroupsIds,
+        })
+        v.id = `id-for-${key}`
+        if (key === 'admin') {
+            v.isAdmin = 'y'
+        }
+        return v
+    })
+    await woItems.users.delAll()
+    await woItems.users.insert(rs)
+
+
+}
+
+initialData()
+    .catch((err) => {
+        console.log('initialData catch', err)
+    })
+
+
+//重建資料庫
+//node --experimental-modules --es-module-specifier-resolution=node g.mInitialData.mjs

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.2.96",
     "axios": "^1.3.4",
+    "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.3.6",
+    "w-component-vue": "^2.3.18",
     "w-data-collector": "^1.0.19",
     "w-serv-hapi": "^1.0.11",
     "w-serv-orm": "^1.0.7",
     "w-ui-loginout": "^1.0.4",
-    "wsemi": "^1.7.17"
+    "wsemi": "^1.7.19"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",

package/server/WWebPerm.mjs

@@ -310,8 +310,11 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         }
 
         return {
-            user: userFind,
-            rules: urs,
+            user: {
+                ...userFind,
+                ruleGroupsNames: urs.ruleGroupsNames, //ruleGroupsNames併入user內顯示
+            },
+            rules: urs.rules,
         }
     }
 
@@ -363,11 +366,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getUserByToken', //未登入界面需先檢測token是否為系統管理員, 確認後回傳為系統管理員資訊物件, getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
+            path: '/api/getUserByToken', //名稱getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
             handler: async function (req, res) {
-                // console.log('verifyIdentity', req)
+                // console.log('getUserByToken', req)
 
                 async function core() {
+                    //提供對象為browser使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 確認後回傳該使用者(系統管理員)資訊物件
 
                     //token
                     let token = get(req, 'query.token', '')
@@ -378,7 +382,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                     // console.log('userSelf', userSelf)
 
                     //check
-                    if (get(userSelf, 'isAdmin') !== 'y') { //界面須系統管理員才能使用
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
                         return Promise.reject(`user does not have permission`)
                     }
 
@@ -386,7 +390,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 }
 
                 //pm2resolve core
-                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 會提取state進行判斷
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
                 // console.log('getUserByToken', r)
 
                 return r
@@ -394,11 +398,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getPerm', //外部系統呼叫會須先檢測token是否有效, 再依照token所代表的使用者userId提供權限資訊物件
+            path: '/api/getPerm',
             handler: async function (req, res) {
                 // console.log('getPerm', req)
 
                 async function core() {
+                    //提供對象為node與browser使用者, 須先檢測token是否有效, 再依照token取得使用者資訊物件, 再由其userId查詢回傳該使用者權限資訊物件
 
                     //parseToken
                     let token = parseToken(req)
@@ -438,6 +443,51 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 let r = await pm2resolve(core)()
                 // console.log('getPerm r', r)
 
+                return r
+            },
+        },
+        {
+            method: 'GET',
+            path: '/api/getPermById',
+            handler: async function (req, res) {
+                // console.log('getPermById', req)
+
+                async function core() {
+                    //提供對象為node使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 再由query取得欲查詢的使用者userId, 再由其userId查詢回傳該使用者權限資訊物件
+
+                    //token
+                    let token = get(req, 'query.token', '')
+                    // console.log('token', token)
+
+                    //getGenUserByUserId
+                    let userSelf = await getTokenUserForSelf(token)
+                    // console.log('userSelf', userSelf)
+
+                    //check
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
+                        return Promise.reject(`user does not have permission`)
+                    }
+
+                    //userId
+                    let userId = get(req, 'query.userId', '')
+                    // console.log('userId', userId)
+
+                    //getGenUserAndRulesByUserId
+                    let r = await getGenUserAndRulesByUserId(userId)
+                    // console.log('getGenUserAndRulesByUserId', r)
+
+                    //check
+                    if (!iseobj(r)) {
+                        return Promise.reject(`user does not have permrules`)
+                    }
+
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
+                // console.log('getUserByToken', r)
+
                 return r
             },
         },

package/src/components/LayoutContentGroups.vue

@@ -148,6 +148,7 @@
 
 <script>
 import { mdiStackOverflow, mdiVectorPolylinePlus, mdiCheckboxMarkedCircle, mdiCloudUploadOutline } from '@mdi/js/mdi.js'
+// import JSON5 from 'json5'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
@@ -211,9 +212,9 @@ export default {
 
             let vo = this
 
-            //rs, 此區程式碼等同於ruleGroups, 若確認後續無需求再移除
+            //rs
             let rs = map(vo.ruleGroups, (v) => {
-                // let rules = JSON.parse(v.crules)
+                // let rules = JSON5.parse(v.crules)
                 return {
                     ...v,
                     // rules,

package/src/components/LayoutContentTargets.vue

@@ -123,6 +123,7 @@
 
 <script>
 import { mdiGamepadCircle, mdiStackOverflow, mdiAccountGroupOutline, mdiBallotRecountOutline, mdiCloudUploadOutline } from '@mdi/js/mdi.js'
+import JSON5 from 'json5'
 import get from 'lodash/get'
 import set from 'lodash/set'
 import each from 'lodash/each'
@@ -141,6 +142,10 @@ import WTree from 'w-component-vue/src/components/WTree.vue'
 import { getTreeBlocks } from '../plugins/mShare.mjs'
 
 
+//dlm
+let dlm = '.'
+
+
 export default {
     components: {
         WIcon,
@@ -202,6 +207,8 @@ export default {
 
             //getTreeBlocks
             let treeBlocks = getTreeBlocks(vo.targets)
+            // console.log('targets', vo.targets)
+            // console.log('treeBlocks', treeBlocks)
 
             //save
             vo.treeBlocks = treeBlocks
@@ -379,7 +386,7 @@ export default {
                     let nkParent = dropRight(v.nk, 2)
                     let p = get(treeBlocksTemp, nkParent)
                     v.parentId = p.id
-                    v.id = `${v.parentId}.${v.text}`
+                    v.id = `${v.parentId}${dlm}${v.text}` //[tag:dlm]
                 }
                 v.order = k //需重新給予order
                 set(treeBlocksTemp, v.nk, v)
@@ -448,7 +455,7 @@ export default {
                 //gs
                 let gs = []
                 each(vo.ruleGroups, (v) => {
-                    let rules = JSON.parse(v.crules)
+                    let rules = JSON5.parse(v.crules)
                     let r = replaceObjKeys(rules, kpDiffs)
                     if (r.isChanged) {
                         gs.push({

package/src/components/VeUser.vue

@@ -153,6 +153,7 @@
 <script>
 import { mdiAccountEdit, mdiFileTree } from '@mdi/js/mdi.js'
 import Vue from 'vue'
+// import JSON5 from 'json5'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
@@ -227,9 +228,9 @@ export default {
 
             let vo = this
 
-            //rs, 此區程式碼等同於ruleGroups, 若確認後續無需求再移除
+            //rs
             let rs = map(vo.ruleGroups, (v) => {
-                // let rules = JSON.parse(v.crules)
+                // let rules = JSON5.parse(v.crules)
                 return {
                     ...v,
                     // rules,
@@ -311,8 +312,8 @@ export default {
             //mergedGroup
             let mergedGroup = {
                 id: 'merged-group',
-                name: 'merged-group',
-                crules: JSON.stringify(urs),
+                name: urs.ruleGroupsNames,
+                crules: JSON.stringify(urs.rules),
             }
 
             //mergedGroup

package/src/components/ruleGroup.vue

@@ -92,9 +92,10 @@
 
         <WTree
             :viewHeightMax="treeHeight"
-            :icon-toggle-color="'#666'"
-            :icon-toggle-background-color="'transparent'"
-            :icon-toggle-background-color-hover="'transparent'"
+            :indent="0.5"
+            :iconToggleColor="'#666'"
+            :iconToggleBackgroundColor="'transparent'"
+            :iconToggleBackgroundColorHover="'transparent'"
             :data="treeBlocks"
         >
             <template v-slot:item="props">
@@ -207,6 +208,7 @@
 
 <script>
 import { mdiEyeCheck, mdiEyeOff, mdiEyedropper, mdiEyedropperOff } from '@mdi/js/mdi.js'
+import JSON5 from 'json5'
 import get from 'lodash/get'
 import set from 'lodash/set'
 import each from 'lodash/each'
@@ -275,7 +277,7 @@ export default {
             let group = cloneDeep(vo.group)
 
             //save rules
-            let rules = JSON.parse(group.crules)
+            let rules = JSON5.parse(group.crules)
             group.rules = rules
             // console.log('rules', rules)
 
@@ -303,30 +305,6 @@ export default {
             return get(this, `$store.state.targets`)
         },
 
-        // blocks: function() {
-        //     // console.log('computed blocks')
-
-        //     let vo = this
-
-        //     //rs
-        //     let rs = map(vo.targets, (v) => {
-
-        //         //text, parentId
-        //         let s = sep(v.id, '.')
-        //         let text = get(takeRight(s), 0) //取最後節點
-        //         s = dropRight(s, 1)
-        //         let parentId = join(s, '.') //取父節點
-
-        //         return {
-        //             ...v,
-        //             parentId,
-        //             text,
-        //         }
-        //     })
-
-        //     return rs
-        // },
-
         treeBlocks: function() {
             // console.log('computed treeBlocks')
 

package/src/main.js

@@ -1,9 +1,5 @@
-import get from 'lodash/get'
-// import '@babel/polyfill' //需提供Vuetify的Symbol等API
-// import 'core-js/stable' //需提供Vuetify的Symbol等API, 官網說使用transpileDependencies但不夠, 改用之前提到的@babel/polyfill會被提示已廢棄, 改使用給webpack的polyfill方式才行
-// import 'regenerator-runtime/runtime'
-// import 'intersection-observer' //需供Vuetify的Intersection Observer, 專案內有使用v-intersect才需引入, 而w-component-vue沒用v-intersect
 import Vue from 'vue'
+import get from 'lodash/get'
 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'
@@ -14,10 +10,9 @@ import store from './store/index.mjs'
 import mVuetify from './plugins/mVuetify.mjs'
 import ui from './plugins/mUI.mjs'
 import mDataSelectorSchema from './plugins/mDataSelectorSchema.mjs'
-import mDataSupport from './plugins/mDataSupport.mjs'
+// import mDataSupport from './plugins/mDataSupport.mjs'
 import * as s from './plugins/mShare.mjs'
 import ds from './schema/index.mjs'
-// console.log('globalState', globalState)
 // console.log('ds', ds)
 
 
@@ -36,15 +31,15 @@ Vue.prototype.$alert = function() {
 //dssm
 let dssm = mDataSelectorSchema(ds)
 
-//dspt
-let dspt = mDataSupport(Vue.prototype)
+// //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.$dspt = dspt
 // Vue.prototype.$ds = ds
 Vue.prototype.$dg = {}