bl-common-vue3 3.8.115 → 3.8.116

package/package.json

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

package/src/common/utils/util.js

@@ -460,6 +460,9 @@ const utils = {
     }
     return noI18nFields && noI18nFieldsUseT ? t(result) : result;
   },
+  getRoomMeasureUnit: (room = {}) => {
+    return utils.i18nMapShow(room, ['place_measure_unit_txt'], ['place_measure_unit_txt']) || utils.getAreaUnit();
+  },
   /*
     * item 内容。
     * type: 转换类型。

package/src/components/CheckedHousingResources/index.vue

@@ -4,20 +4,17 @@
       <template v-if="checkable">
         <a-col :span="16"> {{ t("CheckedHousingResources.index.396661-0", [roomTitleProps]) }} </a-col>
         <a-col :span="8">
-          {{ maxTotal ? `${t("CheckedHousingResources.index.396661-2")}(${commonAreaUnit})` :
-            `${t("CheckedHousingResources.index.396661-3")}(${commonAreaUnit})` }}
+          {{ getAreaTitleText(maxTotal ? "CheckedHousingResources.index.396661-2" : "CheckedHousingResources.index.396661-3") }}
         </a-col>
       </template>
 
       <template v-else>
         <a-col :span="!areaInput?16:checkedColSpan"> {{ t("CheckedHousingResources.index.396661-0", [roomTitleProps]) }} </a-col>
         <a-col :span="checkedColSpan" v-if="inputShow">
-          {{ realClauseType == "gov" ? t("CheckedPropertyResources.index.618076-3") :
-            t("CheckedHousingResources.index.396661-1") }}({{ commonAreaUnit }})
+          {{ getAreaTitleText(realClauseType == "gov" ? "CheckedPropertyResources.index.618076-3" : "CheckedHousingResources.index.396661-1") }}
         </a-col>
         <a-col :span="!areaInput?8:checkedColSpan" v-if="!(leaseBindConfig.showUnitPrice && leaseBindConfig.showBindOwner)">
-          {{ maxTotal ? `${t("CheckedHousingResources.index.396661-2")}(${commonAreaUnit})` :
-            `${t("CheckedHousingResources.index.396661-3")}(${commonAreaUnit})` }}
+          {{ getAreaTitleText(maxTotal ? "CheckedHousingResources.index.396661-2" : "CheckedHousingResources.index.396661-3") }}
         </a-col>
         <template v-if="isViewBindAndNotCheck">
           <a-col :span="checkedColSpan">
@@ -210,6 +207,19 @@ import utils from "../../common/utils/util";
 import { t, loadLanguageAsync } from "../../locale";
 import {DiffFilled} from "@ant-design/icons-vue";
 import TenantComponent from '../TenantComponent/index.vue'
+const PLACE_MEASURE_UNIT = {
+  KILOMETER: 'kilometer',
+};
+
+const AREA_MEASURE_TYPE = 'area';
+const LENGTH_MEASURE_TYPE = 'length';
+const LENGTH_TITLE_I18N_KEY = {
+  "CheckedHousingResources.index.396661-1": "CheckedHousingResources.index.396661-11",
+  "CheckedHousingResources.index.396661-2": "CheckedHousingResources.index.396661-12",
+  "CheckedHousingResources.index.396661-3": "CheckedHousingResources.index.396661-13",
+  "CheckedPropertyResources.index.618076-3": "CheckedHousingResources.index.396661-14",
+};
+
 export default defineComponent({
   name: "CheckedHousingResources",
   components: {
@@ -324,8 +334,6 @@ export default defineComponent({
       roomInfo: {},
     });
 
-    const commonAreaUnit = utils.getAreaUnit();
-
     const emptyDescProps = computed(() => {
       return props.emptyDesc || t("CheckedHousingResources.index.396661-7");
     });
@@ -336,6 +344,61 @@ export default defineComponent({
 
     const inputShow = computed(() => !props.checkable && props.areaInput);
 
+    const getRoomMeasureUnit = (room = {}) => {
+      return utils.getRoomMeasureUnit(room);
+    };
+
+    const getRoomMeasureType = (room = {}) => {
+      return room.place_measure_unit == PLACE_MEASURE_UNIT.KILOMETER ? LENGTH_MEASURE_TYPE : AREA_MEASURE_TYPE;
+    };
+
+    const currentRoomList = computed(() => {
+      return props.checkable ? props.allHouseList : state.houseShowList;
+    });
+
+    const measureUnitList = computed(() => {
+      return Array.from(new Set((currentRoomList.value || []).map((item) => getRoomMeasureUnit(item)).filter(Boolean)));
+    });
+
+    const currentMeasureUnitText = computed(() => {
+      return measureUnitList.value.length == 1 ? measureUnitList.value[0] : '';
+    });
+
+    const measureTypeList = computed(() => {
+      return Array.from(new Set((currentRoomList.value || []).map((item) => getRoomMeasureType(item))));
+    });
+
+    const measureUnitMap = computed(() => {
+      return (currentRoomList.value || []).reduce((result, item) => {
+        const measureType = getRoomMeasureType(item);
+        if (!result[measureType]) {
+          result[measureType] = getRoomMeasureUnit(item);
+        }
+        return result;
+      }, {});
+    });
+
+    const getLengthTitleText = (i18nKey) => {
+      return t(LENGTH_TITLE_I18N_KEY[i18nKey] || i18nKey);
+    };
+
+    const getAreaTitleText = (i18nKey) => {
+      if (!measureTypeList.value.length) {
+        return t(i18nKey);
+      }
+      if (measureTypeList.value.length > 1) {
+        return t("CheckedHousingResources.index.396661-15", [
+          t(i18nKey),
+          measureUnitMap.value[AREA_MEASURE_TYPE] || utils.getAreaUnit(),
+          t("CheckedHousingResources.index.396661-14"),
+          measureUnitMap.value[LENGTH_MEASURE_TYPE] || '',
+        ]);
+      }
+      const measureType = measureTypeList.value[0];
+      const title = measureType == LENGTH_MEASURE_TYPE ? getLengthTitleText(i18nKey) : t(i18nKey);
+      return currentMeasureUnitText.value ? `${title}(${currentMeasureUnitText.value})` : title;
+    };
+
     // 这里需要判断是租赁条款 且 选择的房源里面有 类型是商业的 房源
     const isViewBindAndNotCheck = computed(() => {
       let hasBusiness = state.houseShowList.some((v) => v.house_type == 'business');
@@ -677,7 +740,6 @@ export default defineComponent({
 
     return {
       t,
-      commonAreaUnit,
       emptyDescProps,
       roomTitleProps,
       inputShow,
@@ -688,6 +750,8 @@ export default defineComponent({
       handleHouseChecked,
       getTotalArea,
       getMaxArea,
+      getRoomMeasureUnit,
+      getAreaTitleText,
       handleRequest,
       i18nMapShow,
       selectBrandClick,
@@ -719,6 +783,10 @@ export default defineComponent({
     font-size: 12px;
   }
 
+  .area-unit {
+    margin-left: 4px;
+  }
+
   .room-area {
     font-size: 15px;
     color: rgba(0, 0, 0, 1);

package/src/components/ChooseHousingResources/index.vue

@@ -97,10 +97,10 @@
                     >
                       <a-tooltip>
                         <template #title>
-                          <div v-if="!noDisabledLog">{{t('ChooseHousingResources.index.592551-0', [dataRef.showArea, commonAreaUnit])}}</div>
-                          <div v-if="utils.numberToPrecision(dataRef.build_area) || noDisabledLog">{{t('ChooseHousingResources.index.592551-1', [utils.numberToPrecision(dataRef.build_area), commonAreaUnit])}}</div>
-                          <div v-if="utils.numberToPrecision(dataRef.inside_area)">{{t('ChooseHousingResources.index.592551-2', [utils.numberToPrecision(dataRef.inside_area), commonAreaUnit])}}</div>
-                          <div v-if="utils.numberToPrecision(dataRef.share_area)">{{t('ChooseHousingResources.index.592551-3', [utils.numberToPrecision(dataRef.share_area), commonAreaUnit])}}</div>
+                          <div v-if="!noDisabledLog">{{ getRoomAreaDetailText(dataRef, 'rentable', dataRef.showArea) }}</div>
+                          <div v-if="utils.numberToPrecision(dataRef.build_area) || noDisabledLog">{{ getRoomAreaDetailText(dataRef, 'build', utils.numberToPrecision(dataRef.build_area)) }}</div>
+                          <div v-if="utils.numberToPrecision(dataRef.inside_area)">{{ getRoomAreaDetailText(dataRef, 'inside', utils.numberToPrecision(dataRef.inside_area)) }}</div>
+                          <div v-if="utils.numberToPrecision(dataRef.share_area)">{{ getRoomAreaDetailText(dataRef, 'share', utils.numberToPrecision(dataRef.share_area)) }}</div>
                         </template>
                         {{ getRoomAreaText(dataRef) }}
                       </a-tooltip>
@@ -169,6 +169,27 @@ import utils from "../../common/utils/util";
 import {ROOM_TYPE_ICONS} from "../../common/utils/constant";
 import {t, loadLanguageAsync} from "../../locale";
 
+const PLACE_MEASURE_UNIT = {
+  KILOMETER: 'kilometer',
+};
+
+const AREA_MEASURE_TYPE = 'area';
+const LENGTH_MEASURE_TYPE = 'length';
+const ROOM_AREA_DETAIL_I18N_KEY = {
+  [AREA_MEASURE_TYPE]: {
+    rentable: 'ChooseHousingResources.index.592551-0',
+    build: 'ChooseHousingResources.index.592551-1',
+    inside: 'ChooseHousingResources.index.592551-2',
+    share: 'ChooseHousingResources.index.592551-3',
+  },
+  [LENGTH_MEASURE_TYPE]: {
+    rentable: 'ChooseHousingResources.index.592551-4',
+    build: 'ChooseHousingResources.index.592551-5',
+    inside: 'ChooseHousingResources.index.592551-6',
+    share: 'ChooseHousingResources.index.592551-7',
+  },
+};
+
 export default defineComponent({
   name: "ChooseHousingResources",
   components: {
@@ -406,7 +427,6 @@ export default defineComponent({
     }
   },
   setup(props, { emit }) {
-    const commonAreaUnit = utils.getAreaUnit();
     // 大数据量时切换到性能优先模式，减少默认展开、动画和 Tooltip 的同步开销
     const LARGE_TREE_NODE_THRESHOLD = 2000;
     // 当前节点样式包含上下 padding，因此需要显式同步虚拟列表的单项高度
@@ -576,7 +596,21 @@ export default defineComponent({
      */
     const getRoomAreaText = (dataRef) => {
       const areaValue = props.noDisabledLog ? utils.numberToPrecision(dataRef.build_area) : dataRef.showArea;
-      return `${areaValue || 0}${commonAreaUnit}`;
+      return `${areaValue || 0}${getRoomMeasureUnit(dataRef)}`;
+    };
+
+    const getRoomMeasureUnit = (room = {}) => {
+      return utils.getRoomMeasureUnit(room);
+    };
+
+    const getRoomMeasureType = (room = {}) => {
+      return room.place_measure_unit == PLACE_MEASURE_UNIT.KILOMETER ? LENGTH_MEASURE_TYPE : AREA_MEASURE_TYPE;
+    };
+
+    const getRoomAreaDetailText = (room = {}, areaType, value) => {
+      const measureType = getRoomMeasureType(room);
+      const i18nKey = ROOM_AREA_DETAIL_I18N_KEY[measureType]?.[areaType] || ROOM_AREA_DETAIL_I18N_KEY[AREA_MEASURE_TYPE][areaType];
+      return t(i18nKey, [value || 0, getRoomMeasureUnit(room)]);
     };
 
     /**
@@ -2642,9 +2676,10 @@ export default defineComponent({
       treeItemHeight,
       treeMotion,
       ...toRefs(state),
-      commonAreaUnit,
       getNodeTitle,
       getRoomAreaText,
+      getRoomMeasureUnit,
+      getRoomAreaDetailText,
       getRoomNodeTitle,
       onLoadTreeData,
       handleTreeCheck,

package/src/locale/local/cht.json

@@ -69,6 +69,11 @@
   "CheckedHousingResources.index.396661-7": "尚未選擇物件",
   "CheckedHousingResources.index.396661-9": "水電資料{0}",
   "CheckedHousingResources.index.396661-10": "資產資料{0}",
+  "CheckedHousingResources.index.396661-11": "租賃長度",
+  "CheckedHousingResources.index.396661-12": "總長度",
+  "CheckedHousingResources.index.396661-13": "可租/總長度",
+  "CheckedHousingResources.index.396661-14": "長度",
+  "CheckedHousingResources.index.396661-15": "{0}（{1}）或{2}（{3}）",
   "CheckedPropertyResources.index.618076-0": "{0}名稱",
   "CheckedPropertyResources.index.618076-1": "出售",
   "CheckedPropertyResources.index.618076-2": "租賃",
@@ -376,6 +381,10 @@
   "ChooseHousingResources.index.592551-1": "建築面積{0}{1}",
   "ChooseHousingResources.index.592551-2": "室內面積{0}{1}",
   "ChooseHousingResources.index.592551-3": "公設面積{0}{1}",
+  "ChooseHousingResources.index.592551-4": "可租長度{0}{1}",
+  "ChooseHousingResources.index.592551-5": "建築長度{0}{1}",
+  "ChooseHousingResources.index.592551-6": "室內長度{0}{1}",
+  "ChooseHousingResources.index.592551-7": "公設{0}{1}",
   "DictionarySetting.index.734314-0": "請輸入字典名稱",
   "VisitorPage.index.924333-0": "接受上傳的檔案類型",
   "VisitorPage.index.924333-1": "留空則支援所有檔案格式；多個格式請用半形逗號分隔，例如：.doc,.docx,.pdf,.jpg,.jpeg,.png,.xls,.xlsx,.rar,.zip,.gif",

package/src/locale/local/en.json

@@ -69,6 +69,11 @@
   "CheckedHousingResources.index.396661-7": "No property selected",
   "CheckedHousingResources.index.396661-9": "Utility data {0}",
   "CheckedHousingResources.index.396661-10": "Asset data{0}",
+  "CheckedHousingResources.index.396661-11": "Rental length",
+  "CheckedHousingResources.index.396661-12": "Total length",
+  "CheckedHousingResources.index.396661-13": "Rentable/Total Length",
+  "CheckedHousingResources.index.396661-14": "Length",
+  "CheckedHousingResources.index.396661-15": "{0} ({1}) or {2} ({3})",
   "CheckedPropertyResources.index.618076-0": "{0} name",
   "CheckedPropertyResources.index.618076-1": "Sale",
   "CheckedPropertyResources.index.618076-2": "Lease",
@@ -376,6 +381,10 @@
   "ChooseHousingResources.index.592551-1": "Floor area {0}{1}",
   "ChooseHousingResources.index.592551-2": "Internal area {0}{1}",
   "ChooseHousingResources.index.592551-3": "Shared area {0}{1}",
+  "ChooseHousingResources.index.592551-4": "Rentable length {0}{1}",
+  "ChooseHousingResources.index.592551-5": "Floor length {0}{1}",
+  "ChooseHousingResources.index.592551-6": "Internal length {0}{1}",
+  "ChooseHousingResources.index.592551-7": "Shared {0}{1}",
   "DictionarySetting.index.734314-0": "Please enter the dictionary name",
   "VisitorPage.index.924333-0": "Allowed file types",
   "VisitorPage.index.924333-1": "Leave blank to allow all formats. Separate multiple formats with commas, for example: .doc,.docx,.pdf,.jpg,.jpeg,.png,.xls,.xlsx,.rar,.zip,.gif",

package/src/locale/local/jp.json

@@ -69,6 +69,11 @@
   "CheckedHousingResources.index.396661-7": "物件が選択されていません",
   "CheckedHousingResources.index.396661-9": "電気・水道データ{0}",
   "CheckedHousingResources.index.396661-10": "資産データ{0}",
+  "CheckedHousingResources.index.396661-11": "賃貸長さ",
+  "CheckedHousingResources.index.396661-12": "総長さ",
+  "CheckedHousingResources.index.396661-13": "賃貸可能/総長さ",
+  "CheckedHousingResources.index.396661-14": "長さ",
+  "CheckedHousingResources.index.396661-15": "{0}（{1}）または{2}（{3}）",
   "CheckedPropertyResources.index.618076-0": "{0}名",
   "CheckedPropertyResources.index.618076-1": "売却",
   "CheckedPropertyResources.index.618076-2": "賃貸",
@@ -376,6 +381,10 @@
   "ChooseHousingResources.index.592551-1": "延床面積{0}{1}",
   "ChooseHousingResources.index.592551-2": "専有面積{0}{1}",
   "ChooseHousingResources.index.592551-3": "共用面積{0}{1}",
+  "ChooseHousingResources.index.592551-4": "賃貸可能長さ{0}{1}",
+  "ChooseHousingResources.index.592551-5": "延床長さ{0}{1}",
+  "ChooseHousingResources.index.592551-6": "専有長さ{0}{1}",
+  "ChooseHousingResources.index.592551-7": "共用{0}{1}",
   "DictionarySetting.index.734314-0": "辞書名を入力してください",
   "VisitorPage.index.924333-0": "アップロード可能なファイル形式",
   "VisitorPage.index.924333-1": "空欄の場合はすべての形式に対応します。複数指定する場合は半角カンマで区切ってください。例：.doc,.docx,.pdf,.jpg,.jpeg,.png,.xls,.xlsx,.rar,.zip,.gif",

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

@@ -69,6 +69,11 @@
   "CheckedHousingResources.index.396661-7": "尚未選擇物業",
   "CheckedHousingResources.index.396661-9": "水電資料{0}",
   "CheckedHousingResources.index.396661-10": "資產資料{0}",
+  "CheckedHousingResources.index.396661-11": "租賃長度",
+  "CheckedHousingResources.index.396661-12": "總長度",
+  "CheckedHousingResources.index.396661-13": "可租/總長度",
+  "CheckedHousingResources.index.396661-14": "長度",
+  "CheckedHousingResources.index.396661-15": "{0}（{1}）或{2}（{3}）",
   "CheckedPropertyResources.index.618076-0": "{0}名稱",
   "CheckedPropertyResources.index.618076-1": "出售",
   "CheckedPropertyResources.index.618076-2": "租賃",
@@ -376,6 +381,10 @@
   "ChooseHousingResources.index.592551-1": "建築面積{0}{1}",
   "ChooseHousingResources.index.592551-2": "室內面積{0}{1}",
   "ChooseHousingResources.index.592551-3": "公用面積{0}{1}",
+  "ChooseHousingResources.index.592551-4": "可租長度{0}{1}",
+  "ChooseHousingResources.index.592551-5": "建築長度{0}{1}",
+  "ChooseHousingResources.index.592551-6": "室內長度{0}{1}",
+  "ChooseHousingResources.index.592551-7": "公用{0}{1}",
   "DictionarySetting.index.734314-0": "請輸入字典名稱",
   "VisitorPage.index.924333-0": "可上載的檔案類型",
   "VisitorPage.index.924333-1": "留空則支援所有檔案格式；多個格式請用半形逗號分隔，例如：.doc,.docx,.pdf,.jpg,.jpeg,.png,.xls,.xlsx,.rar,.zip,.gif",

package/src/locale/local/zh.json

@@ -69,6 +69,11 @@
   "CheckedHousingResources.index.396661-7": "未选择房源",
   "CheckedHousingResources.index.396661-9": "水电数据{0}",
   "CheckedHousingResources.index.396661-10": "资产数据{0}",
+  "CheckedHousingResources.index.396661-11": "租赁长度",
+  "CheckedHousingResources.index.396661-12": "总长度",
+  "CheckedHousingResources.index.396661-13": "可租/总长度",
+  "CheckedHousingResources.index.396661-14": "长度",
+  "CheckedHousingResources.index.396661-15": "{0}({1})或{2}({3})",
   "CheckedPropertyResources.index.618076-0": "{0}名称",
   "CheckedPropertyResources.index.618076-1": "出售",
   "CheckedPropertyResources.index.618076-2": "租赁",
@@ -376,6 +381,10 @@
   "ChooseHousingResources.index.592551-1": "建筑面积{0}{1}",
   "ChooseHousingResources.index.592551-2": "套内面积{0}{1}",
   "ChooseHousingResources.index.592551-3": "公摊面积{0}{1}",
+  "ChooseHousingResources.index.592551-4": "可租长度{0}{1}",
+  "ChooseHousingResources.index.592551-5": "建筑长度{0}{1}",
+  "ChooseHousingResources.index.592551-6": "套内长度{0}{1}",
+  "ChooseHousingResources.index.592551-7": "公摊{0}{1}",
   "DictionarySetting.index.734314-0": "请输入字典名称",
   "VisitorPage.index.924333-0": "接受上传的文件类型",
   "VisitorPage.index.924333-1": "不填写则支持所有文件格式，多个用英文逗号隔开。示例:.doc,.docx,.pdf,.jpg,.jpeg,.png,.xls,.xlsx,.rar,.zip,.gif",