jobdone-shared-files 1.1.18 → 1.1.19

package/ProjectContactUserPicker.vue

@@ -13,8 +13,9 @@
                 <autocomplete-select ref="userPicker"
                     :trigger-class="`${userSelectClass} ${userInvalid && !userPicked?.userId ? 'is-invalid' : ''}`"
                     :opts="organPickedUsers" :clear-btn="clearBtn" :disabled="!organPicked?.organId"
-                    :preview-key="userPicked.userId ? `displayName + ' ( ' + lastName +' ' + firstName + ' ) ' + '( 電話： ' + phoneNumber + ' )'` : 'displayName'"
-                    :filter-keys="['displayName', 'firstName', 'lastName', 'phoneNumber']" :selected-data="userPicked"
+                    :preview-key="userPickedPreviewKey" 
+                    :filter-keys="['displayName', 'firstName', 'lastName', 'phoneNumber']"
+                    :selected-data="userPicked"
                     :placeholder="organPicked?.organId ? '選擇受文者' : '請先選擇受文者所屬公司 / 協力廠商 / 專案成員'"
                     searchPlaceholder="文字篩選名稱 / 電話" @select="(v) => selectUser(v)" :reset-value="defaultUser"
                     opt-class="border-bottom" :html-option='true'>
@@ -141,6 +142,15 @@ const selectOrgan = (organ) => {
 
 const userPicker = ref(null)
 const userPicked = reactive({ ...defaultUser })
+const userPickedPreviewKey = computed(() => {
+    if (!userPicked.userId) {
+        return 'displayName'
+    }
+    if (userPicked.phoneNumber) {
+        return `displayName + ' ( ' + lastName +' ' + firstName + ' ) ' + '( 電話： ' + phoneNumber + ' )'`
+    }
+    return `displayName + ' ( ' + lastName +' ' + firstName + ' ) '`
+});
 const selectUser = async (userInfo) => {
     if (!userInfo) {
         return

package/index.js

@@ -7,6 +7,7 @@ import { modalShow, modalHide } from "./common/ModalSetup";
 import ModalFileRepositorySelector from "./ModalFileRepositorySelector.vue";
 import autocompleteSelect from "./autocompleteSelect.vue";
 import textareaAutoHeight from "./common/directives/textareaAutoHeight.js";
+import ProjectContactUserPicker from "./ProjectContactUserPicker.vue";
 import selectPlaceholder from "./common/directives/selectPlaceholder.js";
 import collapse from "./common/directives/collapse.js";
 import popovers from "./common/directives/popovers.js";
@@ -17,8 +18,19 @@ export default {
     tagEditor,
     tree,
     vueLoadingOverlay,
+
+    // ProjectManagement
+    projectNavbar,
+}
+
+export {
+    paginate,
+    tagEditor,
+    tree,
+    vueLoadingOverlay,
     ModalFileRepositorySelector,
     autocompleteSelect,
+    ProjectContactUserPicker,
 
     // ProjectManagement
     projectNavbar,

package/package.json

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