w-component-vue 2.4.38 → 2.4.39

package/docs/module-WTimedayRange.html

@@ -527,7 +527,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimedayRangeCore.html

@@ -311,7 +311,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminute.html

@@ -587,7 +587,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteCore.html

@@ -371,7 +371,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteRange.html

@@ -611,7 +611,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteRangeCore.html

@@ -395,7 +395,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTinymceVueDyn.html

@@ -251,7 +251,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTooltip.html

@@ -443,7 +443,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTree.html

@@ -1487,7 +1487,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTreeIconCheckbox.html

@@ -299,7 +299,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTreeIconToggle.html

@@ -275,7 +275,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WVditorDyn.html

@@ -323,7 +323,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Dec 14 2025 19:16:21 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 Tue Dec 16 2025 20:33:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "w-component-vue",
-  "version": "2.4.38",
+  "version": "2.4.39",
   "main": "dist/w-component-vue.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.8.34"
+    "wsemi": "^1.8.37"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",

package/src/AppZoneWTree.vue

@@ -278,6 +278,27 @@
             </div>
 
 
+            <div class="bk">
+                <demolink
+                    :kbname="'w-tree'"
+                    :casename="'filterByFun'"
+                ></demolink>
+
+                <div>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="filterByFun('all')">display all</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="filterByFun('abr')">filter by abr in text</v-btn>
+                    <v-btn style="margin:0px 5px 5px 0px;" small @click="filterByFun('id=15')">filter by id=15</v-btn>
+                </div>
+
+                <w-tree
+                    ref="ref_filterByFun"
+                    style="width:350px; border:1px solid #ddd;"
+                    :data="WTree.option.items"
+                ></w-tree>
+
+            </div>
+
+
             <div class="bk">
                 <demolink
                     :kbname="'w-tree'"
@@ -1542,6 +1563,7 @@ export default {
                 'viewHeightMaxSync': 400,
                 'option': {
                     keywords: 'abr care att',
+                    // selections: [],
                     selections: [
                         { 'id': 5 },
                         { 'id': 9 },
@@ -1894,6 +1916,22 @@ export default {
             ],
         }
     },
+    mounted: function() {
+        let vo = this
+
+        // setTimeout(() => {
+
+        //     vo.WTree.option.selections = [
+        //         { 'id': 5 },
+        //         { 'id': 9 },
+        //         { 'id': 18 },
+        //     ]
+        //     console.log('vo.WTree.option.items', vo.WTree.option.items)
+        //     console.log('vo.WTree.option.selections', vo.WTree.option.selections)
+
+        // }, 2000)
+
+    },
     methods: {
         showSelection: function(selections) {
             let ss = {}
@@ -2001,12 +2039,14 @@ export default {
         },
         funFilter: function(item, kws) {
             console.log('funFilter', item, kws)
+
             let c = item.text.toLowerCase()
             let b = false
             for (let i = 0; i < kws.length; i++) {
                 let kw = kws[i]
                 b = b || c.indexOf(kw) >= 0
             }
+
             return b
         },
         toggleItemsByFun: function(ind, toUnfolding) {
@@ -2015,13 +2055,14 @@ export default {
             let vo = this
 
             //toggleItemsByFun
-            vo.$refs.ref_toggleItemsByFun.toggleItemsByFun((rows) => {
-                console.log('toggleItemsByFun rows', rows)
+            let cb = (rows) => {
+                console.log('toggleItemsByFun cb rows', rows)
                 return {
                     row: rows[ind],
                     toUnfolding,
                 }
-            })
+            }
+            vo.$refs.ref_toggleItemsByFun.toggleItemsByFun(cb)
 
         },
         toggleItemsAll: function(toUnfolding, toLevel) {
@@ -2033,6 +2074,29 @@ export default {
             vo.$refs.ref_toggleItemsAll.toggleItemsAll(toUnfolding, toLevel)
 
         },
+        filterByFun: function(mode) {
+            console.log('filterByFun', mode)
+
+            let vo = this
+
+            //filterByFun
+            let cb = async(item) => {
+                console.log('filterByFun cb item', item)
+                if (mode === 'all') {
+                    return true
+                }
+                else if (mode.indexOf('id=') >= 0) {
+                    let id = mode.replace('id=', '')
+                    id = parseInt(id)
+                    return item.id === id
+                }
+                else {
+                    return item.text.indexOf(mode) >= 0
+                }
+            }
+            vo.$refs.ref_filterByFun.filterByFun(cb)
+
+        },
     },
 }
 </script>

package/src/components/WTree.vue

@@ -1070,8 +1070,8 @@ export default {
             //save
             vo.filterKeywordsTrans = vo.filterKeywords
 
-            //filterKeyWordsDebounce
-            vo.filterKeyWordsDebounce()
+            //filterByKeywordsDebounce
+            vo.filterByKeywordsDebounce()
 
             return ''
         },
@@ -1364,7 +1364,7 @@ export default {
 
                 //filterKeywordsTransTemp
                 vo.filterKeywordsTransTemp = '' //需清空之前暫存關鍵字才能重新搜尋
-                vo.filterKeyWords()
+                vo.filterByKeywords()
 
             }
 
@@ -2610,20 +2610,23 @@ export default {
 
         },
 
-        filterKeyWordsCore: async function(items) {
-            // console.log('methods filterKeyWordsCore', items)
+        filterItemsCore: async function(items, funFilterForce) {
+            // console.log('methods filterItemsCore', items, funFilterForce)
 
             let vo = this
 
+            //bFunFilterForce
+            let bFunFilterForce = isfun(funFilterForce)
+
             //check useDraggableOrOperatable
-            if (vo.useDraggableOrOperatable) {
+            if (!bFunFilterForce && vo.useDraggableOrOperatable) {
                 // console.log('禁止過濾')
-                return Promise.resolve()
+                return
             }
 
             //check filterKeywordsTransTemp
-            if (vo.filterKeywordsTransTemp === vo.filterKeywordsTrans) {
-                return Promise.resolve()
+            if (!bFunFilterForce && vo.filterKeywordsTransTemp === vo.filterKeywordsTrans) {
+                return
             }
 
             //filterKeywordsTransTemp
@@ -2633,7 +2636,7 @@ export default {
             let searchingResults = 0 //儲存全部關鍵字是否有找到至少一個項目
 
             //check
-            if (size(vo.filterKeywordsTrans) === 0) {
+            if (!bFunFilterForce && size(vo.filterKeywordsTrans) === 0) {
 
                 //預設可見
                 for (let i = 0; i < items.length; i++) {
@@ -2656,8 +2659,20 @@ export default {
                     //預設不可見
                     let b = false
 
-                    //filter
-                    if (isfun(vo.funFilter)) {
+                    if (bFunFilterForce) {
+                        //使用強制函數過濾器
+
+                        //funFilterForce
+                        b = funFilterForce(items[i].row.item)
+
+                        //check
+                        if (ispm(b)) {
+                            b = await b
+                        }
+
+                    }
+                    else if (isfun(vo.funFilter)) {
+                        //使用函數過濾器
 
                         //funFilter
                         b = vo.funFilter(items[i].row.item, kws)
@@ -2669,6 +2684,7 @@ export default {
 
                     }
                     else {
+                        //使用內建關鍵字過濾器
 
                         //預設取得項目文字供關鍵字過濾
                         let c = vo.getText(items[i].row.item)
@@ -2733,8 +2749,8 @@ export default {
             return searchingResults
         },
 
-        filterKeyWords: function() {
-            // console.log('methods filterKeyWords')
+        filterItems: function(cb) {
+            // console.log('methods filterItems', cb)
 
             let vo = this
 
@@ -2758,8 +2774,8 @@ export default {
                 let opt = {
                     fun: async function(items) {
 
-                        //filterKeyWordsCore
-                        searchingResults = await vo.filterKeyWordsCore(items)
+                        //filterItemsCore
+                        searchingResults = await vo.filterItemsCore(items, cb)
 
                     }
                 }
@@ -2790,16 +2806,36 @@ export default {
 
         },
 
-        filterKeyWordsDebounce: function() {
-            //console.log('methods filterKeyWordsDebounce')
+        filterByFun: function(cb) {
+            // console.log('methods filterByFun')
+
+            let vo = this
+
+            //filterItems
+            vo.filterItems(cb)
+
+        },
+
+        filterByKeywords: function() {
+            // console.log('methods filterByKeywords')
+
+            let vo = this
+
+            //filterItems
+            vo.filterItems()
+
+        },
+
+        filterByKeywordsDebounce: function() {
+            //console.log('methods filterByKeywordsDebounce')
 
             let vo = this
 
             //dbc
             vo.dbc(() => {
 
-                //filterKeyWords
-                vo.filterKeyWords()
+                //filterByKeywords
+                vo.filterByKeywords()
 
             })