w-component-vue 2.3.46 → 2.3.48

package/docs/module-WTimedayRange.html

@@ -503,7 +503,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimedayRangeCore.html

@@ -287,7 +287,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminute.html

@@ -563,7 +563,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteCore.html

@@ -347,7 +347,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteRange.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 Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTimeminuteRangeCore.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 Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 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 Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-WTooltip.html

@@ -431,7 +431,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 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 Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 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 Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 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 Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:49 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/vuetifyColor.mjs.html

@@ -147,7 +147,7 @@ export default color2hex
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 30 2023 15:51:25 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 Sat Nov 04 2023 15:26:48 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.3.46",
+  "version": "2.3.48",
   "main": "dist/w-component-vue.umd.js",
   "dependencies": {
     "@mdi/js": "^7.2.96",

package/src/AppZoneWInputCheckbox.vue

@@ -52,21 +52,6 @@
             </div>
 
 
-            <div class="bk">
-                <demolink
-                    :kbname="'w-input-checkbox'"
-                    :casename="'marginStyle'"
-                ></demolink>
-
-                <w-input-checkbox
-                    :items="WInputCheckbox.object.items"
-                    v-model="WInputCheckbox.object.selects"
-                    :marginStyle="{top:5,right:0,bottom:5,left:0}"
-                ></w-input-checkbox>
-
-            </div>
-
-
             <div class="bk">
                 <demolink
                     :kbname="'w-input-checkbox'"
@@ -76,7 +61,7 @@
                 <w-input-checkbox
                     :items="WInputCheckbox.object.items"
                     v-model="WInputCheckbox.object.selects"
-                    :paddingStyle="{top:5,right:0,bottom:5,left:0}"
+                    :paddingStyle="{top:0,right:0,bottom:5,left:0}"
                 ></w-input-checkbox>
 
             </div>
@@ -85,14 +70,14 @@
             <div class="bk">
                 <demolink
                     :kbname="'w-input-checkbox'"
-                    :casename="'arrange & marginStyle'"
+                    :casename="'arrange & paddingStyle'"
                 ></demolink>
 
                 <w-input-checkbox
                     :items="WInputCheckbox.object.items"
                     v-model="WInputCheckbox.object.selects"
                     :arrange="'horizontal'"
-                    :marginStyle="{top:0,right:10,bottom:0,left:0}"
+                    :paddingStyle="{top:0,right:10,bottom:0,left:0}"
                 ></w-input-checkbox>
 
             </div>
@@ -101,14 +86,14 @@
             <div class="bk">
                 <demolink
                     :kbname="'w-input-checkbox'"
-                    :casename="'arrange & paddingStyle'"
+                    :casename="'textFontSize & paddingStyle'"
                 ></demolink>
 
                 <w-input-checkbox
                     :items="WInputCheckbox.object.items"
                     v-model="WInputCheckbox.object.selects"
-                    :arrange="'horizontal'"
-                    :paddingStyle="{top:0,right:10,bottom:0,left:0}"
+                    :textFontSize="'0.75rem'"
+                    :paddingStyle="{top:0,right:0,bottom:5,left:0}"
                 ></w-input-checkbox>
 
             </div>
@@ -134,7 +119,7 @@
             <div class="bk">
                 <demolink
                     :kbname="'w-input-checkbox'"
-                    :casename="'slot & paddingStyle & verticalAlign & inputHeight'"
+                    :casename="'slot & paddingStyle & verticalAlign & inputSize & inputShiftTop'"
                 ></demolink>
 
                 <w-input-checkbox
@@ -142,7 +127,8 @@
                     v-model="WInputCheckbox.object.selects"
                     :paddingStyle="{top:5,right:0,bottom:5,left:0}"
                     :verticalAlign="'top'"
-                    :inputHeight="22"
+                    :inputSize="18"
+                    :inputShiftTop="2"
                 >
                     <template v-slot="props">
                         <div style="padding-left:8px; cursor:pointer;">
@@ -156,7 +142,7 @@
                                     :color="props.isActive?'#3949AB':props.isHover?'#7E57C2':'#aaa'"
                                 ></w-icon>
 
-                                <div style="font-size:0.9rem;">
+                                <div :style="`font-size:0.9rem; color:${props.isActive?'#5E35B1':'#666'};`">
                                     {{props.item.data.text}}
                                 </div>
 
@@ -164,7 +150,7 @@
 
                             <div style="padding-left:26px;">
 
-                                <div style="font-size:0.7rem; color:#999;">
+                                <div :style="`font-size:0.7rem; color:${props.isActive?'#EC407A':'#999'};`">
                                     {{props.item.data.dsp}}
                                 </div>
 
@@ -192,6 +178,22 @@
             </div>
 
 
+            <div class="bk">
+                <demolink
+                    :kbname="'w-input-checkbox'"
+                    :casename="'not editable & textColorDisabled'"
+                ></demolink>
+
+                <w-input-checkbox
+                    :items="WInputCheckbox.object.items"
+                    v-model="WInputCheckbox.object.selects"
+                    :editable="false"
+                    :textColorDisabled="'#FFB74D'"
+                ></w-input-checkbox>
+
+            </div>
+
+
         </div>
 
 

package/src/AppZoneWInputRadio.vue

@@ -52,21 +52,6 @@
             </div>
 
 
-            <div class="bk">
-                <demolink
-                    :kbname="'w-input-radio'"
-                    :casename="'marginStyle'"
-                ></demolink>
-
-                <w-input-radio
-                    :items="WInputRadio.object.items"
-                    v-model="WInputRadio.object.select"
-                    :marginStyle="{top:5,right:0,bottom:5,left:0}"
-                ></w-input-radio>
-
-            </div>
-
-
             <div class="bk">
                 <demolink
                     :kbname="'w-input-radio'"
@@ -76,7 +61,7 @@
                 <w-input-radio
                     :items="WInputRadio.object.items"
                     v-model="WInputRadio.object.select"
-                    :paddingStyle="{top:5,right:0,bottom:5,left:0}"
+                    :paddingStyle="{top:0,right:0,bottom:5,left:0}"
                 ></w-input-radio>
 
             </div>
@@ -85,14 +70,14 @@
             <div class="bk">
                 <demolink
                     :kbname="'w-input-radio'"
-                    :casename="'arrange & marginStyle'"
+                    :casename="'arrange & paddingStyle'"
                 ></demolink>
 
                 <w-input-radio
                     :items="WInputRadio.object.items"
                     v-model="WInputRadio.object.select"
                     :arrange="'horizontal'"
-                    :marginStyle="{top:0,right:10,bottom:0,left:0}"
+                    :paddingStyle="{top:0,right:10,bottom:0,left:0}"
                 ></w-input-radio>
 
             </div>
@@ -101,14 +86,14 @@
             <div class="bk">
                 <demolink
                     :kbname="'w-input-radio'"
-                    :casename="'arrange & paddingStyle'"
+                    :casename="'textFontSize & paddingStyle'"
                 ></demolink>
 
                 <w-input-radio
                     :items="WInputRadio.object.items"
                     v-model="WInputRadio.object.select"
-                    :arrange="'horizontal'"
-                    :paddingStyle="{top:0,right:10,bottom:0,left:0}"
+                    :textFontSize="'0.75rem'"
+                    :paddingStyle="{top:0,right:0,bottom:5,left:0}"
                 ></w-input-radio>
 
             </div>
@@ -134,7 +119,7 @@
             <div class="bk">
                 <demolink
                     :kbname="'w-input-radio'"
-                    :casename="'slot & paddingStyle & verticalAlign & inputHeight'"
+                    :casename="'slot & paddingStyle & verticalAlign & inputSize & inputShiftTop'"
                 ></demolink>
 
                 <w-input-radio
@@ -142,7 +127,8 @@
                     v-model="WInputRadio.object.select"
                     :paddingStyle="{top:5,right:0,bottom:5,left:0}"
                     :verticalAlign="'top'"
-                    :inputHeight="22"
+                    :inputSize="18"
+                    :inputShiftTop="2"
                 >
                     <template v-slot="props">
                         <div style="padding-left:8px; cursor:pointer;">
@@ -156,7 +142,7 @@
                                     :color="props.isActive?'#3949AB':props.isHover?'#7E57C2':'#aaa'"
                                 ></w-icon>
 
-                                <div style="font-size:0.9rem;">
+                                <div :style="`font-size:0.9rem; color:${props.isActive?'#5E35B1':'#666'};`">
                                     {{props.item.data.text}}
                                 </div>
 
@@ -164,7 +150,7 @@
 
                             <div style="padding-left:26px;">
 
-                                <div style="font-size:0.7rem; color:#999;">
+                                <div :style="`font-size:0.7rem; color:${props.isActive?'#EC407A':'#999'};`">
                                     {{props.item.data.dsp}}
                                 </div>
 
@@ -192,6 +178,22 @@
             </div>
 
 
+            <div class="bk">
+                <demolink
+                    :kbname="'w-input-radio'"
+                    :casename="'not editable & textColorDisabled'"
+                ></demolink>
+
+                <w-input-radio
+                    :items="WInputRadio.object.items"
+                    v-model="WInputRadio.object.select"
+                    :editable="false"
+                    :textColorDisabled="'#FFB74D'"
+                ></w-input-radio>
+
+            </div>
+
+
         </div>
 
 

package/src/components/WDrawer.vue

@@ -7,14 +7,14 @@
         @domresize="resizePanel"
     >
 
-        <!-- 因拖曳寬度bar現放置於divPanel下並且浮動定位, 左右側之拖曳區會超出divPanel, 故須使用overflow-x:hidden -->
+        <!-- 因拖曳寬度bar現放置於divPanel下並且浮動定位, 左右側之拖曳區會超出divPanel, 故須使用overflow:hidden -->
         <div
             ref="divPanel"
-            style="position:relative; width:100%; height:100%; overflow-x:hidden;"
+            style="position:relative; width:100%; height:100%; overflow:hidden;"
         >
 
-            <!-- 因右側抽屜會無法被內容區裁切遮蔽, 故須使用overflow-x:hidden -->
-            <div style="width:100%; height:100%; display:flex; overflow-x:hidden;">
+            <!-- 因右側抽屜會無法被內容區裁切遮蔽, 故須使用overflow:hidden -->
+            <div style="width:100%; height:100%; display:flex; overflow:hidden;">
 
                 <!-- 撐開區, 需使用min-width避免被壓縮 -->
                 <div
@@ -23,7 +23,7 @@
                     v-if="isAtLeft"
                 ></div>
 
-                <!-- 因外層使用overflow-x:hidden且內容區具有無法崩塌元素, 故也須使用overflow:hidden進行裁切 -->
+                <!-- 因內容區具有無法崩塌元素, 故也須使用overflow:hidden進行裁切 -->
                 <div :style="`width:100%; height:100%; overflow:hidden;`">
 
                     <slot

package/src/components/WInputCheckbox.vue

@@ -2,7 +2,7 @@
     <div :changeItems="changeItems">
 
         <div
-            :style="`${arrange==='vertical'?'':'display:inline-block;'} ${useMarginStyle} ${usePadding}`"
+            :style="`${arrange==='vertical'?'':'display:inline-block;'} ${usePadding}`"
             :key="kitem"
             v-for="(item,kitem) in itemsTrans"
         >
@@ -13,16 +13,18 @@
                 @mouseleave="mouseleave(item,kitem)"
             >
 
-                <input
-                    :style="`${useInputHeight} padding:0px; cursor:pointer; opacity:${editable?1:textDisabledOpacity};`"
-                    :type="multiCheck?'checkbox':'radio'"
-                    :value="item.id"
-                    v-model="dataActive"
-                    :disabled="!editable"
-                >
+                <div :style="`display:flex; height:${inputSize+inputShiftTop}px; padding-top:${inputShiftTop}px;`">
+                    <input
+                        :style="`width:${inputSize}px; height:${inputSize}px; padding:0px; cursor:pointer;`"
+                        :type="multiCheck?'checkbox':'radio'"
+                        :value="item.id"
+                        v-model="dataActive"
+                        :disabled="!editable"
+                    >
+                </div>
 
                 <div
-                    :style="`opacity:${editable?1:textDisabledOpacity};`"
+                    :style="``"
                     @click="toggleState(item)"
                 >
 
@@ -34,7 +36,7 @@
                     >
 
                         <div
-                            :style="`margin:0px 0px 0px 5px; cursor:pointer;`"
+                            :style="`margin:0px 0px 0px 5px; ${useTextFontSize} cursor:pointer;`"
                         >
                             {{getText(item)}}
                         </div>
@@ -56,8 +58,6 @@ import map from 'lodash/map'
 import each from 'lodash/each'
 import isEqual from 'lodash/isEqual'
 import cloneDeep from 'lodash/cloneDeep'
-import isnum from 'wsemi/src/isnum.mjs'
-import isestr from 'wsemi/src/isestr.mjs'
 import replace from 'wsemi/src/replace.mjs'
 import arrHas from 'wsemi/src/arrHas.mjs'
 import parseSpace from '../js/parseSpace.mjs'
@@ -70,15 +70,15 @@ import color2hex from '../js/vuetifyColor.mjs'
  * @vue-prop {Array|String|Object} value 輸入複選字串或物件陣列，無預設
  * @vue-prop {String} [keyText='text'] 輸入可選項目為物件時，存放顯示文字之欄位字串，預設'text'
  * @vue-prop {String} [arrange='vertical'] 輸入可選項目排列字串，可選'vertical'、'horizontal'，預設'vertical'
- * @vue-prop {String} [textColor='black'] 輸入文字顏色字串，預設'black'
- * @vue-prop {String} [textColorHover='grey darken-3'] 輸入滑鼠移入時文字顏色字串，預設'grey darken-3'
- * @vue-prop {String} [textColorActive='white'] 輸入主動模式時文字顏色字串，預設'white'
+ * @vue-prop {Number} [inputSize=16] 輸入input寬度與高度數字，單位為px，預設16
+ * @vue-prop {Number} [inputShiftTop=1] 輸入input上方平移數離數字，單位為px，預設1
+ * @vue-prop {String} [textColor='#222'] 輸入文字顏色字串，預設'#222'
+ * @vue-prop {String} [textColorHover='#888'] 輸入滑鼠移入時文字顏色字串，預設'#888'
+ * @vue-prop {String} [textColorActive='#222'] 輸入主動模式時文字顏色字串，預設'#222'
+ * @vue-prop {String} [textColorDisabled='#666'] 輸入主動模式時文字顏色字串，預設'#666'
  * @vue-prop {String} [textFontSize='0.85rem'] 輸入文字字型大小字串，預設'0.85rem'
- * @vue-prop {Number} [textDisabledOpacity=0.7] 輸入非編輯模式時之透明度數字，預設0.7
- * @vue-prop {Object} [marginStyle={top:0,bottom:0,left:0,right:0}] 輸入外距設定物件，可用鍵值為v、h、left、right、top、bottom，v代表同時設定top與bottom，h代表設定left與right，若有重複設定時後面鍵值會覆蓋前面，各鍵值為寬度數字，單位為px，預設{top:0,bottom:0,left:0,right:0}
  * @vue-prop {Object} [paddingStyle={top:0,bottom:0,left:0,right:0}] 輸入內寬距離物件，可用鍵值為v、h、left、right、top、bottom，v代表同時設定top與bottom，h代表設定left與right，若有重複設定時後面鍵值會覆蓋前面，各鍵值為寬度數字，單位為px，預設{top:0,bottom:0,left:0,right:0}
  * @vue-prop {String} [verticalAlign='center'] 輸入input與文字之垂直對齊字串，可選'top'、'center'、'bottom'，預設'center'
- * @vue-prop {Number|String} [inputHeight=null] 輸入input高度數字或字串，預設null
  * @vue-prop {Boolean} [editable=true] 輸入是否為編輯模式布林值，預設true
  */
 export default {
@@ -104,37 +104,34 @@ export default {
             type: String,
             default: 'vertical',
         },
+        inputSize: {
+            type: Number,
+            default: 16,
+        },
+        inputShiftTop: {
+            type: Number,
+            default: 1,
+        },
         textColor: {
             type: String,
-            default: '#666',
+            default: '#222',
         },
         textColorHover: {
             type: String,
-            default: '#444',
+            default: '#888',
         },
         textColorActive: {
             type: String,
             default: '#222',
         },
+        textColorDisabled: {
+            type: String,
+            default: '#666',
+        },
         textFontSize: {
             type: String,
             default: '0.85rem',
         },
-        textDisabledOpacity: {
-            type: Number,
-            default: 0.7,
-        },
-        marginStyle: {
-            type: Object,
-            default: () => {
-                return {
-                    top: 0,
-                    bottom: 0,
-                    left: 0,
-                    right: 0,
-                }
-            },
-        },
         paddingStyle: {
             type: Object,
             default: () => {
@@ -150,10 +147,6 @@ export default {
             type: String,
             default: 'center',
         },
-        inputHeight: {
-            type: [Number, String],
-            default: null,
-        },
         editable: {
             type: Boolean,
             default: true,
@@ -238,20 +231,6 @@ export default {
             return ''
         },
 
-        useMarginStyle: function() {
-            //console.log('computed useMarginStyle')
-
-            let vo = this
-
-            //parseSpace
-            let cs = parseSpace(vo.marginStyle, { parse: !vo.group }) //group, 非群組化時才使用marginStyle
-
-            //margin
-            let margin = `margin:${cs};`
-
-            return margin
-        },
-
         usePadding: function() {
             //console.log('computed usePadding')
 
@@ -285,21 +264,11 @@ export default {
             return c
         },
 
-        useInputHeight: function() {
-            //console.log('computed useInputHeight')
-
+        useTextFontSize: function() {
             let vo = this
-
-            let h = ''
-            if (isnum(vo.inputHeight)) {
-                h = `height:${vo.inputHeight}px;`
-            }
-            else if (isestr(vo.inputHeight)) {
-                vo.inputHeight = replace(vo.inputHeight, ';', '') //去除分號字元
-                h = `height:${vo.inputHeight};`
-            }
-
-            return h
+            let s = vo.textFontSize
+            s = replace(s, ';', '')
+            return `font-size:${s};`
         },
 
         effTextColor: function() {
@@ -317,6 +286,11 @@ export default {
             return color2hex(vo.textColorActive)
         },
 
+        effTextColorDisabled: function() {
+            let vo = this
+            return color2hex(vo.textColorDisabled)
+        },
+
     },
     methods: {
 
@@ -337,15 +311,16 @@ export default {
 
             let vo = this
 
-            //c
-            let c
-            c = item.active ? vo.effTextColorActive : item.hover ? vo.effTextColorHover : vo.effTextColor
             if (!vo.editable) {
-                c = item.active ? vo.effTextColorActive : vo.effTextColor
+                return vo.effTextColorDisabled
             }
-
-            return c
-
+            if (item.active) {
+                return vo.effTextColorActive
+            }
+            if (item.hover) {
+                return vo.effTextColorHover
+            }
+            return vo.effTextColor
         },
 
         mouseenter: function(item, kitem) {