w-component-vue 2.2.40 → 2.2.41

package/docs/module-WTextIntCore.html

@@ -278,7 +278,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTextSelect.html

@@ -434,7 +434,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTextSuggest.html

@@ -464,7 +464,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTextSuggestCore.html

@@ -368,7 +368,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTextarea.html

@@ -218,7 +218,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeday.html

@@ -338,7 +338,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimedayCore.html

@@ -230,7 +230,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimedayRange.html

@@ -350,7 +350,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimedayRangeCore.html

@@ -242,7 +242,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminute.html

@@ -380,7 +380,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteCore.html

@@ -272,7 +272,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteRange.html

@@ -392,7 +392,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteRangeCore.html

@@ -284,7 +284,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTinymceVueDyn.html

@@ -224,7 +224,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTree.html

@@ -626,7 +626,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTreeIconCheckbox.html

@@ -248,7 +248,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTreeIconToggle.html

@@ -224,7 +224,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/vuetifyColor.mjs.html

@@ -144,7 +144,7 @@ export default color2hex
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Mon Aug 15 2022 17:23:34 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 3.6.10</a> on Mon Aug 15 2022 20:29:40 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-component-vue",
-  "version": "2.2.40",
+  "version": "2.2.41",
   "main": "dist/w-component-vue.umd.js",
   "dependencies": {
     "@mdi/js": "^7.0.96",

package/src/AppZoneWExplorer.vue

@@ -705,8 +705,10 @@
                 ></demolink>
 
                 <div>
-                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleTreeFoldersAll(true)">show all</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleTreeFoldersAll(true)">display all</v-btn>
                     <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleTreeFoldersAll(false)">hide all</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleTreeFoldersAll(null,1)">display to level1</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleTreeFoldersAll(null,2)">display to level2</v-btn>
                 </div>
 
                 <w-explorer
@@ -843,7 +845,6 @@
                 </div>
 
                 <w-explorer
-                    ref="we_triggerClickTreeFolderByFun"
                     style="width:600px; height:250px;"
                     :items="WExplorer.fps1"
                     :funSortTree="WExplorer.funSortTree"
@@ -1516,13 +1517,13 @@ export default {
             })
 
         },
-        toggleTreeFoldersAll: function(toUnfolding) {
-            console.log('toggleTreeFoldersAll', toUnfolding)
+        toggleTreeFoldersAll: function(toUnfolding, toLevel) {
+            console.log('toggleTreeFoldersAll', toUnfolding, toLevel)
 
             let vo = this
 
             //toggleTreeFoldersAll
-            vo.$refs.ref_toggleTreeFoldersAll.toggleTreeFoldersAll(toUnfolding)
+            vo.$refs.ref_toggleTreeFoldersAll.toggleTreeFoldersAll(toUnfolding, toLevel)
 
         },
         ckTriggerClickTreeFolderById: function(treeItemId) {

package/src/AppZoneWTree.vue

@@ -167,8 +167,10 @@
                 ></demolink>
 
                 <div>
-                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleItemsAll(true)">show all</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleItemsAll(true)">display all</v-btn>
                     <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleItemsAll(false)">hide all</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleItemsAll(null,1)">display to level1</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="toggleItemsAll(null,2)">display to level2</v-btn>
                 </div>
 
                 <w-tree
@@ -1658,13 +1660,13 @@ export default {
             })
 
         },
-        toggleItemsAll: function(toUnfolding) {
-            console.log('toggleItemsAll', toUnfolding)
+        toggleItemsAll: function(toUnfolding, toLevel) {
+            console.log('toggleItemsAll', toUnfolding, toLevel)
 
             let vo = this
 
             //toggleItemsAll
-            vo.$refs.ref_toggleItemsAll.toggleItemsAll(toUnfolding)
+            vo.$refs.ref_toggleItemsAll.toggleItemsAll(toUnfolding, toLevel)
 
         },
     },

package/src/components/WExplorer.vue

@@ -1136,12 +1136,12 @@ export default {
             return vo.$refs.wt.toggleItemsByFun(cb)
         },
 
-        toggleTreeFoldersAll: function(toUnfolding) {
-            // console.log('methods toggleTreeFoldersAll', toUnfolding)
+        toggleTreeFoldersAll: function(toUnfolding, toLevel) {
+            // console.log('methods toggleTreeFoldersAll', toUnfolding, toLevel)
 
             let vo = this
 
-            return vo.$refs.wt.toggleItemsAll(toUnfolding)
+            return vo.$refs.wt.toggleItemsAll(toUnfolding, toLevel)
         },
 
         triggerClickTreeFolderById: function(id) {

package/src/components/WTree.vue

@@ -67,7 +67,7 @@
                                     :iconColor="iconToggleColor"
                                     :iconBackgroundColor="iconToggleBackgroundColor"
                                     :iconBackgroundColorHover="iconToggleBackgroundColorHover"
-                                    @click.stop="toggleItems(props.row)"
+                                    @click.stop="toggleItems(props.row, null)"
                                 ></WTreeIconToggle>
                             </div>
 
@@ -1602,9 +1602,10 @@ export default {
             let vo = this
 
             //unfolding parents
-            let level = -1
+            let level = 1e20
             let rs = []
             for (let i = ind; i >= 0; i--) {
+                // console.log('i', i)
 
                 //levelNow
                 let levelNow = get(items, `${i}.row.item.level`, null)
@@ -1614,8 +1615,8 @@ export default {
                 }
 
                 //check
-                if (level !== levelNow) {
-                    // console.log('get level', levelNow, items[i])
+                if (level > levelNow) {
+                    // console.log('get level', levelNow, items[i].row.item.text)
 
                     //ind
                     let ind = get(items, `${i}.row.index`, null)
@@ -1626,6 +1627,7 @@ export default {
 
                     //push, 紀錄需展開之父層節點編號(含自己)
                     rs.push(ind)
+                    // console.log('rs', rs)
 
                     //update
                     level = levelNow
@@ -1643,7 +1645,9 @@ export default {
             rs = reverse(rs)
 
             //dropRight, 剔除自己
+            // console.log('rs1', cloneDeep(rs))
             rs = dropRight(rs)
+            // console.log('rs2', cloneDeep(rs))
 
             //由頂層往下依序展開
             each(rs, (ind) => {
@@ -1682,7 +1686,7 @@ export default {
 
                         //toggleItemsCore
                         each(items, (v, k) => {
-                            if ((v.row.item.level + 1) > l && v.row.unfolding) {
+                            if (v.row.item.level >= l && v.row.unfolding) {
                                 vo.toggleItemsCore(items, k, false) //非指定層數則隱藏
                             }
                         })
@@ -1705,22 +1709,38 @@ export default {
 
         },
 
-        toggleItemsAllCore: function(items, toUnfolding) {
-            // console.log('methods toggleItemsAllCore', items, toUnfolding)
+        toggleItemsAllCore: function(items, toUnfolding, toLevel = 0) {
+            // console.log('methods toggleItemsAllCore', items, toUnfolding, toLevel)
 
             let vo = this
 
+            //check, 若指定level小於0則使用預設值0
+            if (toLevel < 0) {
+                toLevel = 0
+            }
+            // console.log('toLevel', toLevel)
+
+            //check, 若指定level大於0, 則代表是指定顯示至level而其下節點皆隱藏, 故toUnfolding=false
+            if (toLevel > 0) {
+                toUnfolding = false
+            }
+            // console.log('toUnfolding', toUnfolding)
+
             //toggleItemsCore
             each(items, (v, k) => {
-                if (v.row.unfolding !== toUnfolding) {
-                    vo.toggleItemsCore(items, k, toUnfolding)
+                // console.log(`v.row.item.level`, v.row.item.level, `v.row.unfolding[${v.row.unfolding}] !== toUnfolding[${toUnfolding}]`, v.row.unfolding !== toUnfolding)
+                if (v.row.item.level >= toLevel && (v.row.unfolding !== toUnfolding)) {
+                    vo.toggleItemsCore(items, k, toUnfolding) //大於等於指定層且與指定顯隱不同, 則切換
+                }
+                else if (v.row.item.level < toLevel && (v.row.unfolding !== (!toUnfolding))) {
+                    vo.toggleItemsCore(items, k, !toUnfolding) //大於等於指定層且與指定顯隱不同, 則切換
                 }
             })
 
         },
 
-        toggleItemsAll: function(toUnfolding) {
-            // console.log('methods toggleItemsAll', toUnfolding)
+        toggleItemsAll: function(toUnfolding, toLevel = 0) {
+            // console.log('methods toggleItemsAll', toUnfolding, toLevel)
 
             let vo = this
 
@@ -1737,7 +1757,7 @@ export default {
                         // console.log('items', cloneDeep(items))
 
                         //toggleItemsAllCore
-                        vo.toggleItemsAllCore(items, toUnfolding)
+                        vo.toggleItemsAllCore(items, toUnfolding, toLevel)
 
                     }
                 }