cloud-web-corejs-haier 1.0.20 → 1.0.21

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

@@ -8,7 +8,8 @@ modules = {
     },
     treeNodeArr: {
       type: Array
-    }
+    },
+    option:Object
   },
   inject: ['current_prefix', 'getTitle'],
   components: {},
@@ -18,10 +19,14 @@ modules = {
       falseValue: false,
       vxeOption: {},
       showContent: true,
-      attachmentDTO: {},
+      attachmentDTO: {
+        fileAttachAttributeDTOs:[]
+      },
+      fileAttachObjDTOs:[],
       // current_prefix: '',
       filePrefix: '',
-      fileName: ''
+      fileName: '',
+      vxeOption2:{}
     };
   },
   watch: {
@@ -47,6 +52,7 @@ modules = {
   mounted() {
     this.getData();
     this.initTableM1();
+    this.initTableM2();
   },
   methods: {
     initFilePrefix() {
@@ -91,9 +97,10 @@ modules = {
     },
     reloadContent() {
       this.getAttributes();
+      this.getObjs();
     },
     getData() {
-      this.$http({
+      this.$commonHttp({
         url: this.current_prefix + '/file_obj/get',
         method: 'post',
         data: {
@@ -104,6 +111,7 @@ modules = {
         success: res => {
           this.attachmentDTO = res.objx || {};
           this.getAttributes();
+          this.getObjs();
         }
       });
     },
@@ -121,6 +129,21 @@ modules = {
         }
       });
     },
+    getObjs() {
+      this.$http({
+        url: this.current_prefix + '/file_attach/obj/list',
+        method: 'post',
+        data: {
+          stringOne: this.attachmentDTO.fileSn
+        },
+        isLoading: true,
+        // modalStrictly: true,
+        success: res => {
+          // this.$set(this.attachmentDTO, 'fileAttachObjDTOs', res.objx || []);
+          this.fileAttachObjDTOs = res.objx || []
+        }
+      });
+    },
     initTableM1() {
       //明细
       var that = this;
@@ -187,6 +210,43 @@ modules = {
         temp = temp.toFixed(2);
         return temp + 'GB';
       }
+    },
+    initTableM2() {
+      //明细
+      var that = this;
+      const tableRef = 'table-m2';
+      const tableOption = {
+        vue: this,
+        tableRef: tableRef,
+        tableName: 'user_fileLibrary_propertiesDialog_list-m2',
+        columns: [
+          {
+            type: 'checkbox',
+            fixed: 'left',
+            width: 48,
+            resizable: false
+          },
+          {
+            title: this.$t1('关联对象编码'),
+            field: 'objSn',
+            width: 200
+          },
+          {
+            title: this.$t1('关联对象名称'),
+            field: 'objName',
+            width: 200
+          },
+          {
+            width: 50,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption2 = opts;
+      });
     }
   }
 };

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

@@ -1,5 +1,4 @@
-import ElImageViewer from '../../../components/VabUpload/image-viewer';
-import propertiesDialog from '../propertiesDialog';
+import ElImageViewer from '@base/components/VabUpload/image-viewer';
 import recycleBinPropertiesDialog from "../recycleBinPropertiesDialog";
 import categoryMoveDialog from '../categoryMoveDialog'
 
@@ -254,7 +253,7 @@ modules = {
         current: 1,
         size: this.pageSize
       };
-      this.$http({
+      this.$commonHttp({
         method: 'post',
         url: this.current_prefix + '/file_recovery/listPage',
         data: {
@@ -368,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'),

package/src/components/table/CellSlot.vue

@@ -4,6 +4,33 @@
 	</div>
 </template>
 
-<script></script>
+<script>
+export default {
+  provide() {
+    let e = this;
+    return {
+      refList: {},
+      widgetKeyNameMap:{},
+      sfRefList: {},
+      getFormConfig: function () {},
+      getGlobalDsv: function () {},
+      globalOptionData: null,
+      getOptionData:  function () {},
+      globalModel: null,
+      previewState: null,
+      getReadMode:  function () {},
+      getSubFormFieldFlag: function () {},
+      getSubFormName: function () {},
+      doScriptAccess: null,
+      formHttp: null,
+      getReportTemplate:  function () {},
+      getObjectFieldFlag: () => !1,
+      getObjectName: () => "",
+      getHasWf:  function () {},
+      hasConfig:  function () {},
+    };
+  },
+}
+</script>
 
-<style></style>
+<style></style>