cloud-web-corejs 1.0.137 → 1.0.139

package/src/components/fileLibrary/filterDialog.vue

@@ -13,16 +13,16 @@
     v-el-dialog-center
   >
     <div class="cont">
-      <div id="containt" style="height:550px">
-        <div class="search-criteria fl" style="width:220px;height:100%;">
+      <div id="containt" style="height: 550px">
+        <div class="search-criteria fl" style="width: 220px; height: 100%">
           <div class="tit"><i class="iconfont icon-shaixuan"></i><b>搜索条件</b></div>
 
           <el-form label-position="top">
-            <div style="height:468px;padding-top: 10px;overflow:auto">
+            <div style="height: 468px; padding-top: 10px; overflow: auto">
               <el-form-item label="文件名">
-                <el-input v-model="formData.fileName" size="small" clearable/>
+                <el-input v-model="formData.fileName" size="small" clearable />
               </el-form-item>
-<!--              <el-form-item label="所属对象描述">
+              <!--              <el-form-item label="所属对象描述">
                 <base-input-batch v-model="formData.note"/>
               </el-form-item>-->
               <el-form-item label="创建时间">
@@ -48,30 +48,49 @@
               </el-form-item>
               <el-form-item label="文件类型">
                 <el-select v-model="fileTypeSn" @change="getAttributeList">
-                  <el-option v-for="(item,index) in fileTypes" :key="index" :label="item.fileTypeName"
-                             :value="item.fileTypeSn"></el-option>
+                  <el-option
+                    v-for="(item, index) in fileTypes"
+                    :key="index"
+                    :label="item.fileTypeName"
+                    :value="item.fileTypeSn"
+                  ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item v-for="(item,index) in fileAttributes" :key="index" :label="item.attributeName">
+              <el-form-item
+                v-for="(item, index) in fileAttributes"
+                :key="index"
+                :label="item.attributeName"
+              >
                 <el-input v-model="item.formValue" clearable></el-input>
               </el-form-item>
             </div>
             <el-form-item class="btns">
-              <el-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="primary" plain>重置
+              <el-button
+                icon="el-icon-brush"
+                class="button-sty"
+                @click="resetEvent"
+                type="primary"
+                plain
+                >重置
               </el-button>
-              <el-button type="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+              <el-button
+                type="warning"
+                icon="el-icon-search"
+                class="button-sty"
+                @click="searchEvent"
+                >搜索
               </el-button>
             </el-form-item>
           </el-form>
         </div>
-        <label id="labBtn" class="labBtn1" style="cursor:unset;height: 100%;">
+        <label id="labBtn" class="labBtn1" style="cursor: unset; height: 100%">
           <!--          <div class="icon">
                       <i class="el-icon-more"></i>
                       <i class="el-icon-more"></i>
                     </div>-->
         </label>
-        <div class="main-right fr" style="width:calc(100% - 220px);padding-left: 6px;">
-          <div style="height:100%">
+        <div class="main-right fr" style="width: calc(100% - 220px); padding-left: 6px">
+          <div style="height: 100%">
             <vxe-grid
               ref="table-m1"
               v-bind="vxeOption"
@@ -82,11 +101,17 @@
                 <div class="clearfix screen-btns">
                   <div class="fl screen-breadcrumb">
                     <el-breadcrumb separator-class="el-icon-arrow-right ">
-                      <el-breadcrumb-item><i class="iconfont icon-dingwei-mianxing"></i><span class="f-blue"
-                                                                                              @click="checkTreeNode()">搜索范围</span>
+                      <el-breadcrumb-item
+                        ><i class="iconfont icon-dingwei-mianxing"></i
+                        ><span class="f-blue" @click="checkTreeNode()">搜索范围</span>
                       </el-breadcrumb-item>
-                      <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index">
-                        <span class="f-blue" @click="checkTreeNode(treeNode)">{{ treeNode.label }}</span>
+                      <el-breadcrumb-item
+                        v-for="(treeNode, index) in treeNodeArr"
+                        :key="index"
+                      >
+                        <span class="f-blue" @click="checkTreeNode(treeNode)">{{
+                          treeNode.label
+                        }}</span>
                       </el-breadcrumb-item>
                     </el-breadcrumb>
                   </div>
@@ -100,15 +125,21 @@
                   </div>
                 </div>
               </template>
-              <template #fileName="{row}">
+              <template #fileName="{ row }">
                 <div>
-                  <el-tooltip :enterable="false" effect="dark" :content="$t2('预览', 'components.fileLibrary.preview')"
-                              placement="top">
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t2('预览', 'components.fileLibrary.preview')"
+                    placement="top"
+                  >
                     <a class="a-link img" @click="$baseFilePreview(row)">
-                      <el-image :src="getShowUrl(row,'thumbnail')"></el-image>
+                      <el-image :src="getShowUrl(row, 'thumbnail')"></el-image>
                     </a>
                   </el-tooltip>
-                  <a class="a-link underLine" @click="$baseFilePreview(row)">{{ row.fileName }}</a>
+                  <a class="a-link underLine" @click="$baseFilePreview(row)">{{
+                    row.fileName
+                  }}</a>
                 </div>
               </template>
             </vxe-grid>
@@ -120,23 +151,22 @@
 </template>
 
 <script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import { selectDialogMixins } from "@base/mixins/selectDialog/index.js";
 
-import {treeScollx, treeScolly} from '@base/utils/global.js';
-import {encode} from "js-base64";
+import { treeScollx, treeScolly } from "@base/utils/global.js";
+import { encode } from "js-base64";
 
 export default {
-  name: 'productDialog',
-  props: ['visiable', 'multi', 'rows', 'treeNodeArr', 'currentFileCategory'],
+  name: "productDialog",
+  props: ["visiable", "multi", "rows", "treeNodeArr", "currentFileCategory"],
   mixins: [selectDialogMixins],
-  inject: ['current_prefix', 'storeAreaCode', 'getObjectForeignId', 'getIsPrivate'],
+  inject: ["current_prefix", "storeAreaCode", "getObjectForeignId", "getIsPrivate"],
   created() {
-    this.initSetting({treeScolly: false});
+    this.initSetting({ treeScolly: false });
     /*setTimeout(() => {
       treeScollx({target: this, type: 'default', dragBtn: '.labBtn1'});
       treeScolly({target: this, type: 'selectDialog', dragBtn: '.labBtn2'});
     }, 200);*/
-
   },
   mounted() {
     this.getFileTypeList();
@@ -155,7 +185,7 @@ export default {
       fileTypes: [],
       fileAttributes: [],
       fileTypeSn: null,
-      fileAttachAttributeCDTos: []
+      fileAttachAttributeCDTos: [],
     };
   },
   methods: {
@@ -164,8 +194,8 @@ export default {
 
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'fileLigraryFilterDialog-m1',
+        tableRef: "table-m1",
+        tableName: "fileLigraryFilterDialog-m1",
         path: this.current_prefix + "/file_obj/listAuthAttachPage",
         param: () => {
           /* let parents = this.currentFileCategory &&
@@ -174,11 +204,14 @@ export default {
              ? [this.currentFileCategory.id]
              : [];*/
           let fileAttachAttributeCDTOs = [];
-          this.fileAttributes.map(item => {
+          this.fileAttributes.map((item) => {
             if (item.formValue !== "" && item.formValue !== null) {
-              fileAttachAttributeCDTOs.push({attributeSn: item.attributeSn, attributeValue: item.formValue});
+              fileAttachAttributeCDTOs.push({
+                attributeSn: item.attributeSn,
+                attributeValue: item.formValue,
+              });
             }
-          })
+          });
 
           let objectForeignId = this.getObjectForeignId();
           let isPrivate = this.getIsPrivate();
@@ -193,26 +226,26 @@ export default {
         },
         config: {
           proxyConfig: {
-            autoLoad: false
-          }
+            autoLoad: false,
+          },
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t2('文件名称', 'components.fileLibrary.fileName'),
+            title: this.$t2("文件名称", "components.fileLibrary.fileName"),
             field: "fileName",
             width: 250,
             fixed: "left",
             slots: {
-              default: 'fileName'
+              default: "fileName",
             },
           },
           {
-            title: this.$t2('文件大小', 'components.fileLibrary.fileSize'),
+            title: this.$t2("文件大小", "components.fileLibrary.fileSize"),
             field: "fileSize",
             width: 150,
             slots: {
-              default: ({row, $rowIndex}) => {
+              default: ({ row, $rowIndex }) => {
                 if (!row.dirs) {
                   return this.formatFileSize(row.fileSize);
                 }
@@ -220,50 +253,62 @@ export default {
             },
           },
           {
-            title: this.$t2('版本号', 'components.fileLibrary.fileRev'),
+            title: this.$t2("版本号", "components.fileLibrary.fileRev"),
             field: "rev",
             width: 150,
             slots: {
-              default: ({row, $rowIndex}) => {
+              default: ({ row, $rowIndex }) => {
                 if (!row.dirs) {
                   return row.rev;
                 }
-              }
-            }
+              },
+            },
+          },
+          {
+            title: this.$t2("分辨率", "components.fileLibrary.widthHeight"),
+            field: "widthHeight",
+            width: 150,
+          },
+          {
+            title: this.$t2("所属对象描述", "components.fileLibrary.note"),
+            field: "note",
+            width: 250,
           },
-          {title: this.$t2('分辨率', 'components.fileLibrary.widthHeight'), field: "widthHeight", width: 150},
-          {title: this.$t2('所属对象描述', 'components.fileLibrary.note'), field: "note", width: 250},
           {
-            title: '状态',
-            field: 'status',
+            title: "状态",
+            field: "status",
             width: 150,
             slots: {
-              default: ({row, $rowIndex}) => {
+              default: ({ row, $rowIndex }) => {
                 if (!row.dirs) {
-                  return row.status == 1 ? '已归档' : '未归档';
+                  return row.status == 1 ? "已归档" : "未归档";
                 }
-              }
-            }
+              },
+            },
           },
           {
-            title: this.$t2('文件编码', 'components.fileLibrary.fileSn'),
+            title: this.$t2("文件编码", "components.fileLibrary.fileSn"),
             field: "fileSn",
-            width: 150
+            width: 150,
           },
           // ...customColumns,
-          {title: this.$t2('创建人', 'components.fileLibrary.createBy'), field: "createBy", width: 150},
+          {
+            title: this.$t2("创建人", "components.fileLibrary.createBy"),
+            field: "_createBy",
+            width: 150,
+          },
           {
             field: "createDate",
-            title: this.$t2('创建时间', 'components.fileLibrary.createDate'),
+            title: this.$t2("创建时间", "components.fileLibrary.createDate"),
             width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
+            fixed: "right",
+            title: "",
             sortable: false,
             slots: {
-              default: ({row, rowIndex}) => {
+              default: ({ row, rowIndex }) => {
                 return [
                   <div>
                     <a
@@ -273,31 +318,35 @@ export default {
                         this.openFileDirs(row);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content={this.$t1('在文件夹中显示')} placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-view"/>
+                      <el-tooltip
+                        enterable={false}
+                        effect="dark"
+                        content={this.$t1("在文件夹中显示")}
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-view" />
                       </el-tooltip>
                     </a>
-                  </div>
+                  </div>,
                 ];
-              }
-            }
-          }
+              },
+            },
+          },
         ],
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
     },
     openFileDirs(row) {
       this.dialogClose();
-      this.$emit("openFileDirs", row)
+      this.$emit("openFileDirs", row);
     },
     getShowUrl(attachment, field) {
       if (!field) field = "medium";
       return this.$commonFileUtil.getShowUrl(
-        attachment.domain +
-        (attachment[field] ? attachment[field] : attachment.url)
+        attachment.domain + (attachment[field] ? attachment[field] : attachment.url)
       );
     },
     formatFileSize(fileSize) {
@@ -319,12 +368,12 @@ export default {
       }
     },
     searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     resetEvent() {
       this.formData = {};
       this.clearFileAttributeFormValue();
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     clearFileAttributeFormValue() {
       this.fileTypeSn = null;
@@ -335,7 +384,7 @@ export default {
         url: this.current_prefix + `/file_type/listPage`,
         method: `post`,
         data: {
-          enabled: true
+          enabled: true,
         },
         // isLoading: true,
         // modalStrictly: true,
@@ -349,22 +398,20 @@ export default {
         url: this.current_prefix + `/file_type/listAttribute`,
         method: `post`,
         data: {
-          stringOne: this.fileTypeSn
+          stringOne: this.fileTypeSn,
         },
         // isLoading: true,
         // modalStrictly: true,
         success: (res) => {
           let rows = res.objx || [];
-          rows.forEach(row => {
+          rows.forEach((row) => {
             row.formValue = null;
-          })
+          });
           this.fileAttributes = rows;
         },
       });
     },
-
-
-  }
+  },
 };
 </script>
 <style scoped lang="scss">
@@ -372,7 +419,7 @@ export default {
   height: 100%;
 
   .main-right {
-    height: 100%
+    height: 100%;
   }
 }
 

package/src/components/fileLibrary/mixins/fileObjAuthDialogMixin.js

@@ -386,7 +386,7 @@ modules = {
           },
           {
             title: this.$t2("创建人", "system.label.createBy"),
-            field: "createBy",
+            field: "_createBy",
             width: 150,
           },
           {
@@ -396,7 +396,7 @@ modules = {
           },
           {
             title: this.$t2("更新人", "system.label.modifyBy"),
-            field: "modifyBy",
+            field: "_modifyBy",
             width: 150,
           },
           {

package/src/components/fileLibrary/mixins/indexMixins.js

@@ -539,7 +539,7 @@ modules = {
       };
 
       let parent = this.currentCategoryId;
-      this.$http({
+      this.$commonHttp({
         method: "post",
         url: this.current_prefix + "/file_obj/listPage",
         data: {
@@ -899,7 +899,7 @@ modules = {
           ...customColumns,
           {
             title: this.$t2("创建人", "components.fileLibrary.createBy"),
-            field: "createBy",
+            field: "_createBy",
             width: 150,
           },
           {

package/src/components/fileLibrary/mixins/propertiesDialogMixins.js

@@ -100,7 +100,7 @@ modules = {
       this.getObjs();
     },
     getData() {
-      this.$http({
+      this.$commonHttp({
         url: this.current_prefix + '/file_obj/get',
         method: 'post',
         data: {

package/src/components/fileLibrary/mixins/recycleBinDialogMixins.js

@@ -253,7 +253,7 @@ modules = {
         current: 1,
         size: this.pageSize
       };
-      this.$http({
+      this.$commonHttp({
         method: 'post',
         url: this.current_prefix + '/file_recovery/listPage',
         data: {
@@ -367,7 +367,7 @@ modules = {
             field: "fileSn",
             width: 150
           },
-          {title: this.$t2('删除人', 'components.fileLibrary.deleteBy'), field: 'createBy', width: 150},
+          {title: this.$t2('删除人', 'components.fileLibrary.deleteBy'), field: '_createBy', width: 150},
           {
             field: 'createDate',
             title: this.$t2('删除时间', 'components.fileLibrary.deleteDate'),