bl-common-vue3 3.8.88 → 3.8.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.88",
+  "version": "3.8.90",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/CustomTable/index.vue

@@ -6,35 +6,11 @@
       :style="{ marginBottom: isTitleCollapsed ? '10px' : '0' }">
       <div class="visitoeTitleText">
         <span v-for="(filter, filterIndex) in filterParams" :key="filterIndex">
-          <a-tag
-            v-if="
-              (filter?.input_type == 'input' ||
-                filter?.input_type == 'inputNumber' ||
-                filter?.input_type == 'datePicker' ||
-                filter?.input_type == 'dateTimePicker' ||
-                filter?.input_type == 'timePicker') &&
-              (filter?.value || filter?.value === 0)
-            "
-            color="blue"
-            closable
-            @close.prevent="closeTages(filter?.field)"
-            style="margin-bottom: 5px">
-            {{ filter?.label }}：{{ filter?.value }}
+          <a-tag v-if="(['input', 'inputNumber', 'datePicker', 'dateTimePicker', 'timePicker'].includes(filter?.input_type)) && (filter?.value || filter?.value === 0)"  color="blue" closable @close.prevent="closeTages(filter?.field)" style="margin-bottom: 5px;">
+            {{ filter?.label }}：{{ isFormatFilterTagValueShow(filter) ? formatFilterTagValueShow(filter) : filter?.value ? filter?.value : '' }}
           </a-tag>
-          <a-tag
-            v-if="
-              (filter?.input_type == 'dateRangePicker' ||
-                filter?.input_type == 'dateTimeRangePicker' ||
-                filter?.input_type == 'timeRangePicker' ||
-                filter?.input_type == 'numberRange') &&
-              filter?.value &&
-              filter?.value.length > 0
-            "
-            color="blue"
-            closable
-            @close.prevent="closeTages(filter?.field)"
-            style="margin-bottom: 5px">
-            {{ filter?.label }}：{{ filter?.value[0] }} ~ {{ filter?.value[1] }}
+          <a-tag v-if="(['dateRangePicker', 'dateTimeRangePicker', 'timeRangePicker', 'numberRange'].includes(filter?.input_type)) && filter?.value && filter?.value.length > 0" color="blue" closable @close.prevent="closeTages(filter?.field)" style="margin-bottom: 5px;">
+            {{ filter?.label }}：{{ isFormatFilterTagValueShow(filter) ? formatFilterTagValueShow(filter) : filter?.value.join(' ~ ') }}
           </a-tag>
           <a-tag
             v-if="
@@ -4038,6 +4014,44 @@ export default defineComponent({
       return temDataSource;
     });
 
+    // 筛选条件标签文本
+    const singleDateInputTypes = ['datePicker', 'dateTimePicker', 'timePicker'];
+    const rangeDateInputTypes = ['dateRangePicker', 'dateTimeRangePicker', 'timeRangePicker'];
+    const formatFilterTagValueShow = computed(() => {
+      return (filter) => {
+        if (!filter) return '';
+        const { input_type, value, label, field } = filter;
+        let valueShow = "";
+        let dateFormatMaps = utils.getBasicConfigI18n()?.datetime || {}
+        let inputTypeFormatMaps = {
+          'datePicker': 'date',
+          'dateTimePicker': 'date_time',
+          'timePicker': 'time',
+          'dateRangePicker': 'date',
+          'dateTimeRangePicker': 'date_time',
+          'timeRangePicker': 'time',
+        }
+        
+        if(singleDateInputTypes.includes(input_type)) {
+          valueShow = dateFormatMaps[inputTypeFormatMaps[input_type]]?dayjs(value).format(dateFormatMaps[inputTypeFormatMaps[input_type]]):value
+        }
+        if(rangeDateInputTypes.includes(input_type)) {
+          valueShow = dateFormatMaps[inputTypeFormatMaps[input_type]]?value.map(item => dayjs(item).format(dateFormatMaps[inputTypeFormatMaps[input_type]])).join(' ~ '):value.join(' ~ ')
+        }
+        return valueShow;
+      }
+    });
+
+    // 筛选条件标签显示value是否需要格式化
+    const isFormatFilterTagValueShow = computed(() => {
+      return (filter) => {
+        if (!filter) return false;
+        const { input_type } = filter;
+        if(!input_type) return false;
+        return singleDateInputTypes.includes(input_type) || rangeDateInputTypes.includes(input_type)
+      }
+    })
+
     return {
       ...toRefs(state),
       localPagination,
@@ -4127,6 +4141,8 @@ export default defineComponent({
       isSecurityRowOn,
       shouldShowSecurityRowBtn,
       shouldShowSecurityHeaderBtn,
+      formatFilterTagValueShow,
+      isFormatFilterTagValueShow,
     };
   },
 });

package/src/components/ExtraManage/index.vue

@@ -22,7 +22,8 @@
     >
       <template #column-action="{ record }">
         <div v-if="record.is_system == 1">
-          <a-tooltip>
+          <a-button @click="handleEdit(record)" type="link" v-if="record?.can_edit">{{t('common.button.edit')}}</a-button>
+          <a-tooltip v-else>
             <template #title>{{t('villageIotInfo.index.885385-0')}}</template>
             <a-button disabled type="link">{{t('common.button.edit')}}</a-button>
           </a-tooltip>

package/src/components/UserDetail/index.vue

@@ -486,7 +486,7 @@ export default defineComponent({
 .title-image {
   width: 100%;
   height: 150px;
-  background: url("https://app.kuaijingai.com/public_h5/static/images/contact/userTopBg.png")
+  background: url("/public_h5/static/images/contact/userTopBg.png")
     no-repeat;
   background-size: 100% 150%;
   background-position-y: -50px;

package/src/locale/commonLocale/zh-HK.js

@@ -5,7 +5,7 @@ export default {
   "common.button.export": "匯出",
   "common.button.import": "導入",
   "common.button.search": "蒐索",
-  "common.button.reset": "重置",
+  "common.button.reset": "重設",
   "common.button.more": "更多",
   "common.switch.open": "開啟",
   "common.switch.close": "關閉",

package/src/locale/commonLocale/zh-TW.js

@@ -5,7 +5,7 @@ export default {
   "common.button.export": "匯出",
   "common.button.import": "導入",
   "common.button.search": "搜尋",
-  "common.button.reset": "重置",
+  "common.button.reset": "重設",
   "common.button.more": "更多",
   "common.switch.open": "開啟",
   "common.switch.close": "關閉",

package/src/locale/local/cht.json

@@ -10,7 +10,7 @@
   "CustomTable.index.074786-8": "起數",
   "CustomTable.index.074786-9": "至數",
   "CustomTable.index.074786-13": "加載中…",
-  "CustomTable.index.074786-14": "刷新",
+  "CustomTable.index.074786-14": "重新整理",
   "CustomTable.index.074786-15": "導入數據",
   "CustomTable.index.074786-16": "匯出數據",
   "CustomTable.index.074786-17": "字典設定",
@@ -132,7 +132,7 @@
   "CustomImport.index.951685-1": "點擊或將檔案拖拽到這裡上傳",
   "CustomImport.index.951685-2": "支持副檔名：{0}",
   "CustomImport.index.951685-4": "導入錯誤",
-  "CustomImport.index.951685-5": "有誤條數：{0}",
+  "CustomImport.index.951685-5": "有誤筆數：{0}",
   "CustomImport.index.951685-6": "請下載迴響檔案，導入結果可以幫助您更快鎖定問題",
   "CustomImport.index.951685-7": "下載檔案",
   "CustomImport.index.951685-8": "返回",
@@ -305,11 +305,11 @@
   "UserDetail.index.833219-3": "信箱",
   "UserDetail.index.833219-4": "工號",
   "UserDetail.index.833219-5": "職位",
-  "ViewEnergyList.index.921424-0": "刷新",
+  "ViewEnergyList.index.921424-0": "重新整理",
   "ViewEnergyList.index.921424-1": "如需要綁定其他錶請前往對應的錶應用新增錶資訊並綁定房間。",
   "ViewEnergyList.index.921424-3": "讀錶",
   "ViewEnergyList.index.921424-4": "抄表",
-  "ViewEnergyList.index.921424-6": "確定重置該{0}嗎？",
+  "ViewEnergyList.index.921424-6": "確定重設該{0}嗎？",
   "ViewEnergyList.index.921424-8": "提醒",
   "ViewEnergyList.index.921424-9": "當前未綁定水電價格標準，請新增對應位置的價格標準後再進行抄表",
   "ViewEnergyList.index.921424-10": "知道了",
@@ -384,8 +384,8 @@
   "components.ImportResult.699608-0": "導入結果",
   "components.ImportResult.699608-1": "導入出錯",
   "components.ImportResult.699608-2": "導入成功",
-  "components.ImportResult.699608-3": "成功條數：",
-  "components.ImportResult.699608-4": "失敗條數：",
+  "components.ImportResult.699608-3": "成功筆數：",
+  "components.ImportResult.699608-4": "失敗筆數：",
   "components.ImportResult.699608-5": "下載導入結果",
   "village.translate.292926-0": "數據遷移",
   "village.translate.292926-1": "數據遷移至",

package/src/locale/local/zh-HK.json

@@ -10,7 +10,7 @@
   "CustomTable.index.074786-8": "起數",
   "CustomTable.index.074786-9": "至數",
   "CustomTable.index.074786-13": "加載中…",
-  "CustomTable.index.074786-14": "刷新",
+  "CustomTable.index.074786-14": "重新整理",
   "CustomTable.index.074786-15": "導入數據",
   "CustomTable.index.074786-16": "匯出數據",
   "CustomTable.index.074786-17": "字典設定",
@@ -132,7 +132,7 @@
   "CustomImport.index.951685-1": "點擊或將檔案拖拽到這裡上傳",
   "CustomImport.index.951685-2": "支持副檔名：{0}",
   "CustomImport.index.951685-4": "導入錯誤",
-  "CustomImport.index.951685-5": "有誤條數：{0}",
+  "CustomImport.index.951685-5": "有誤筆數：{0}",
   "CustomImport.index.951685-6": "請下載迴響檔案，導入結果可以幫助您更快鎖定問題",
   "CustomImport.index.951685-7": "下載檔案",
   "CustomImport.index.951685-8": "返回",
@@ -305,11 +305,11 @@
   "UserDetail.index.833219-3": "郵箱",
   "UserDetail.index.833219-4": "工號",
   "UserDetail.index.833219-5": "職位",
-  "ViewEnergyList.index.921424-0": "刷新",
+  "ViewEnergyList.index.921424-0": "重新整理",
   "ViewEnergyList.index.921424-1": "如需要綁定其他錶請前往對應的錶應用添加錶資訊並綁定房間。",
   "ViewEnergyList.index.921424-3": "讀錶",
   "ViewEnergyList.index.921424-4": "抄表",
-  "ViewEnergyList.index.921424-6": "確定重置該{0}嗎？",
+  "ViewEnergyList.index.921424-6": "確定重設該{0}嗎？",
   "ViewEnergyList.index.921424-8": "提醒",
   "ViewEnergyList.index.921424-9": "當前未綁定水電價格標準，請添加對應位置的價格標準後再進行抄表",
   "ViewEnergyList.index.921424-10": "知道了",