bl-common-vue3 3.8.52 → 3.8.54

package/package.json

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

package/src/common/utils/util.js

@@ -568,7 +568,15 @@ const utils = {
     if (!window.microApp) {
       window.microApp = microApp;
     }
-  }
+  },
+
+  // 是否是开发环境
+  isEnv: () => {
+    if (process.env.NODE_ENV === "production") {
+      return false;
+    }
+    return true;
+  },
 };
 
 export default utils;

package/src/components/AttachmentInfo/index.vue

@@ -3,140 +3,118 @@
     <a-card size="small">
       <template #title v-if="titles">
         <section class="file-title">
-          <span class="mr-5">{{ t('AttachmentInfo.index.559728-0') }}</span>
-          <template v-if="!showOption">
-            (
-            <a-breadcrumb>
-              <a-breadcrumb-item
-                  class="crumb-item"
-                  v-for="(crumb, index) of crumbList"
-                  :key="crumb.key"
-                  @click="handleCrumbItemClick(crumb, index)"
-                  :class="crumb.key != currentCrumb.key ? 'active' : ''"
-              >
-                {{ crumb.title }}
-              </a-breadcrumb-item>
-            </a-breadcrumb>
-            )
-          </template>
+          <span class="mr-5">{{title || t('AttachmentInfo.index.559728-0')}}</span>
         </section>
       </template>
       <template #extra v-if="showOption">
-        <a-dropdown :trigger="['click']" :disabled="disabled">
-          <a-button>
-            <template #icon>
-              <PlusOutlined />
-            </template>
-            {{ t('AttachmentInfo.index.559728-1') }}
-          </a-button>
-          <template #overlay>
-            <a-menu>
-              <a-menu-item
-                v-if="addfolder"
-                key="new_folder"
-                @click="addAttachment(1)"
-              >
-                <template #icon>
-                  <FolderAddOutlined></FolderAddOutlined>
-                </template>
-                {{ t('AttachmentInfo.index.559728-2') }}
-              </a-menu-item>
-              <a-menu-item
-                v-if="batchupload"
-                key="new_file"
-                @click="addAttachment(3)"
-              >
-                <template #icon><UploadOutlined></UploadOutlined></template>
-                <a-upload
-                  name="file"
-                  v-model:fileList="fileList"
-                  :action="$utils.fileAction"
-                  :headers="isOrg?{ 'org-token': $store.getters.token }:{'user-token': $store.getters.userToken}"
-                  multiple
-                  :showUploadList="false"
-                  accept=".doc,.docx,.pdf,.jpg,.jpeg,.png,.mp4,.mp3,.mov,.mpeg"
-                  :data="{ dir: 'org_contract_add_attachments' }"
-                  @change="handleChange"
-                >
-                  {{ t('AttachmentInfo.index.559728-3') }}
-                </a-upload>
-              </a-menu-item>
-              <a-menu-item
-                v-if="mobileAnnexUpload"
-                key="BlMobileAnnexUpload"
-              >
-                <BlMobileAnnexUpload
-                  :title="mobileAnnexUploadConfigInfo.title"
-                  :h5Domain="mobileAnnexUploadConfigInfo.h5Domain"
-                  :uploadConfig="mobileAnnexUploadConfigInfo.uploadConfig"
-                  :addRequest="mobileAnnexUploadConfigInfo.addRequest"
-                  @request="handleRequest"
-                  @handleCommit="handleAddSuccess">
-                </BlMobileAnnexUpload>
-              </a-menu-item>
-            </a-menu>
-          </template>
-        </a-dropdown>
+        <AddAction
+          :disabled="disabled"
+          :addfolder="addfolder"
+          :batchupload="batchupload"
+          :attachParams="attachParams"
+          :serviceFrom="serviceFrom"
+          :parentId="0"
+          :annexAdd="annexAdd"
+          :typeFrom="typeFrom"
+          :isOrg="isOrg"
+          :id="id"
+          :staticPathes="staticPathes"
+          :fileAlias="fileAlias"
+          @getDataList="getDataList"
+          :mobileAnnexUpload="mobileAnnexUpload"
+          :mobileAnnexUploadConfig="mobileAnnexUploadConfig"
+          @handleRequest="handleRequest"
+        />
       </template>
       <a-table
-        :dataSource="dataList"
-        :columns="columns"
-        rowKey="id"
-        :loading="loading"
-        :pagination="pagination"
-        @change="handleTableChange"
-        size="small"
-        bordered
+          :defaultExpandAllRows="true"
+          :key="tableKey"
+          :dataSource="dataList"
+          :columns="columns"
+          rowKey="id"
+          :loading="loading"
+          :pagination="pagination"
+          @change="handleTableChange"
+          size="small"
+          bordered
       >
         <template #bodyCell="{ text, record, column }">
           <template v-if="column.key === 'name'">
-            <div class="file-name" @click="handleNameClick(record)">
-              <FolderOutlined v-if="record.annex_type == 1" />
-              <FileOutlined v-if="record.annex_type == 2" />
+            <div class="file-name">
+              <FolderOutlined v-if="record.annex_type == 1"/>
+              <FileOutlined v-if="record.annex_type == 2"/>
               <span class="name">{{ text }}</span>
             </div>
           </template>
 
           <template v-if="column.key === 'action'">
-            <a-tooltip>
+            <a-tooltip v-if="record.annex_type == 2">
               <template #title>{{ t('AttachmentInfo.index.559728-5') }}</template>
-              <a-button type="link" @click="previewClick(record)">
+              <a-button
+                  type="link"
+                  :disabled="record.online_preview && !record.online_preview.previewUrl &&
+                  record.online_preview.documentType !== 'pic'
+                "
+                  @click="previewClick(record)"
+              >
                 <template #icon>
-                  <EyeOutlined v-if="record.annex_type == 2" />
+                  <EyeOutlined/>
                 </template>
               </a-button>
             </a-tooltip>
-            <a-space v-if="record.operate && record.operate.length">
+            <a-space v-if="record.operate && record.operate.length || (showOption && record.annex_type == 1)">
+              <AddAction
+                v-if="showOption && record.annex_type == 1"
+                :disabled="disabled"
+                :addfolder="addfolder"
+                :batchupload="batchupload"
+                :attachParams="{
+                  ...attachParams,
+                  parent_id: record.id,
+                }"
+                :parentId="record.id"
+                :serviceFrom="serviceFrom"
+                :annexAdd="annexAdd"
+                :typeFrom="typeFrom"
+                :isOrg="isOrg"
+                :id="id"
+                :fileAlias="fileAlias"
+                :staticPathes="staticPathes"
+                @getDataList="getDataList"
+                :mobileAnnexUpload="mobileAnnexUpload"
+                :mobileAnnexUploadConfig="mobileAnnexUploadConfig"
+                @handleRequest="handleRequest"
+              />
               <a-tooltip v-if="record.operate.includes('Topping')">
                 <template #title>{{ t('AttachmentInfo.index.559728-6') }}</template>
                 <a-button
                   type="link"
-                  @click="fileToTop(record)"
+                  @click="fileToTop(record.id)"
                   :disabled="disabled"
                 >
                   <template #icon>
-                    <ToTopOutlined />
+                    <ToTopOutlined/>
                   </template>
                 </a-button>
               </a-tooltip>
               <a-tooltip v-if="record.operate.includes('Download')">
                 <template #title>{{ t('AttachmentInfo.index.559728-7') }}</template>
-                <a-button type="link" @click="downloadFile(record.file_path, record.name)">
+                <a-button type="link" @click="downloadFile(record.file_path)">
                   <template #icon>
-                    <DownloadOutlined />
+                    <DownloadOutlined/>
                   </template>
                 </a-button>
               </a-tooltip>
               <a-tooltip v-if="showOption && record.operate.includes('Delete')">
-                <template #title>{{t('common.button.delete')}}</template>
+                <template #title>{{ t('common.button.delete') }}</template>
                 <a-button
                   type="link"
                   danger
-                  @click="deleteFile(text)"
+                  @click="deleteFile(record.id)"
                   :disabled="disabled"
                 >
                   <template #icon>
-                    <DeleteOutlined />
+                    <DeleteOutlined/>
                   </template>
                 </a-button>
               </a-tooltip>
@@ -146,33 +124,12 @@
         </template>
       </a-table>
     </a-card>
-    <add-attachments
-      :params="addParams"
-      :visible="addVisible"
-      :fileAlias="fileAlias"
-      :id="id"
-      @cancel="addVisible = false"
-      @success="handleAddSuccess"
-      @request="handleRequest"
-    />
-
-    <MultipleAddAttachments
-      :visible="multiAddVisible"
-      :file-list="fileList"
-      :fileAlias="fileAlias"
-      :id="id"
-      @handleCancel="handleCancel"
-      :params="addParams"
-      @handleCommit="handleAddSuccess"
-      @request="handleRequest"
-    />
   </section>
 </template>
 
 <script>
-import { defineComponent, ref, watch, computed, createVNode } from "vue";
+import { defineComponent, ref, watch, computed, createVNode, nextTick } from "vue";
 import {
-  PlusOutlined,
   ToTopOutlined,
   FolderOutlined,
   FileOutlined,
@@ -180,17 +137,12 @@ import {
   DeleteOutlined,
   EyeOutlined,
   ExclamationCircleOutlined,
-  FolderAddOutlined,
-  UploadOutlined
 } from "@ant-design/icons-vue";
-import addAttachments from "./modules/AddAttachments.vue";
 import utils from "../../common/utils/util";
 import {
   message,
   Modal,
   Card,
-  Breadcrumb,
-  BreadcrumbItem,
   Dropdown,
   Menu,
   MenuItem,
@@ -200,36 +152,23 @@ import {
   Button,
   Space,
 } from "ant-design-vue";
-import MultipleAddAttachments from "./modules/MultipleAddAttachments.vue";
 import {t, loadLanguageAsync} from "../../locale";
-import BlMobileAnnexUpload from "../BlMobileAnnexUpload/index.vue";
+import AddAction from "./modules/AddAction.vue";
 export default defineComponent({
   name: "ContractAttachmentInfo",
   components: {
-    PlusOutlined,
     ToTopOutlined,
     FolderOutlined,
     FileOutlined,
-    addAttachments,
     DownloadOutlined,
     DeleteOutlined,
     EyeOutlined,
-    MultipleAddAttachments,
-
+    AddAction,
     "a-card": Card,
-    "a-breadcrumb": Breadcrumb,
-    "a-breadcrumb-item": BreadcrumbItem,
-    "a-dropdown": Dropdown,
-    "a-menu": Menu,
-    "a-menu-item": MenuItem,
-    "a-upload": Upload,
     "a-table": Table,
     "a-tooltip": Tooltip,
     "a-button": Button,
     "a-space": Space,
-    FolderAddOutlined,
-    UploadOutlined,
-    BlMobileAnnexUpload
   },
   props: {
     active: {
@@ -301,6 +240,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    title: {
+      type: String,
+      default: '',
+    },
     titles: {
       type: Boolean,
       default: true,
@@ -342,45 +285,29 @@ export default defineComponent({
     isOrg:{
       type: Boolean,
       default: true,
-    }
+    },
+    typeFrom: {
+      type: String,
+      default: "",
+    },
+    staticPathes: {
+      type: String,
+      default: "",
+    },
   },
   setup(props, context) {
     const homeCrumb = { key: "home", parentId: 0, title: t('AttachmentInfo.index.559728-8') };
     const crumbList = ref([homeCrumb]);
     const currentCrumb = ref(homeCrumb);
-    // 点击面包屑
-    const handleCrumbItemClick = (crumb, index) => {
-      if (currentCrumb.value.key == crumb.key) {
-        return;
-      }
-      currentCrumb.value = crumb;
-      crumbList.value.splice(index + 1, crumbList.value.length - index - 1);
-      getDataList();
-    };
-
-    // 点击进入文件夹
-    const handleNameClick = (record) => {
-      if (record.annex_type == 1) {
-        let item = {
-          key: "sub_" + record.id,
-          parentId: record.id,
-          title: record.name,
-        };
-        crumbList.value.push(item);
-        currentCrumb.value = item;
-        getDataList();
-      }
-    };
+    let attachParams = {};
 
     // 添加文件、文件夹
     const addVisible = ref(false);
     //批量上传
     const multiAddVisible = ref(false);
-    const fileList = ref([]);
 
     const successIds = ref([]);
     const handleAddSuccess = ({ data }) => {
-      fileList.value = [];
       multiAddVisible.value = false;
       addVisible.value = false;
       page.value = 1;
@@ -402,16 +329,6 @@ export default defineComponent({
       }
     };
 
-    const handleChange = (info) => {
-      fileList.value = info.fileList;
-      multiAddVisible.value = true;
-      console.log(fileList.value);
-    };
-    const handleCancel = () => {
-      fileList.value = [];
-      multiAddVisible.value = false;
-    };
-
     // 附件列表
     const page = ref(1);
     const limit = ref(20);
@@ -426,28 +343,24 @@ export default defineComponent({
     const handleTableChange = (pager) => {
       page.value = pager.current;
       limit.value = pager.pageSize;
+      getDataList();
     };
     watch([page, limit], () => {
       getDataList();
     });
     const addParams = ref({});
     const dataList = ref([]);
-
     const filters = ref([]);
 
     // const fis
-    const getDataList = () => {
+    const getDataList = (init) => {
+      if (init) {
+        page.value = 1;
+      }
       let params = {
         page: page.value,
         pageSize: limit.value,
       };
-      if (!filters.value.find((item) => item.field == "parent_id")) {
-        filters.value.push({
-          field: "parent_id",
-          type: "equal",
-          value: currentCrumb.value.parentId,
-        });
-      }
 
       if (props.id) {
         if (!filters.value.find((item) => item.field == "business_id")) {
@@ -475,9 +388,6 @@ export default defineComponent({
         });
       }
       filters.value.forEach((item) => {
-        if (item.field == "parent_id") {
-          item.value = currentCrumb.value.parentId;
-        }
         if (item.field == "id") {
           item.value = successIds.value;
         }
@@ -499,12 +409,16 @@ export default defineComponent({
           },
         },
         success: (res) => {
+          dataList.value = []
           dataList.value = res.list;
           let ids = res.list.map((item) => item.id);
           if (!successIds.value.length) {
             successIds.value = ids;
           }
           total.value = res.total;
+          nextTick(() => {
+            getPicList(dataList.value)
+          })
           context.emit(
             "annexNumChange",
             dataList.value.length,
@@ -513,8 +427,16 @@ export default defineComponent({
       });
     };
 
+    const getPicList = (list) => {
+      list.forEach((v) => {
+        if (v?.children?.length) {
+          getPicList(v.children);
+        }
+      });
+    };
+
     // 文件置顶
-    const fileToTop = (record) => {
+    const fileToTop = (id) => {
       const params = {
         needMsg: true,
       };
@@ -526,7 +448,7 @@ export default defineComponent({
         params: {
           method: "put",
           server: `${props.serviceFrom}`,
-          url: `${props.annexTopFrom}/${record.id}`,
+          url: `${props.annexTopFrom}/${id}`,
           extra: params,
         },
         success: (res) => {
@@ -599,8 +521,6 @@ export default defineComponent({
     const randomStr = utils.getRandomUid(18);
     let loaded = false;
 
-    let attachParams = {};
-
     // 在线预览
     const imgVisible = ref(false);
     const imgList = ref([]);
@@ -648,6 +568,9 @@ export default defineComponent({
       if (!attachParams.object_id) {
         attachParams.object_id = randomStr;
       }
+      if(props.typeFrom){
+        attachParams.typeFrom = props.typeFrom;
+      }
       console.log("attachParams", attachParams);
       getDataList();
       loaded = true;
@@ -688,13 +611,16 @@ export default defineComponent({
         },
         {
           title: t('AttachmentInfo.index.559728-14'),
-          dataIndex: "operate_name",
-          key: "operate_name",
+          dataIndex: "operate_user",
+          key: "operate_user",
         },
         {
           title: t('AttachmentInfo.index.559728-15'),
           dataIndex: "operate_time",
           key: "operate_time",
+          customRender: ({record}) => {
+            return utils.i18nTypeShow(record,'date','operate_time') || '--'
+          }
         },
         {
           title: t('common.table.operation'),
@@ -715,7 +641,7 @@ export default defineComponent({
     const mobileAnnexUploadConfigInfo = computed(() => {
       return {
         title: props.mobileAnnexUploadConfig?.title || "",
-        h5Domain: props.mobileAnnexUploadConfig?.h5Domain || location.origin,
+        h5Domain: props.mobileAnnexUploadConfig?.h5Domain || location.origin || props.staticPathes,
         uploadConfig: props.mobileAnnexUploadConfig?.uploadConfig || {},
         addRequest: {
           extra: {
@@ -723,8 +649,9 @@ export default defineComponent({
             annex_type: 2,
             parent_id: currentCrumb.value.parentId,
             ...attachParams,
-            id: props.id,
+            business_id: props.id,
             alias: props.fileAlias,
+            typeFrom: props.typeFrom,
           },
           server: props.serviceFrom,
           url: props.annexAdd,
@@ -744,8 +671,6 @@ export default defineComponent({
       loading,
       loaded,
       addParams,
-      handleCrumbItemClick,
-      handleNameClick,
       handleAddSuccess,
       addAttachment,
       handleTableChange,
@@ -757,14 +682,14 @@ export default defineComponent({
 
       imgList,
       imgVisible,
-      handleChange,
       multiAddVisible,
-      fileList,
-      handleCancel,
       handleRequest,
 
       getAnnexEdit,
-      mobileAnnexUploadConfigInfo
+      mobileAnnexUploadConfigInfo,
+      getDataList,
+      getPicList,
+      attachParams,
     };
   },
 });
@@ -779,7 +704,6 @@ export default defineComponent({
   .crumb-item {
     padding: 0 4px;
     cursor: pointer;
-    color: rgba(0, 0, 0, 0.45);
   }
 
   .active {
@@ -788,9 +712,7 @@ export default defineComponent({
 }
 
 .file-name {
-  font-size: 12px;
-  color: @primary-color;
-  cursor: pointer;
+  font-size: inherit;
 
   .name {
     margin-left: 8px;