jobdone-shared-files 1.0.49 → 1.0.50

package/README.md

@@ -359,6 +359,7 @@ import OOXX from '../../node_modules/jobdone-shared-files/OOXX.vue';
 | 5 | `search-placeholder` | `String` | `''` |  自定義搜尋框的提示文字。如未設定，有選擇內容時會將選擇的內容當成提示文字，而未選擇時則顯示placeholder(參數2)的值 |
 | 6 | `trigger-class` | `String` | `''` | 預覽框與輸入框的樣式CLASS，可用於驗證提示  |
 | 7 | `list-put` | `String`| `'body'` |  列表Dom放置位置 |
+| 8 | `is-unselected-extend-value` | `Array`| `[]` |  如未設定 `null` `undefined` `0` `''` 辯視為未選擇內容 |
 
 ### 清除按鈕參數
 | #   | 參數 Attribute    | 型別 Type | 預設值 Default | 選項 Option                               | 說明 Description | 

package/autocompleteSelect.vue

@@ -27,7 +27,7 @@
                         </div>
                     </li>
                     <template v-if="active">
-                        <li v-for="(opt, idx) in filterList" :key="idx" @click.stop="selectConfirm(opt)" :title="opt.name"
+                        <li v-for="(opt, idx) in filterList" :key="idx" @click.stop="selectConfirm(opt)" :title="opt?.name"
                             :id="`autocomplete-select-component-opt-item_${idx}`">
                             <button class="autocomplete-select-component-opt-item" type="button"
                                 :class="`${idx == keyboardSwitchIndex ? 'active' : ''} ${optClass}`">
@@ -127,8 +127,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
-
-
+    isUnselectedExtendValue: {
+        type: Array,
+        default: []
+    }
 });
 
 const emit = defineEmits(['select'])
@@ -138,6 +140,26 @@ const componentContentInput = ref(null)
 const componentContentList = ref(null)
 const keywordFilterInput = ref(null)
 
+const valueIsUnselected = computed(()=>{
+    const defaultPlaceholderValue = [null, undefined, 0, '']
+    let ary =[]
+    for (let index = 0; index < defaultPlaceholderValue.length; index++) {
+        const element = defaultPlaceholderValue[index];
+        if(!props.isUnselectedExtendValue.includes(element)){
+            ary.push(element)  
+        }
+    }
+    return ary || []
+})
+const checkValueIsUnselected = (checkValue) => {
+    if(valueIsUnselected.value.includes(checkValue)){
+        return true
+    }
+    if((typeof props.selectedData) === 'object' && checkValue !== null && Object.keys(props.selectedData).length === 0){
+        return true
+    }
+    return false
+}
 
 // 是否開啟下拉選單
 const active = ref(false)
@@ -222,7 +244,7 @@ const filterList = computed(() => {
 
 // 從選項列表中挖出整個選中的item，因選中的值(可能是某個key)
 const selectedItem = computed(() => {
-    if (props.selectedData === null || props.selectedData === undefined || ((typeof props.selectedData) === 'object' && Object.keys(props.selectedData).length === 0)) {
+    if (checkValueIsUnselected(props.selectedData)) {
         return
     }
 
@@ -262,7 +284,7 @@ function previewAdjust(itemObj) {
 
 // 選中的值的顯示
 const selectedPreviewText = computed(() => {
-    if (selectedItem.value === '' || selectedItem.value === null || selectedItem.value === undefined || ((typeof selectedItem.value) === 'object' && Object.keys(selectedItem.value).length === 0)) {
+    if (checkValueIsUnselected(selectedItem.value)) {
         return props.placeholder
     }
     return previewAdjust(selectedItem.value)
@@ -276,8 +298,8 @@ function clearSelected() {
 
 // 選擇送出
 function selectConfirm(v) {
-    if (v === null || v === undefined || ((typeof v) === 'object' && Object.keys(v).length === 0)) {
-        return
+    if (checkValueIsUnselected(v)) {
+        return props.resetValue
     }
     emit('select', JSON.parse(JSON.stringify(v)))
     leave()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jobdone-shared-files",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "description": "Shared JS and SCSS for Jobdone Enterprise.",
   "main": "index.js",
   "scripts": {