bl-common-vue3 3.8.75 → 3.8.77

package/package.json

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

package/src/common/utils/util.js

@@ -611,6 +611,36 @@ const utils = {
     }
     return true;
   },
+
+  modalSuccess: ({
+      title = null,
+      content = null,
+    }) => {
+    Modal.success({
+      title: () => title,
+      content: () => content,
+    });
+  },
+
+  modalError: ({
+      title = null,
+      content = null,
+    }) => {
+    Modal.error({
+      title: () => title,
+      content: () => content,
+    });
+  },
+
+  modalWarning: ({
+      title = null,
+      content = null,
+    }) => {
+    Modal.warning({
+      title: () => title,
+      content: () => content,
+    });
+  }
 };
 
 export default utils;

package/src/components/BlMobileAnnexUpload/index.vue

@@ -9,7 +9,19 @@
 		</div>
 
 		<!-- 二维码弹框 -->
-		<QrcodeModal :visible="qrcodeModalVisible" :isCopy="true" :download="false" :urls="annexUploadPageUrl" @cancel="handleCancelQrcode" @request="handleRequest" :zIndex="visible ? 1001 : 1000" :title="t('BlMobileAnnexUpload.index-1')"></QrcodeModal>
+		<QrcodeModal
+				:visible="qrcodeModalVisible"
+				:isCopy="true"
+				:download="false"
+				:size="260"
+				:widthRatio="2"
+				:urls="annexUploadPageUrl"
+				@cancel="handleCancelQrcode"
+				@request="handleRequest"
+				:zIndex="visible ? 1001 : 1000"
+				:title="t('BlMobileAnnexUpload.index-1')"
+				:tip="t('BlMobileAnnexUpload.index.676543-0')"
+		></QrcodeModal>
 
 		<!-- 批量上传弹框 -->
 		<bl-modal
@@ -44,7 +56,7 @@
 			</a-table>
 
 		</bl-modal>
-    
+
     <!-- 预览图片 -->
     <div style="display: none">
       <a-image-preview-group v-if="imgList?.length" :preview="{ visible: previewVisible, onVisibleChange: vis => (previewVisible = vis), current: currentImgNum}">>
@@ -183,8 +195,11 @@ export default defineComponent({
 				uploadConfig[key] = cfg;
 			});
 
+			let tokenName = utils.getCommonLocal("org_token_name");
+			let token = tokenName ? localStorage.getItem(tokenName) : '';
+
 			const h5Domain = (props.h5Domain || location.origin).replace(/\/$/, "");
-			state.annexUploadPageUrl = `${h5Domain}/h5_orgs/pages/common/annexUpload?key=${encodeURIComponent(state.key || "")}&uploadConfig=${encodeURIComponent(JSON.stringify(uploadConfig))}`;
+			state.annexUploadPageUrl = `${h5Domain}/h5_orgs/pages/common/annexUpload?key=${encodeURIComponent(state.key || "")}&uploadConfig=${encodeURIComponent(JSON.stringify(uploadConfig))}&uploadToken=${encodeURIComponent(token || "")}`;
 		};
 
 		// 获取key

package/src/components/CustomImport/index.vue

@@ -143,6 +143,7 @@ export default defineComponent({
           formData.append(key, props.extraParams[key]);
         })
       }
+      formData.needMsg = true;
       context.emit("request", {
         params: {
           method: props.requestInfo.serviceType,
@@ -154,22 +155,22 @@ export default defineComponent({
           const defaultNext = () => {
             loading.value = false;
             fileList.value = [];
-            context.emit("refresh", res);
+            context.emit("refresh", res.data);
           }
 
-          if (res.fileUrl) {
+          if (res.data.fileUrl) {
             loading.value = false;
             utils.modalConfirm({
               title: t('CustomImport.index.951685-4'),
               content: h("div", { style: "color:#666;" }, [
-                  h( "div", {}, t('CustomImport.index.951685-5', [res.errorRow])),
+                  h( "div", {}, t('CustomImport.index.951685-5', [res.data.errorRow])),
                   h( "div", {}, t('CustomImport.index.951685-6') ),
                 ]),
               okText: t('CustomImport.index.951685-7'),
               cancelText: t('CustomImport.index.951685-8'),
               onOk() {
                 const iframe = document.createElement("iframe");
-                iframe.src = res.fileUrl;
+                iframe.src = res.data.fileUrl;
                 iframe.style.display = "none";
                 document.body.appendChild(iframe);
                 setTimeout(() => {
@@ -179,11 +180,13 @@ export default defineComponent({
             });
             return;
           }
-          if (res.errorFileKey) {
+          if (res.data.errorFileKey) {
             defaultNext();
             return;
           }
-          message.success(t('CustomImport.index.951685-9'));
+          utils.modalSuccess({
+            title: res.msg || t('CustomImport.index.951685-9'),
+          });
           loading.value = false;
           fileList.value = [];
           context.emit("success");

package/src/components/ImportFile/index.vue

@@ -174,18 +174,23 @@ export default defineComponent({
       }
       const { importInfo } = props;
       if (importInfo.url) {
+        importInfo.extra['needMsg'] = true
         context.emit("request", {
           params: {
             ...importInfo,
           },
-          success: () => {
-            message.success(t('ImportFile.index.452353-6'));
+          success: (res) => {
+            utils.modalSuccess({
+              title: res.msg || t('ImportFile.index.452353-6'),
+            });
             context.emit("success", {
               file: state.fileList[0],
             });
           },
-          fail: () => {
-            message.error(t('ImportFile.index.452353-7'));
+          fail: (res) => {
+            utils.modalError({
+              title: res.msg || t('ImportFile.index.452353-7'),
+            });
             context.emit("fail", {
               file: state.fileList[0],
             });

package/src/components/QrcodeModal/index.vue

@@ -1,13 +1,18 @@
 <template>
   <bl-modal
     :visible="visible"
-    :title="titleProps"
     centered
     :footer="null"
     @cancel="handleClose"
     :width="modalWidth"
     :zIndex="zIndex"
   >
+    <template #title>
+      <div>
+        {{titleProps}}
+        <span v-if="tip" class="tip-info">({{tip}})</span>
+      </div>
+    </template>
     <Row :gutter="[12, 12]" :wrap="true">
       <Col
         :span="24"
@@ -131,7 +136,15 @@ export default defineComponent({
     zIndex: {
       type: Number,
       default: 1000
-    }
+    },
+    tip: {
+      type: String,
+      default: "",
+    },
+    widthRatio: {
+      type: Number,
+      default: 3,
+    },
   },
   setup(props, { emit }) {
     const state = reactive({
@@ -176,7 +189,7 @@ export default defineComponent({
             method: "get",
             server: "/public",
             url: "/qrcode",
-            extra: { qrCode: url },
+            extra: { qrCode: url, shortLink:1 },
           },
           success: (res) => {
             if (typeof props.urls === 'string') {
@@ -194,7 +207,7 @@ export default defineComponent({
       const { size, urls } = props;
       let length = "string" === typeof urls ? 1 : urls.length;
       length = length < 3 ? length : 3;
-      state.modalWidth = size * 3 + 150;
+      state.modalWidth = (size * (props.widthRatio || 3)) + 150;
       state.colNum = 24 / length;
     };
 
@@ -219,11 +232,11 @@ export default defineComponent({
 
     // 复制
     const copy = (url) => {
-      let ele = document.createElement("input"); 
-      ele.setAttribute("value", url); 
-      document.body.appendChild(ele); 
-      ele.select(); 
-      document.execCommand("copy"); 
+      let ele = document.createElement("input");
+      ele.setAttribute("value", url);
+      document.body.appendChild(ele);
+      ele.select();
+      document.execCommand("copy");
       document.body.removeChild(ele);
       message.success(t('QrcodeModal.index.612016-2'))
     }
@@ -259,4 +272,8 @@ export default defineComponent({
 .ml-10 {
   margin-left: 10px;
 }
+.tip-info {
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.4);
+}
 </style>

package/src/locale/local/cht.json

@@ -513,5 +513,6 @@
   "ApprovalDetail.index.683625-3": "審批需要手寫簽名，系統還未記錄過您的簽名。第一次請前往移動端審批，完成手寫簽名！",
   "DepartmentUser.index.555981-0": "清除選項",
 	"DepartmentUser.index.555981-1": "展開",
-	"DepartmentUser.index.555981-2": "收起"
+	"DepartmentUser.index.555981-2": "收起",
+  "BlMobileAnnexUpload.index.676543-0": "該二維碼十五分鐘內有效"
 }

package/src/locale/local/en.json

@@ -513,5 +513,6 @@
   "ApprovalDetail.index.683625-3": "A handwritten signature is required for approval, and the system has not yet recorded your signature. For the first time, please go to the mobile terminal for approval to complete the handwritten signature!",
   "DepartmentUser.index.555981-0": "Clear Options",
 	"DepartmentUser.index.555981-1": "expand",
-	"DepartmentUser.index.555981-2": "fold up"
+	"DepartmentUser.index.555981-2": "fold up",
+  "BlMobileAnnexUpload.index.676543-0": "This QR code is valid for fifteen minutes"
 }

package/src/locale/local/jp.json

@@ -513,5 +513,6 @@
   "ApprovalDetail.index.683625-3": "承認には手書きの署名が必要ですが、システムはまだあなたの署名を記録していません。初めての場合は、モバイル端末で承認に進み、手書きの署名を完了してください！",
   "DepartmentUser.index.555981-0": "パージオプション",
 	"DepartmentUser.index.555981-1": "展開",
-	"DepartmentUser.index.555981-2": "畳む"
+	"DepartmentUser.index.555981-2": "畳む",
+  "BlMobileAnnexUpload.index.676543-0": "このQRコードは15分間有効です"
 }

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

@@ -412,5 +412,6 @@
   "ApprovalDetail.index.683625-3": "審批需要手寫簽名，系統還未記錄過您的簽名。第一次請前往移動端審批，完成手寫簽名！",
   "DepartmentUser.index.555981-0": "清除選項",
   "DepartmentUser.index.555981-1": "展開",
-  "DepartmentUser.index.555981-2": "收起"
+  "DepartmentUser.index.555981-2": "收起",
+  "BlMobileAnnexUpload.index.676543-0": "該二維碼十五分鐘內有效"
 }

package/src/locale/local/zh.json

@@ -513,5 +513,6 @@
   "ApprovalDetail.index.683625-3": "审批需要手写签名，系统还未记录过您的签名。第一次请前往移动端审批，完成手写签名！",
   "DepartmentUser.index.555981-0": "清除选项",
 	"DepartmentUser.index.555981-1": "展开",
-	"DepartmentUser.index.555981-2": "收起"
+	"DepartmentUser.index.555981-2": "收起",
+  "BlMobileAnnexUpload.index.676543-0": "该二维码十五分钟内有效"
 }