bl-common-vue3 3.8.68 → 3.8.70

package/package.json

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

package/src/common/utils/util.js

@@ -225,6 +225,41 @@ const utils = {
     });
   },
 
+  /**
+   * @description: 确认弹框（删除确认） 重写是为了多语言
+   * @param {*} 同ant design api
+   */
+  modalConfirm: ({
+    title = t('common.basic.tips'),
+    content = {},
+    centered = true,
+    onOk,
+    onCancel,
+    okType = "primary",
+    okText = t('common.button.ok'),
+    cancelText = t('common.button.cancel')
+  }) => {
+    const getContainer = () => {
+      return window?.rawDocument?.body || document?.body;
+    };
+    Modal.confirm({
+      title: () => title,
+      content: () => content ? content : '',
+      okText: () => okText,
+      icon: () => createVNode(ExclamationCircleOutlined),
+      okType,
+      cancelText: () => cancelText,
+      centered,
+      getContainer,
+      onOk() {
+        onOk && onOk();
+      },
+      onCancel() {
+        onCancel && onCancel();
+      },
+    });
+  },
+
   /**
    * @description: 数组处理成树 （递归）
    */

package/src/components/AttachmentInfo/index.vue

@@ -485,10 +485,9 @@ export default defineComponent({
 
     // 删除文件
     const deleteFile = (id) => {
-      Modal.confirm({
-        title:
-          t('AttachmentInfo.index.559728-11'),
-        icon: createVNode(ExclamationCircleOutlined),
+      utils.modalConfirm({
+        title: t('AttachmentInfo.index.559728-11'),
+        content: '',
         okText: t('common.button.ok'),
         cancelText: t('common.button.cancel'),
         onOk() {

package/src/components/AttachmentInfo/modules/MultipleAddAttachments.vue

@@ -140,9 +140,9 @@ export default {
       uploadList: [],
     });
     const onCancel = () => {
-      Modal.confirm({
+      utils.modalConfirm({
         title: t('modules.MultipleAddAttachments.414571-2'),
-        icon: createVNode(ExclamationCircleOutlined),
+        content: '',
         okText: t('common.button.ok'),
         cancelText: t('common.button.cancel'),
         onOk() {
@@ -212,9 +212,9 @@ export default {
     };
 
     const deleteItem = (index) => {
-      Modal.confirm({
+      utils.modalConfirm({
         title: t('LinkLibrary.MiniList.891083-6'),
-        icon: createVNode(ExclamationCircleOutlined),
+        content: '',
         okText: t('common.button.ok'),
         cancelText: t('common.button.cancel'),
         onOk() {

package/src/components/BlMobileAnnexUpload/index.vue

@@ -308,7 +308,7 @@ export default defineComponent({
 
 		// 取消
 		const onCancel = () => {
-			Modal.confirm({
+			utils.modalConfirm({
 				title: t("modules.MultipleAddAttachments.414571-2"),
 				icon: createVNode(ExclamationCircleOutlined),
 				okText: t("common.button.ok"),

package/src/components/ColumnSetting/index.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import { cloneDeep } from "lodash";
+import { cloneDeep } from "lodash";
 import {defineComponent, reactive, toRefs, watch, createVNode, computed} from "vue";
 import { message, Drawer, Space, Button, InputNumber, Checkbox, RadioGroup, Modal} from "ant-design-vue";
 import draggable from "vuedraggable";
@@ -217,9 +217,9 @@ export default defineComponent({
     };
 
     const restoreDefault = () => {
-      Modal.confirm({
-        title: () => t('ColumnSetting.index.391089-9'),
-        icon: () => createVNode(ExclamationCircleOutlined),
+      utils.modalConfirm({
+        title: t('ColumnSetting.index.391089-9'),
+        content: '',
         okText: t('common.button.confirm'),
         cancelText: t('common.button.cancel'),
         onOk: () => {

package/src/components/CustomImport/index.vue

@@ -158,17 +158,11 @@ export default defineComponent({
 
           if (res.fileUrl) {
             loading.value = false;
-            Modal.confirm({
+            utils.modalConfirm({
               title: t('CustomImport.index.951685-4'),
-              icon: createVNode(ExclamationCircleOutlined),
-              content: () =>
-                h("div", { style: "color:#666;" }, [
-                  h("div", {}, t('CustomImport.index.951685-5', [res.errorRow])),
-                  h(
-                    "div",
-                    {},
-                    t('CustomImport.index.951685-6')
-                  ),
+              content: h("div", { style: "color:#666;" }, [
+                  h( "div", {}, t('CustomImport.index.951685-5', [res.errorRow])),
+                  h( "div", {}, t('CustomImport.index.951685-6') ),
                 ]),
               okText: t('CustomImport.index.951685-7'),
               cancelText: t('CustomImport.index.951685-8'),

package/src/components/CustomTable/index.vue

@@ -2720,9 +2720,9 @@ export default defineComponent({
 
     const handleOperationClick = (item, info) => {
       if (item.key == "del") {
-        Modal.confirm({
-          title: () => t("common.confirm.delete"),
-          icon: () => createVNode(ExclamationCircleOutlined),
+        utils.modalConfirm({
+          title: t("common.confirm.delete"),
+          content: '',
           okText: t("common.button.confirm"),
           cancelText: t("common.button.cancel"),
           onOk: () => {

package/src/components/LinkLibrary/MiniList.vue

@@ -205,10 +205,9 @@ export default defineComponent({
     };
 
     const deleteClick = (id) => {
-      Modal.confirm({
-        title: () => t('common.basic.tips'),
-        icon: () => createVNode(ExclamationCircleOutlined),
-        content: () => t('LinkLibrary.MiniList.891083-6'),
+      utils.modalConfirm({
+        title: t('common.basic.tips'),
+        content: t('LinkLibrary.MiniList.891083-6'),
         onOk() {
           context.emit("request", {
             params: {

package/src/components/PaySetting/index.vue

@@ -334,10 +334,9 @@ export default defineComponent({
       state.dataList.splice(index, 1);
     };
     const handleSettingRemove = (id) => {
-      Modal.confirm({
-        title: () => t('common.basic.tips'),
-        content: () => t('common.confirm.delete'),
-        icon: () => createVNode(ExclamationCircleOutlined),
+      utils.modalConfirm({
+        title: t('common.basic.tips'),
+        content: t('common.confirm.delete'),
         okType: "danger",
         centered: true,
         onOk() {

package/src/components/TenantComponent/index.vue

@@ -105,7 +105,7 @@ export default defineComponent({
       }
       state.owner_id = option.value;
       state.SelectTenant = option
-      context.emit("noChangeNewInfo" , state.owner_id , state.SelectTenant);
+      context.emit("selectcancel" , state.owner_id , state.SelectTenant);
     };
 
     //清除功能,如果不需要清除功能可以不调用
@@ -134,7 +134,7 @@ export default defineComponent({
       if(selectTenant) {
         state.SelectTenant = selectTenant;
         if (props.needNewInfo) {
-          context.emit("selectcancel" , state.owner_id , state.SelectTenant);
+          context.emit("noChangeNewInfo" , state.owner_id , state.SelectTenant);
         }
       } else {
         // 没有找到，清空选中

package/src/components/ViewEnergyList/index.vue

@@ -148,11 +148,9 @@ export default defineComponent({
 
     // 水电表重置
     const getEnergyReset = (record) => {
-      Modal.confirm({
-        title: () => t('common.basic.tips'),
-        icon: createVNode(ExclamationCircleOutlined),
-        content: () =>
-          t('ViewEnergyList.index.921424-6', [record.type_name]),
+      utils.modalConfirm({
+        title: t('common.basic.tips'),
+        content: t('ViewEnergyList.index.921424-6', [record.type_name]),
         okText: t('common.button.ok'),
         cancelText: t('common.button.cancel'),
         onOk() {