w-component-vue 2.2.7 → 2.2.10

package/src/components/WDrawer.vue

@@ -2,11 +2,14 @@
     <div
         style=""
         :changeValue="changeValue"
+        :changeDrawerWidth="changeDrawerWidth"
+        v-domresize
+        @domresize="updatePanelSize"
     >
 
-        <div style="position:relative; height:100%;">
+        <div ref="divPanel" style="position:relative; height:100%;">
 
-            <div style="width:100%; height:100%; display:flex;">
+            <div style="width:100%; height:100%; display:flex; overflow-x:hidden;">
 
                 <!-- 撐開區, 需使用min-width避免被壓縮 -->
                 <div
@@ -15,7 +18,7 @@
                     v-if="isAtLeft"
                 ></div>
 
-                <div style="width:100%; height:100%;">
+                <div :style="`width:100%; height:100%;`">
 
                     <slot name="content"></slot>
 
@@ -33,32 +36,48 @@
             <!-- overlay半透明灰色層 -->
             <div
                 class="ts"
-                :style="`position:${effOverlayPosition}; ${effDrawerDetectLoction} top:0px; right:0px; bottom:0px; z-index:${effDrawerZIndex}; width:${effDrawerDetectWidth}; height:100%; opacity:${effOverlayOpacity}; background:${effOverlayColor};`"
+                :style="`position:${useOverlayPosition}; ${useDrawerDetectLoction} top:0px; bottom:0px; z-index:${useDrawerZIndex+1}; width:${useDrawerDetectWidth}; height:100%; opacity:${useOverlayOpacity}; background:${useOverlayColor};`"
                 v-if="showOverlay1Basic"
             >
             </div>
 
             <!-- overlay關閉事件監聽層, 與隱藏內層之向外陰影 -->
             <div
-                :style="`position:${effOverlayPosition}; ${effDrawerDetectLoction} top:0px; right:0px; bottom:0px; z-index:${effDrawerZIndex+1}; width:${effDrawerDetectWidth}; height:100%; overflow:hidden;`"
+                :style="`position:${useOverlayPosition}; ${useDrawerDetectLoction} top:0px; bottom:0px; z-index:${useDrawerZIndex+2}; width:${useDrawerDetectWidth}; height:100%; overflow:hidden;`"
                 @click="(ev)=>{ckToggle(ev,false)}"
                 v-show="showOverlay2Detect"
             >
 
                 <!-- drawer平移層 -->
                 <div
-                    _class="ts"
                     :style="`height:100%; display:flex; justify-content:${ isAtLeft ? 'start' : 'end' };`"
-                    _v-show="showOverlay4Translate"
                 >
 
                     <div
                         ref="divDrawer"
-                        :class="`ts ${effDrawerClassShadow}`"
-                        :style="`width:${drawerWidth}px; height:100%; background:#fff; transform:translateX(${effDrawerTranslateX}%);`"
+                        :class="`ts ${useDrawerClassShadow}`"
+                        :style="`width:${useDrawerWidthTrans}px; height:100%; background:#fff; transform:translateX(${useDrawerTranslateX}%);`"
                     >
 
-                        <slot name="drawer"></slot>
+                        <div
+                            class="ts"
+                            :style="`width:${useDrawerWidthTrans}px; height:100%; display:flex;`"
+                        >
+
+                            <div :style="`padding-left:${drawerBarSize/2}px;`" v-if="dragDrawerWidth && !isAtLeft"></div>
+
+                            <div
+                                class="ts"
+                                :style="`width:${useDrawerWidthTrans-drawerBarSize/2}px;`"
+                            >
+
+                                <slot name="drawer"></slot>
+
+                            </div>
+
+                            <div :style="`padding-left:${drawerBarSize/2}px;`" v-if="dragDrawerWidth && isAtLeft"></div>
+
+                        </div>
 
                     </div>
 
@@ -66,12 +85,30 @@
 
             </div>
 
+            <!-- 拖曳寬度bar, z-index需大於drawer區, 否則多層drawer開啟拖曳寬度bar時會被遮蔽 -->
+            <!-- 延遲至抽屜出現後才通過opacity=1顯示, 否則於浮動模式時會在外側陰影層馬上看到拖曳寬度bar, 使用者體驗不佳 -->
+            <div
+                ref="divBar"
+                :style="`position:${useOverlayPosition}; z-index:${useDrawerZIndex+3}; top:0px; ${isAtLeft?'left':'right'}:${useDrawerWidthTrans-bw/2}px; width:${bw}px; height:100%; border-left:${drawerBarBorderSize}px solid ${useDrawerBarBorderColor}; border-right:${drawerBarBorderSize}px solid ${useDrawerBarBorderColor}; opacity:${showOverlay5DragDrawerBar?1:0}; cursor:col-resize; user-select:none;`"
+                v-show="value && dragDrawerWidth"
+            >
+                <div :style="`width:${drawerBarSize}px; height:100%; background:${useDrawerBarColor};`"></div>
+            </div>
+
         </div>
 
     </div>
 </template>
 
 <script>
+import get from 'lodash/get'
+import isNumber from 'lodash/isNumber'
+import isnum from 'wsemi/src/isnum.mjs'
+import isfun from 'wsemi/src/isfun.mjs'
+import cdbl from 'wsemi/src/cdbl.mjs'
+import domGetWindowSize from 'wsemi/src/domGetWindowSize.mjs'
+import domDragBarAndScroll from 'wsemi/src/domDragBarAndScroll.mjs'
+import domResize from '../js/domResize.mjs'
 import color2hex from '../js/vuetifyColor.mjs'
 
 
@@ -79,14 +116,22 @@ import color2hex from '../js/vuetifyColor.mjs'
  * @vue-prop {Boolean} [value=false] 輸入是否顯示布林值，預設false
  * @vue-prop {String} [mode='from-left'] 輸入抽屜顯示位置字串，可使用'from-left'與'from-right'，預設'from-left'
  * @vue-prop {Number} [drawerWidth=200] 輸入抽屜寬度數字，單位為px，預設200
+ * @vue-prop {Number} [drawerWidthMin=null] 輸入使用拖曳抽屜寬度分隔條(dragDrawerWidth=true)時，拖曳抽屜寬度分隔條最小值數字，預設null
+ * @vue-prop {Number} [drawerWidthMax=null] 輸入使用拖曳抽屜寬度分隔條(dragDrawerWidth=true)時，拖曳抽屜寬度分隔條最大值數字，預設null
  * @vue-prop {Boolean} [afloat=false] 輸入是否為浮動顯示布林值，設為true時浮在內容區上故不壓縮內容區寬度，預設false
  * @vue-prop {Boolean} [afloatByFix=false] 輸入浮動顯示時是否使用fixed使能具有滿版配置布林值，預設false
  * @vue-prop {Number} [overlayOpacity=0.45] 輸入浮動顯示時抽屜外側陰影層之透明度數字，預設0.45
  * @vue-prop {String} [overlayColor='grey darken-2'] 輸入浮動顯示時抽屜外側陰影層背景顏色字串，預設'grey darken-2'
  * @vue-prop {Number} [drawerZIndex=1] 輸入浮動顯示時抽屜使用z-index數字，預設1
+ * @vue-prop {Boolean} [dragDrawerWidth=false] 輸入是否使用拖曳抽屜寬度分隔條布林值，預設false
+ * @vue-prop {String} [drawerBarColor='#ddd'] 輸入分隔條顏色字串，預設'#ddd'
+ * @vue-prop {Number} [drawerBarSize=2] 輸入分隔條尺寸數字，為分隔條寬度，單位為px，預設2
+ * @vue-prop {String} [drawerBarBorderColor='transparent'] 輸入分隔條框線顏色字串，預設'transparent'
+ * @vue-prop {Number} [drawerBarBorderSize=3] 輸入分隔條框線寬度數字，單位為px，預設3，通常配合barBorderColor='transparent'使可拖曳區加大又不遮蔽可視區
  */
 export default {
     directives: {
+        domresize: domResize(),
     },
     props: {
         value: {
@@ -101,6 +146,14 @@ export default {
             type: Number,
             default: 200,
         },
+        drawerWidthMin: {
+            type: Number,
+            default: null,
+        },
+        drawerWidthMax: {
+            type: Number,
+            default: null,
+        },
         afloat: {
             type: Boolean,
             default: false,
@@ -121,10 +174,37 @@ export default {
             type: Number,
             default: 1,
         },
+        dragDrawerWidth: {
+            type: Boolean,
+            default: false,
+        },
+        drawerBarColor: {
+            type: String,
+            default: '#ddd',
+        },
+        drawerBarSize: {
+            type: Number,
+            default: 2,
+        },
+        drawerBarBorderColor: {
+            type: String,
+            default: 'transparent',
+        },
+        drawerBarBorderSize: {
+            type: Number,
+            default: 3, //抽屜內捲軸通常是WPanelScrolly的捲軸故寬度是8px, 而拖曳寬度bar邊寬是雙向展開, 故不能超過此8px
+        },
     },
     data: function() {
         return {
 
+            panelWidth: 0,
+            panelHeight: 0,
+
+            das: null,
+
+            drawerWidthTrans: 200,
+
             timerOverlay1Basic: null,
             showOverlay1Basic: false,
             effOverlay1Basic: false,
@@ -141,8 +221,35 @@ export default {
             // showOverlay4Translate: false,
             effOverlay4Translate: false,
 
+            timerOverlay5DragDrawerBar: null,
+            showOverlay5DragDrawerBar: false,
+
         }
     },
+    mounted: function() {
+        //console.log('mounted')
+
+        let vo = this
+
+        //das
+        let das = domDragBarAndScroll(vo.$refs.divPanel, vo.$refs.divBar, { useTouchDragForPanel: false })
+        das.on('dragBar', vo.dragBar)
+
+        //save
+        vo.das = das
+
+    },
+    beforeDestroy: function() {
+        //console.log('beforeDestroy')
+
+        let vo = this
+
+        //clear
+        if (vo.das) {
+            vo.das.clear()
+        }
+
+    },
     computed: {
 
         changeValue: function () {
@@ -159,6 +266,36 @@ export default {
             return ''
         },
 
+        changeDrawerWidth: function() {
+            let vo = this
+            vo.drawerWidthTrans = vo.drawerWidth
+            return ''
+        },
+
+        useDrawerWidthTrans: function() {
+            let vo = this
+
+            //監聽drawerWidthTrans與panelWidth有變化則重算
+
+            //trigger
+            vo.___panelWidth___ = vo.panelWidth
+
+            //getPanelEffWidth
+            let dwMax = vo.getPanelEffWidth()
+            // console.log('vo.drawerWidthTrans', vo.drawerWidthTrans, 'dwMax', dwMax)
+
+            //check
+            if (isNumber(dwMax)) {
+                dwMax = Math.min(vo.drawerWidthTrans, dwMax)
+            }
+            else {
+                dwMax = vo.drawerWidthTrans
+            }
+            // console.log('dwMax', dwMax)
+
+            return dwMax
+        },
+
         virtualZoneWidth: function() {
             if (!this.value) {
                 return 0
@@ -166,14 +303,14 @@ export default {
             if (this.afloat) {
                 return 0
             }
-            return this.drawerWidth
+            return this.useDrawerWidthTrans
         },
 
         isAtLeft: function() {
             return this.mode !== 'from-right'
         },
 
-        effDrawerZIndex: function() {
+        useDrawerZIndex: function() {
             let i = this.drawerZIndex
             if (this.afloat) {
                 i += 1000
@@ -184,25 +321,25 @@ export default {
             return i
         },
 
-        effOverlayColor: function() {
+        useOverlayColor: function() {
             if (!this.afloat) {
                 return 'transparent'
             }
             return color2hex(this.overlayColor)
         },
 
-        effOverlayPosition: function() {
+        useOverlayPosition: function() {
             return this.afloatByFix ? 'fixed' : 'absolute'
         },
 
-        effOverlayOpacity: function() {
+        useOverlayOpacity: function() {
             if (!this.afloat) {
                 return 0
             }
             return this.effOverlay1Basic ? this.overlayOpacity : 0
         },
 
-        effDrawerTranslateX: function() {
+        useDrawerTranslateX: function() {
             if (this.effOverlay4Translate) {
                 return 0
             }
@@ -210,27 +347,74 @@ export default {
             return s0
         },
 
-        effDrawerDetectLoction: function() {
+        useDrawerDetectLoction: function() {
             if (this.isAtLeft) {
                 return 'left:0px;'
             }
             return 'right:0px;'
         },
 
-        effDrawerDetectWidth: function() {
+        useDrawerDetectWidth: function() {
             if (this.afloat) {
                 return '100%'
             }
-            return `${this.drawerWidth}px`
+            return `${this.useDrawerWidthTrans}px`
         },
 
-        effDrawerClassShadow: function() {
+        useDrawerClassShadow: function() {
             return this.afloat && this.showOverlay3Shadow ? 'bs' : ''
         },
 
+        bw: function() {
+            //console.log('computed changeParam')
+
+            let vo = this
+
+            return vo.drawerBarSize + vo.drawerBarBorderSize * 2
+        },
+
+        useDrawerBarColor: function() {
+            return color2hex(this.drawerBarColor)
+        },
+
+        useDrawerBarBorderColor: function() {
+            return color2hex(this.drawerBarBorderColor)
+        },
+
     },
     methods: {
 
+        updatePanelSize: function(msg) {
+            // console.log('methods updatePanelSize', msg)
+
+            let vo = this
+            if (!vo.afloatByFix) {
+                //抽屜浮動於組件panel
+
+                //update
+                vo.panelWidth = msg.snew.offsetWidth
+                vo.panelHeight = msg.snew.offsetHeight
+
+            }
+            else {
+                //抽屜浮動於body
+
+                //domGetWindowSize
+                let ws = domGetWindowSize()
+
+                //update
+                vo.panelWidth = ws.width
+                vo.panelHeight = ws.height
+
+            }
+
+            // console.log('vo.panelWidth', vo.panelWidth)
+
+            //emit
+            vo.$emit('resize', msg)
+
+        },
+
         ckToggle: function(ev, value) {
             // console.log('methods ckToggle', ev, value)
 
@@ -276,11 +460,14 @@ export default {
             clearTimeout(vo.timerOverlay2Detect)
             clearTimeout(vo.timerOverlay3Shadow)
             clearTimeout(vo.timerOverlay4Translate)
+            clearTimeout(vo.timerOverlay5DragDrawerBar)
 
             let sec
 
             //check
             if (value) {
+                //顯示
+
                 // vo.fsmShowOverlay.showOverlay()
                 // vo.fsmShowStateOverlay.showOverlay()
                 sec = 20
@@ -307,8 +494,14 @@ export default {
                     vo.effOverlay4Translate = true
                 }, sec)
 
+                vo.timerOverlay5DragDrawerBar = setTimeout(() => {
+                    vo.showOverlay5DragDrawerBar = true
+                }, 300)
+
             }
             else {
+                //隱藏
+
                 // vo.fsmShowOverlay.hideOverlay()
                 // vo.fsmShowStateOverlay.hideOverlay()
                 sec = 300
@@ -339,6 +532,8 @@ export default {
                 //     vo.showOverlay4Translate = false
                 // }, sec)
 
+                vo.showOverlay5DragDrawerBar = false
+
             }
 
             //emit
@@ -346,6 +541,138 @@ export default {
 
         },
 
+        getPanelBounding: function() {
+            // console.log('methods getPanelBounding')
+
+            let vo = this
+
+            //bd
+            let bd = null
+            if (!vo.afloatByFix) {
+                //抽屜浮動於組件panel
+
+                //getBoundingClientRect
+                let func = get(vo, '$el.getBoundingClientRect')
+                if (isfun(func)) {
+                    // bd = func() //不能執行func, 會造成非法調用Illegal invocation
+                    bd = vo.$el.getBoundingClientRect()
+                    // console.log(vo.$el.getBoundingClientRect, isfun(vo.$el.getBoundingClientRect))
+                }
+                else {
+                    // console.log('vo.$el.getBoundingClientRect is not a function')
+                    bd = {
+                        left: 0,
+                        width: 0,
+                    }
+                }
+
+            }
+            else {
+                //抽屜浮動於body
+
+                //getWindowWidth
+                let windowWidth = get(domGetWindowSize(), 'width')
+
+                bd = {
+                    left: 0,
+                    width: windowWidth,
+                }
+
+            }
+
+            return bd
+        },
+
+        getPanelEffWidth: function() {
+            // console.log('methods getPanelEffWidth')
+
+            let vo = this
+
+            //effWidth
+            let effWidth = null
+            if (!vo.afloatByFix) {
+                //抽屜浮動於組件panel
+
+                //offsetWidth, 若於mounted之前呼叫因無$el, 故會回傳null
+                effWidth = get(vo, '$el.offsetWidth', null)
+                // console.log('vo.$el.offsetWidth', vo.$el.offsetWidth, 'effWidth', effWidth)
+
+            }
+            else {
+                //抽屜浮動於body
+
+                //getWindowWidth
+                effWidth = get(domGetWindowSize(), 'width')
+
+            }
+            // console.log('effWidth', effWidth)
+
+            return effWidth
+        },
+
+        dragBar: function({ clientX }) {
+            // console.log('methods dragBar', clientX)
+
+            let vo = this
+
+            //check dragDrawerWidth
+            if (!vo.dragDrawerWidth) {
+                return
+            }
+
+            //check value
+            if (!vo.value) {
+                return
+            }
+
+            //bd
+            let bd = vo.getPanelBounding()
+
+            //x
+            let x = clientX
+
+            //dw
+            let dw = null
+            if (vo.isAtLeft) {
+                //抽屜在左
+                dw = x - bd.left
+            }
+            else {
+                //抽屜在右
+                dw = bd.width - (x - bd.left)
+            }
+            // console.log(bd, 'x', x, 'dw', dw)
+
+            //dwMax
+            let dwMax = vo.getPanelEffWidth()
+            if (isnum(vo.drawerWidthMax)) {
+                dwMax = cdbl(vo.drawerWidthMax)
+            }
+            // console.log('dwMax', dwMax)
+
+            //dwMin
+            let dwMin = 0
+            if (isnum(vo.drawerWidthMin)) {
+                dwMin = cdbl(vo.drawerWidthMin)
+            }
+
+            //min, max
+            if (isNumber(dwMax)) {
+                dw = Math.min(dw, dwMax)
+            }
+            if (isNumber(dwMin)) {
+                dw = Math.max(dw, dwMin)
+            }
+
+            //update
+            vo.drawerWidthTrans = dw
+            // console.log('dw', dw)
+
+            //emit
+            vo.$emit('update:drawerWidth', dw)
+
+        },
+
     },
 }
 </script>

package/src/components/WImageCascadingDyn.vue

@@ -602,7 +602,7 @@ export default {
     margin: 0;
     padding: 0;
     display: block;
-    background-color: transparent;
+    background: transparent;
     border-style: none;
 }
 .inp:focus {

package/src/components/WListExpandItem.vue

@@ -37,7 +37,7 @@
                         v-if="hasIcon"
                     ></WIcon>
 
-                    <div :style="`color:${useTextColor}; ${useTextFontSize}`">
+                    <div :style="`transition:all 0.3s; color:${useTextColor}; ${useTextFontSize}`">
                         {{text}}
                     </div>
 

package/src/components/WListVerticalItem.vue

@@ -21,7 +21,7 @@
                     v-if="hasIcon"
                 ></WIcon>
 
-                <div :style="`color:${useTextColor}; ${useTextFontSize}`">
+                <div :style="`transition:all 0.3s; color:${useTextColor}; ${useTextFontSize}`">
                     {{text}}
                 </div>
 

package/src/components/WPanelDivideHorizontal.vue

@@ -21,9 +21,9 @@
 
             <div
                 ref="divBar"
-                :style="`position:absolute; z-index:1; left:${(r)*panelWidth-bw/2}px; width:${bw}px; height:${panelHeight}px; border-left:${barBorderSize}px solid ${barBorderColor}; border-right:${barBorderSize}px solid ${barBorderColor}; cursor:col-resize; user-select:none;`"
+                :style="`position:absolute; z-index:1; left:${(r)*panelWidth-bw/2}px; width:${bw}px; height:${panelHeight}px; border-left:${barBorderSize}px solid ${useBarBorderColor}; border-right:${barBorderSize}px solid ${useBarBorderColor}; cursor:col-resize; user-select:none;`"
             >
-                <div :style="`width:${barSize}px; height:${panelHeight}px; background-color:${barColor};`"></div>
+                <div :style="`width:${barSize}px; height:${panelHeight}px; background:${useBarColor};`"></div>
             </div>
 
             <div ref="right" :style="`width:${(1-r)*panelWidth}px; height:${panelHeight}px;`">
@@ -43,6 +43,7 @@
 <script>
 import domDragBarAndScroll from 'wsemi/src/domDragBarAndScroll.mjs'
 import domResize from '../js/domResize.mjs'
+import color2hex from '../js/vuetifyColor.mjs'
 
 
 /**
@@ -50,8 +51,8 @@ import domResize from '../js/domResize.mjs'
  * @vue-prop {Number} [min=0] 輸入分隔條位置最小比例數字，範圍為0~1，需小於max，若min大於max則由min主導，預設0
  * @vue-prop {Number} [max=1] 輸入分隔條位置最大比例數字，範圍為0~1，需大於min，若min大於max則由min主導，預設1
  * @vue-prop {String} [barColor='#ddd'] 輸入分隔條顏色字串，預設'#ddd'
- * @vue-prop {String} [barBorderColor='transparent'] 輸入分隔條框線顏色字串，預設'transparent'
  * @vue-prop {Number} [barSize=2] 輸入分隔條尺寸數字，為分隔條寬度，單位為px，預設2
+ * @vue-prop {String} [barBorderColor='transparent'] 輸入分隔條框線顏色字串，預設'transparent'
  * @vue-prop {Number} [barBorderSize=3] 輸入分隔條框線寬度數字，單位為px，預設3，通常配合barBorderColor='transparent'使可拖曳區加大又不遮蔽可視區
  */
 export default {
@@ -75,14 +76,14 @@ export default {
             type: String,
             default: '#ddd',
         },
-        barBorderColor: {
-            type: String,
-            default: 'transparent',
-        },
         barSize: {
             type: Number,
             default: 2,
         },
+        barBorderColor: {
+            type: String,
+            default: 'transparent',
+        },
         barBorderSize: {
             type: Number,
             default: 3,
@@ -148,6 +149,14 @@ export default {
             return vo.barSize + vo.barBorderSize * 2
         },
 
+        useBarColor: function() {
+            return color2hex(this.barColor)
+        },
+
+        useBarBorderColor: function() {
+            return color2hex(this.barBorderColor)
+        },
+
     },
     methods: {
 

package/src/components/WPanelDivideVertical.vue

@@ -21,9 +21,9 @@
 
             <div
                 ref="divBar"
-                :style="`position:absolute; z-index:1; top:${(r)*panelHeight-bw/2}px; width:${panelWidth}px; height:${barSize}px; border-top:${barBorderSize}px solid ${barBorderColor}; border-bottom:${barBorderSize}px solid ${barBorderColor}; cursor:row-resize; user-select:none;`"
+                :style="`position:absolute; z-index:1; top:${(r)*panelHeight-bw/2}px; width:${panelWidth}px; height:${barSize}px; border-top:${barBorderSize}px solid ${useBarBorderColor}; border-bottom:${barBorderSize}px solid ${useBarBorderColor}; cursor:row-resize; user-select:none;`"
             >
-                <div :style="`width:${panelWidth}px; height:${barSize}px; background-color:${barColor};`"></div>
+                <div :style="`width:${panelWidth}px; height:${barSize}px; background:${useBarColor};`"></div>
             </div>
 
             <div ref="bottom" :style="`width:${panelWidth}px; height:${(1-r)*panelHeight}px;`">
@@ -43,6 +43,7 @@
 <script>
 import domDragBarAndScroll from 'wsemi/src/domDragBarAndScroll.mjs'
 import domResize from '../js/domResize.mjs'
+import color2hex from '../js/vuetifyColor.mjs'
 
 
 /**
@@ -148,6 +149,14 @@ export default {
             return vo.barSize + vo.barBorderSize * 2
         },
 
+        useBarColor: function() {
+            return color2hex(this.barColor)
+        },
+
+        useBarBorderColor: function() {
+            return color2hex(this.barBorderColor)
+        },
+
     },
     methods: {