bl-common-vue3 3.8.76 → 3.8.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.76",
+  "version": "3.8.78",
   "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/ChooseHousingResources/index.vue

@@ -397,6 +397,12 @@ export default defineComponent({
     isVisit:{
       type: Boolean,
       default: false
+    },
+    roomParams: {
+      type: Object,
+      default: () => {
+        return {};
+      },
     }
   },
   setup(props, { emit }) {
@@ -1611,6 +1617,7 @@ export default defineComponent({
         let paramsObj = {
           village_id: layOrBuild.extra.village_id,
           layer_id: layOrBuild.id,
+          ...props.roomParams,
         };
         if (noLayer.value) {
           delete paramsObj.layer_id;
@@ -1737,6 +1744,7 @@ export default defineComponent({
           layer_id: room?.extra?.layer_id,
           parent_room_id: room.id,
           build_id: room?.extra?.build_id,
+          ...props.roomParams,
         };
         if (props.roomType?.length) {
           paramsObj.room_type = props.roomType.join(',');

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],
             });