bl-common-vue3 3.8.96 → 3.8.101

package/package.json

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

package/src/components/ApprovalDetail/index.vue

@@ -443,7 +443,7 @@
       v-if="detail.dealerHandle || detail.approverHandle || detail.revoke == 1">
       <a-space size="small">
         <a-button
-          v-if="detail.dealerHandle"
+          v-if="detail.dealerHandle && !collapseApprovalActions"
           type="primary"
           key="deal"
           :size="isAllButton ? 'small' : 'default'"
@@ -457,7 +457,7 @@
 
         <template v-if="detail.approverHandle">
           <a-button
-            v-if="canAddSign"
+            v-if="canAddSign && !collapseApprovalActions"
             type="primary"
             ghost
             :size="isAllButton ? 'small' : 'default'"
@@ -468,7 +468,7 @@
             {{ $t("ApprovalDetail.index.931943-2") }}
           </a-button>
           <a-button
-            v-if="detail?.process_now > 1"
+            v-if="detail?.process_now > 1 && !collapseApprovalActions"
             type="default"
             :size="isAllButton ? 'small' : 'default'"
             :loading="submitLoading"
@@ -480,7 +480,7 @@
           </a-button>
 
           <a-button
-            v-if="canEdit"
+            v-if="canEdit && !collapseApprovalActions"
             type="primary"
             key="edit"
             :size="isAllButton ? 'small' : 'default'"
@@ -545,7 +545,7 @@
           ghost
           key="urging"
           :size="isAllButton ? 'small' : 'default'"
-          v-if="detail.revoke == 1"
+          v-if="detail.revoke == 1 && !collapseApprovalActions"
           @click="ApprovalUrging">
           <template #icon>
             <BellOutlined />
@@ -557,13 +557,81 @@
           :loading="submitLoading"
           key="revoke"
           :size="isAllButton ? 'small' : 'default'"
-          v-if="detail.revoke == 1"
+          v-if="detail.revoke == 1 && !collapseApprovalActions"
           @click="revokeApproval">
           <template #icon>
             <UndoOutlined />
           </template>
           {{ $t("ApprovalDetail.index.931943-20") }}
         </a-button>
+
+        <a-dropdown
+          v-if="collapseApprovalActions && moreApprovalActions.length"
+          :trigger="['click']"
+          placement="topRight">
+          <a-button type="primary" ghost :size="isAllButton ? 'small' : 'default'">
+            {{ $t("common.button.more") }}
+            <DownOutlined />
+          </a-button>
+          <template #overlay>
+            <a-menu>
+              <a-menu-item
+                v-if="detail.dealerHandle"
+                key="deal"
+                :disabled="submitLoading"
+                @click="approvalForm('agree')">
+                <template #icon>
+                  <CheckOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-14") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="canAddSign"
+                key="addSign"
+                @click="handleAddSign">
+                <template #icon>
+                  <PlusCircleOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-2") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="detail?.process_now > 1"
+                key="back"
+                :disabled="submitLoading"
+                @click="handleMore(2)">
+                <template #icon>
+                  <RollbackOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-15") }}
+              </a-menu-item>
+              <a-menu-item v-if="canEdit" key="edit" @click="editFormInfo">
+                <template #icon>
+                  <FormOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-16") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="detail.revoke == 1"
+                key="urging"
+                @click="ApprovalUrging">
+                <template #icon>
+                  <BellOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-19") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="detail.revoke == 1"
+                key="revoke"
+                :disabled="submitLoading"
+                @click="revokeApproval">
+                <template #icon>
+                  <UndoOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-20") }}
+              </a-menu-item>
+            </a-menu>
+          </template>
+        </a-dropdown>
       </a-space>
     </div>
   </div>
@@ -618,6 +686,7 @@ import {
   RollbackOutlined,
   FormOutlined,
   PlusCircleOutlined,
+  DownOutlined,
 } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import moment from "moment";
@@ -672,6 +741,7 @@ export default defineComponent({
     FormOutlined,
     AddSignModal,
     BlPopover,
+    DownOutlined,
     "a-timeline": Timeline,
   },
   directives: {
@@ -1231,6 +1301,40 @@ export default defineComponent({
       return false;
     });
 
+    const moreApprovalActions = computed(() => {
+      const list = [];
+      if (state.detail?.dealerHandle) {
+        list.push("deal");
+      }
+      if (state.detail?.approverHandle) {
+        if (canAddSign.value) {
+          list.push("addSign");
+        }
+        if (state.detail?.process_now > 1) {
+          list.push("back");
+        }
+        if (canEdit.value) {
+          list.push("edit");
+        }
+      }
+      if (state.detail?.revoke == 1) {
+        list.push("urging", "revoke");
+      }
+      return list;
+    });
+
+    const approvalActionCount = computed(() => {
+      let count = moreApprovalActions.value.length;
+      if (state.detail?.approverHandle) {
+        count += 2;
+      }
+      return count;
+    });
+
+    const collapseApprovalActions = computed(() => {
+      return state.detail?.approverHandle && approvalActionCount.value > 4;
+    });
+
     const handleRequest = (emitObj) => {
       emit("request", emitObj);
     };
@@ -1300,6 +1404,8 @@ export default defineComponent({
       handleAddSign,
       handleAddSignSuccess,
       canAddSign,
+      moreApprovalActions,
+      collapseApprovalActions,
       handleRequest,
       detailRef,
       isAllButton,

package/src/locale/commonLocale/en.js

@@ -12,13 +12,13 @@ export default {
   "common.table.status": "Status",
   "common.table.operation": "Operation",
   "common.button.cancel": "Cancel",
-  "common.button.ok": "Ok",
+  "common.button.ok": "OK",
   "common.button.save": "Save",
   "common.button.confirm": "Confirm",
   "common.button.submit": "Submit",
   "common.button.whole": "All",
-  "common.tenant.lower": "customer",
-  "common.tenant.cap": "Customer",
+  "common.tenant.lower": "tenant",
+  "common.tenant.cap": "Tenant",
   "common.action.collapse": "Collapse",
   "common.action.expand": "Expand",
   "common.switch.enabled": "Enabled",
@@ -30,38 +30,38 @@ export default {
   "common.switch.normal": "Normal",
   "common.switch.yes": "Yes",
   "common.switch.no": "No",
-  "common.save.success": "Successfully saved",
-  "common.action.success": "Operation successful",
-  "common.submit.success": "Submitted successfully",
+  "common.save.success": "Saved",
+  "common.action.success": "Completed",
+  "common.submit.success": "Submitted",
   "common.save.fail": "Save failed, please try again",
   "common.action.fail": "Operation failed, please try again",
   "common.submit.fail": "Submission failed, please try again",
   "common.verification.required": "Required",
-  "common.houseResources.lower": "housing resources",
-  "common.houseResources.cap": "Housing resources",
+  "common.houseResources.lower": "property",
+  "common.houseResources.cap": "Property",
   "common.basic.project": "Project",
   "common.basic.building": "Building",
   "common.basic.floor": "Floor",
-  "common.basic.tips": "Tips",
-  "common.form.remarks": "Remarks",
+  "common.basic.tips": "Tip",
+  "common.form.remarks": "Notes",
   "common.button.agree": "Agree",
-  "common.button.refuse": "Refuse",
+  "common.button.refuse": "Reject",
   "common.please.enter": "Please enter",
-  "common.please.choose": "Please choose",
+  "common.please.choose": "Please select",
   "common.date.today": "Today",
   "common.date.yesterday": "Yesterday",
   "common.date.thisWeek": "This week",
-  "common.date.lastWeek": "last week",
+  "common.date.lastWeek": "Last week",
   "common.date.thisMonth": "This month",
   "common.date.lastMonth": "Last month",
   "common.date.thisYear": "This year",
-  "common.date.lastYear": "last year",
-  "common.confirm.delete": "Are you sure to delete?",
-  "common.confirm.action": "Are you sure about the operation?",
+  "common.date.lastYear": "Last year",
+  "common.confirm.delete": "Delete this item?",
+  "common.confirm.action": "Continue with this action?",
   "common.button.view": "View",
   "common.button.detail": "Details",
   "common.choose.required": "Required",
-  "common.verification.chooseRequired": "Required option",
+  "common.verification.chooseRequired": "Selection required",
   "common.button.change": "Change",
   "common.button.copy": "Copy",
-}
+}

package/src/locale/commonLocale/ja-JP.js

@@ -1,50 +1,50 @@
 export default {
   "common.button.add": "追加",
   "common.button.edit": "編集",
-  "common.button.delete": "削除＃サクジョ＃",
-  "common.button.export": "エクスポート＃エクスポート＃",
-  "common.button.import": "インポート＃インポート＃",
-  "common.button.search": "検索けんさく",
+  "common.button.delete": "削除",
+  "common.button.export": "エクスポート",
+  "common.button.import": "インポート",
+  "common.button.search": "検索",
   "common.button.reset": "リセット",
   "common.button.more": "詳細",
-  "common.switch.open": "オープン",
+  "common.switch.open": "開く",
   "common.switch.close": "閉じる",
   "common.table.status": "ステータス",
-  "common.table.operation": "操作する",
+  "common.table.operation": "操作",
   "common.button.cancel": "キャンセル",
-  "common.button.ok": "確定です",
-  "common.button.save": "保存します",
-  "common.button.confirm": "確認します",
-  "common.button.submit": "提出します",
+  "common.button.ok": "OK",
+  "common.button.save": "保存",
+  "common.button.confirm": "確認",
+  "common.button.submit": "送信",
   "common.button.whole": "すべて",
-  "common.tenant.lower": "業界人",
-  "common.tenant.cap": "業界人",
-  "common.action.collapse": "やめる",
-  "common.action.expand": "てんかい",
-  "common.switch.enabled": "ゆうこうか",
-  "common.switch.disabled": "むこうか",
+  "common.tenant.lower": "入居者",
+  "common.tenant.cap": "入居者",
+  "common.action.collapse": "折りたたむ",
+  "common.action.expand": "展開",
+  "common.switch.enabled": "有効",
+  "common.switch.disabled": "無効",
   "common.switch.display": "表示",
   "common.switch.hide": "非表示",
   "common.form.required": "必須",
-  "common.form.notRequired": "必須ではありません",
+  "common.form.notRequired": "任意",
   "common.switch.normal": "通常",
   "common.switch.yes": "はい",
   "common.switch.no": "いいえ",
-  "common.save.success": "保存に成功しました",
-  "common.action.success": "操作が成功しました",
-  "common.submit.success": "コミット成功",
+  "common.save.success": "保存しました",
+  "common.action.success": "完了しました",
+  "common.submit.success": "送信しました",
   "common.save.fail": "保存に失敗しました。再試行してください",
   "common.action.fail": "操作に失敗しました。再試行してください",
-  "common.submit.fail": "コミットに失敗しました。再試行してください",
+  "common.submit.fail": "送信に失敗しました。再試行してください",
   "common.verification.required": "必須項目",
-  "common.houseResources.lower": "住宅源",
-  "common.houseResources.cap": "住宅源",
+  "common.houseResources.lower": "物件",
+  "common.houseResources.cap": "物件",
   "common.basic.project": "プロジェクト",
-  "common.basic.building": "ビル",
-  "common.basic.floor": "フロア",
+  "common.basic.building": "建物",
+  "common.basic.floor": "階",
   "common.basic.tips": "ヒント",
-  "common.form.remarks": "コメント",
-  "common.button.agree": "に同意",
+  "common.form.remarks": "備考",
+  "common.button.agree": "同意",
   "common.button.refuse": "拒否",
   "common.please.enter": "入力してください",
   "common.please.choose": "選択してください",
@@ -54,14 +54,14 @@ export default {
   "common.date.lastWeek": "先週",
   "common.date.thisMonth": "今月",
   "common.date.lastMonth": "先月",
-  "common.date.thisYear": "本年",
-  "common.date.lastYear": "去年です",
-  "common.confirm.delete": "削除を確認しますか？",
-  "common.confirm.action": "操作を確認しますか？",
-  "common.button.view": "必ず選びます",
+  "common.date.thisYear": "今年",
+  "common.date.lastYear": "昨年",
+  "common.confirm.delete": "削除しますか？",
+  "common.confirm.action": "この操作を実行しますか？",
+  "common.button.view": "表示",
   "common.button.detail": "詳細",
   "common.choose.required": "必須",
-  "common.verification.chooseRequired": "必須オプション",
-  "common.button.change": "改訂",
+  "common.verification.chooseRequired": "選択必須",
+  "common.button.change": "変更",
   "common.button.copy": "コピー",
-}
+}

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

@@ -1,10 +1,10 @@
 export default {
-  "common.button.add": "添加",
+  "common.button.add": "新增",
   "common.button.edit": "編輯",
-  "common.button.delete": "删除",
+  "common.button.delete": "刪除",
   "common.button.export": "匯出",
-  "common.button.import": "導入",
-  "common.button.search": "蒐索",
+  "common.button.import": "匯入",
+  "common.button.search": "搜尋",
   "common.button.reset": "重設",
   "common.button.more": "更多",
   "common.switch.open": "開啟",
@@ -13,7 +13,7 @@ export default {
   "common.table.operation": "操作",
   "common.button.cancel": "取消",
   "common.button.ok": "確定",
-  "common.button.save": "保存",
+  "common.button.save": "儲存",
   "common.button.confirm": "確認",
   "common.button.submit": "提交",
   "common.button.whole": "全部",
@@ -22,7 +22,7 @@ export default {
   "common.action.collapse": "收起",
   "common.action.expand": "展開",
   "common.switch.enabled": "啟用",
-  "common.switch.disabled": "禁用",
+  "common.switch.disabled": "停用",
   "common.switch.display": "顯示",
   "common.switch.hide": "隱藏",
   "common.form.required": "必填",
@@ -30,13 +30,13 @@ export default {
   "common.switch.normal": "正常",
   "common.switch.yes": "是",
   "common.switch.no": "否",
-  "common.save.success": "保存成功",
+  "common.save.success": "儲存成功",
   "common.action.success": "操作成功",
   "common.submit.success": "提交成功",
-  "common.save.fail": "保存失敗，請重試",
+  "common.save.fail": "儲存失敗，請重試",
   "common.action.fail": "操作失敗，請重試",
   "common.submit.fail": "提交失敗，請重試",
-  "common.verification.required": "必填項",
+  "common.verification.required": "必填欄位",
   "common.houseResources.lower": "房源",
   "common.houseResources.cap": "房源",
   "common.basic.project": "項目",
@@ -50,18 +50,18 @@ export default {
   "common.please.choose": "請選擇",
   "common.date.today": "今天",
   "common.date.yesterday": "昨天",
-  "common.date.thisWeek": "本周",
-  "common.date.lastWeek": "上周",
+  "common.date.thisWeek": "本週",
+  "common.date.lastWeek": "上週",
   "common.date.thisMonth": "本月",
   "common.date.lastMonth": "上月",
-  "common.date.thisYear": "本年",
-  "common.date.lastYear": "上年",
-  "common.confirm.delete": "確認删除嗎？",
+  "common.date.thisYear": "今年",
+  "common.date.lastYear": "去年",
+  "common.confirm.delete": "確認刪除嗎？",
   "common.confirm.action": "是否確認操作？",
   "common.button.view": "查看",
   "common.button.detail": "詳情",
   "common.choose.required": "必選",
-  "common.verification.chooseRequired": "必選項",
+  "common.verification.chooseRequired": "必選欄位",
   "common.button.change": "修改",
   "common.button.copy": "複製",
-}
+}

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

@@ -3,7 +3,7 @@ export default {
   "common.button.edit": "編輯",
   "common.button.delete": "刪除",
   "common.button.export": "匯出",
-  "common.button.import": "導入",
+  "common.button.import": "匯入",
   "common.button.search": "搜尋",
   "common.button.reset": "重設",
   "common.button.more": "更多",
@@ -22,7 +22,7 @@ export default {
   "common.action.collapse": "收起",
   "common.action.expand": "展開",
   "common.switch.enabled": "啟用",
-  "common.switch.disabled": "禁用",
+  "common.switch.disabled": "停用",
   "common.switch.display": "顯示",
   "common.switch.hide": "隱藏",
   "common.form.required": "必填",
@@ -36,7 +36,7 @@ export default {
   "common.save.fail": "儲存失敗，請重試",
   "common.action.fail": "操作失敗，請重試",
   "common.submit.fail": "送出失敗，請重試",
-  "common.verification.required": "必填項",
+  "common.verification.required": "必填欄位",
   "common.houseResources.lower": "房源",
   "common.houseResources.cap": "房源",
   "common.basic.project": "案場",
@@ -50,18 +50,18 @@ export default {
   "common.please.choose": "請選擇",
   "common.date.today": "今天",
   "common.date.yesterday": "昨天",
-  "common.date.thisWeek": "本周",
-  "common.date.lastWeek": "上周",
+  "common.date.thisWeek": "本週",
+  "common.date.lastWeek": "上週",
   "common.date.thisMonth": "本月",
   "common.date.lastMonth": "上月",
-  "common.date.thisYear": "本年",
-  "common.date.lastYear": "上年",
+  "common.date.thisYear": "今年",
+  "common.date.lastYear": "去年",
   "common.confirm.delete": "確認刪除嗎？",
   "common.confirm.action": "是否確認操作？",
-  "common.button.view": "查看",
-  "common.button.detail": "詳情",
+  "common.button.view": "檢視",
+  "common.button.detail": "詳細資料",
   "common.choose.required": "必選",
-  "common.verification.chooseRequired": "必選項",
+  "common.verification.chooseRequired": "必選欄位",
   "common.button.change": "修改",
   "common.button.copy": "複製",
-}
+}

package/src/locale/lang/en.js

@@ -1,12 +1,12 @@
-import antdEnUS from 'ant-design-vue/es/locale-provider/en_US'
-import momentEU from 'moment/locale/eu'
-
-const components = {
-  antLocale: antdEnUS,
-  momentName: 'eu',
-  momentLocale: momentEU
-}
-
-export default {
-  ...components,
-}
+import antdEnUS from 'ant-design-vue/es/locale-provider/en_US'
+import momentEN from 'moment/locale/en';
+
+const components = {
+  antLocale: antdEnUS,
+  momentName: 'en',
+  momentLocale: momentEN
+}
+
+export default {
+  ...components,
+}