cloud-web-corejs 1.0.54-dev.5 → 1.0.54-dev.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.5",
+  "version": "1.0.54-dev.6",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/excelExport/export-panel.js

@@ -0,0 +1,458 @@
+import XEUtils from 'xe-utils'
+import GlobalConfig from 'vxe-table/lib/v-x-e-table/src/conf'
+import VxeModal from 'vxe-table/lib/modal/src/modal'
+import VxeInput from 'vxe-table/lib/input/src/input'
+import VxeCheckbox from 'vxe-table/lib/checkbox/src/checkbox'
+import VxeSelect from 'vxe-table/lib/select/src/select'
+import VxeOption from 'vxe-table/lib/select/src/option'
+import UtilTools from 'vxe-table/lib/tools/utils'
+
+export default {
+  name: 'VxeExportPanel',
+  props: {
+    defaultOptions: Object,
+    storeData: Object
+  },
+  components: {
+    VxeModal,
+    VxeInput,
+    VxeCheckbox,
+    VxeSelect,
+    VxeOption
+  },
+  data () {
+    return {
+      isAll: false,
+      isIndeterminate: false,
+      loading: false
+    }
+  },
+  computed: {
+    vSize () {
+      return this.size || this.$parent.size || this.$parent.vSize
+    },
+    checkedAll () {
+      return this.storeData.columns.every(column => column.checked)
+    },
+    showSheet () {
+      return ['html', 'xml', 'xlsx', 'pdf'].indexOf(this.defaultOptions.type) > -1
+    },
+    supportMerge () {
+      const { storeData, defaultOptions } = this
+      return !defaultOptions.original && defaultOptions.mode === 'current' && (storeData.isPrint || ['html', 'xlsx'].indexOf(defaultOptions.type) > -1)
+    },
+    supportStyle () {
+      const { defaultOptions } = this
+      return !defaultOptions.original && ['xlsx'].indexOf(defaultOptions.type) > -1
+    }
+  },
+  render (h) {
+    const { _e, checkedAll, isAll, isIndeterminate, showSheet, supportMerge, supportStyle, defaultOptions, storeData } = this
+    const { hasTree, hasMerge, isPrint, hasColgroup } = storeData
+    const { isHeader } = defaultOptions
+    const cols = []
+    XEUtils.eachTree(storeData.columns, column => {
+      const colTitle = UtilTools.formatText(column.getTitle(), 1)
+      const isColGroup = column.children && column.children.length
+      cols.push(
+        h('li', {
+          class: ['vxe-export--panel-column-option', `level--${column.level}`, {
+            'is--group': isColGroup,
+            'is--checked': column.checked,
+            'is--indeterminate': column.halfChecked,
+            'is--disabled': column.disabled
+          }],
+          attrs: {
+            title: colTitle
+          },
+          on: {
+            click: () => {
+              if (!column.disabled) {
+                this.changeOption(column)
+              }
+            }
+          }
+        }, [
+          h('span', {
+            class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+          }),
+          h('span', {
+            class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+          }),
+          h('span', {
+            class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          }),
+          h('span', {
+            class: 'vxe-checkbox--label'
+          }, colTitle)
+        ])
+      )
+    })
+    return h('vxe-modal', {
+      res: 'modal',
+      props: {
+        value: storeData.visible,
+        title: GlobalConfig.i18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
+        width: 660,
+        mask: true,
+        lockView: true,
+        showFooter: false,
+        escClosable: true,
+        maskClosable: true,
+        loading: this.loading
+      },
+      on: {
+        input (value) {
+          storeData.visible = value
+        },
+        show: this.showEvent
+      }
+    }, [
+      h('div', {
+        class: 'vxe-export--panel'
+      }, [
+        h('table', {
+          attrs: {
+            cellspacing: 0,
+            cellpadding: 0,
+            border: 0
+          }
+        }, [
+          h('tbody', [
+            [
+              isPrint ? _e() : h('tr', [
+                h('td', GlobalConfig.i18n('vxe.export.expName')),
+                h('td', [
+                  h('vxe-input', {
+                    ref: 'filename',
+                    props: {
+                      value: defaultOptions.filename,
+                      type: 'text',
+                      clearable: true,
+                      placeholder: GlobalConfig.i18n('vxe.export.expNamePlaceholder')
+                    },
+                    on: {
+                      modelValue (value) {
+                        defaultOptions.filename = value
+                      }
+                    }
+                  })
+                ])
+              ]),
+              isPrint ? _e() : h('tr', [
+                h('td', GlobalConfig.i18n('vxe.export.expType')),
+                h('td', [
+                  h('vxe-select', {
+                    props: {
+                      value: defaultOptions.type
+                    },
+                    on: {
+                      input (value) {
+                        defaultOptions.type = value
+                      }
+                    }
+                  }, storeData.typeList.map(item => {
+                    return h('vxe-option', {
+                      props: {
+                        value: item.value,
+                        label: GlobalConfig.i18n(item.label)
+                      }
+                    })
+                  }))
+                ])
+              ]),
+              isPrint || showSheet ? h('tr', [
+                h('td', GlobalConfig.i18n('vxe.export.expSheetName')),
+                h('td', [
+                  h('vxe-input', {
+                    ref: 'sheetname',
+                    props: {
+                      value: defaultOptions.sheetName,
+                      type: 'text',
+                      clearable: true,
+                      placeholder: GlobalConfig.i18n('vxe.export.expSheetNamePlaceholder')
+                    },
+                    on: {
+                      modelValue (value) {
+                        defaultOptions.sheetName = value
+                      }
+                    }
+                  })
+                ])
+              ]) : _e(),
+              h('tr', [
+                h('td', GlobalConfig.i18n('vxe.export.expMode')),
+                h('td', [
+                  h('vxe-select', {
+                    props: {
+                      value: defaultOptions.mode
+                    },
+                    on: {
+                      input (value) {
+                        defaultOptions.mode = value
+                      }
+                    }
+                  }, storeData.modeList.map(item => {
+                    return h('vxe-option', {
+                      props: {
+                        value: item.value,
+                        label: GlobalConfig.i18n(item.label)
+                      }
+                    })
+                  }))
+                ])
+              ]),
+              h('tr', [
+                h('td', [GlobalConfig.i18n('vxe.export.expColumn')]),
+                h('td', [
+                  h('div', {
+                    class: 'vxe-export--panel-column'
+                  }, [
+                    h('ul', {
+                      class: 'vxe-export--panel-column-header'
+                    }, [
+                      h('li', {
+                        class: ['vxe-export--panel-column-option', {
+                          'is--checked': isAll,
+                          'is--indeterminate': isIndeterminate
+                        }],
+                        attrs: {
+                          title: GlobalConfig.i18n('vxe.table.allTitle')
+                        },
+                        on: {
+                          click: this.allColumnEvent
+                        }
+                      }, [
+                        h('span', {
+                          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+                        }),
+                        h('span', {
+                          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+                        }),
+                        h('span', {
+                          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                        }),
+                        h('span', {
+                          class: 'vxe-checkbox--label'
+                        }, GlobalConfig.i18n('vxe.export.expCurrentColumn'))
+                      ])
+                    ]),
+                    h('ul', {
+                      class: 'vxe-export--panel-column-body'
+                    }, cols)
+                  ])
+                ])
+              ]),
+              h('tr', [
+                h('td', GlobalConfig.i18n('vxe.export.expOpts')),
+                h('td', [
+                  h('div', {
+                    class: 'vxe-export--panel-option-row'
+                  }, [
+                    h('vxe-checkbox', {
+                      props: {
+                        value: isHeader,
+                        title: GlobalConfig.i18n('vxe.export.expHeaderTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptHeader')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.isHeader = value
+                        }
+                      }
+                    }),
+                    h('vxe-checkbox', {
+                      props: {
+                        value: defaultOptions.isFooter,
+                        disabled: !storeData.hasFooter,
+                        title: GlobalConfig.i18n('vxe.export.expFooterTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptFooter')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.isFooter = value
+                        }
+                      }
+                    }),
+                    h('vxe-checkbox', {
+                      props: {
+                        value: defaultOptions.original,
+                        title: GlobalConfig.i18n('vxe.export.expOriginalTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptOriginal')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.original = value
+                        }
+                      }
+                    })
+                  ]),
+                  h('div', {
+                    class: 'vxe-export--panel-option-row'
+                  }, [
+                    h('vxe-checkbox', {
+                      props: {
+                        value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                        disabled: !isHeader || !hasColgroup || !supportMerge,
+                        title: GlobalConfig.i18n('vxe.export.expColgroupTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptColgroup')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.isColgroup = value
+                        }
+                      }
+                    }),
+                    h('vxe-checkbox', {
+                      props: {
+                        value: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
+                        disabled: !hasMerge || !supportMerge || !checkedAll,
+                        title: GlobalConfig.i18n('vxe.export.expMergeTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptMerge')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.isMerge = value
+                        }
+                      }
+                    }),
+                    isPrint ? _e() : h('vxe-checkbox', {
+                      props: {
+                        value: supportStyle ? defaultOptions.useStyle : false,
+                        disabled: !supportStyle,
+                        title: GlobalConfig.i18n('vxe.export.expUseStyleTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptUseStyle')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.useStyle = value
+                        }
+                      }
+                    }),
+                    h('vxe-checkbox', {
+                      props: {
+                        value: hasTree ? defaultOptions.isAllExpand : false,
+                        disabled: !hasTree,
+                        title: GlobalConfig.i18n('vxe.export.expAllExpandTitle'),
+                        content: GlobalConfig.i18n('vxe.export.expOptAllExpand')
+                      },
+                      on: {
+                        input (value) {
+                          defaultOptions.isAllExpand = value
+                        }
+                      }
+                    })
+                  ])
+                ])
+              ])
+            ]
+          ])
+        ]),
+        h('div', {
+          class: 'vxe-export--panel-btns'
+        }, [
+          h('vxe-button', {
+            props: {
+              content: GlobalConfig.i18n('vxe.export.expCancel')
+            },
+            on: {
+              click: this.cancelEvent
+            }
+          }),
+          h('vxe-button', {
+            ref: 'confirmBtn',
+            props: {
+              status: 'primary',
+              content: GlobalConfig.i18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm')
+            },
+            on: {
+              click: this.confirmEvent
+            }
+          })
+        ])
+      ])
+    ])
+  },
+  methods: {
+    changeOption (column) {
+      const isChecked = !column.checked
+      XEUtils.eachTree([column], (item) => {
+        item.checked = isChecked
+        item.halfChecked = false
+      })
+      this.handleOptionCheck(column)
+      this.checkStatus()
+    },
+    handleOptionCheck (column) {
+      const matchObj = XEUtils.findTree(this.storeData.columns, item => item === column)
+      if (matchObj && matchObj.parent) {
+        const { parent } = matchObj
+        if (parent.children && parent.children.length) {
+          parent.checked = parent.children.every(column => column.checked)
+          parent.halfChecked = !parent.checked && parent.children.some(column => column.checked || column.halfChecked)
+          this.handleOptionCheck(parent)
+        }
+      }
+    },
+    checkStatus () {
+      const columns = this.storeData.columns
+      this.isAll = columns.every(column => column.disabled || column.checked)
+      this.isIndeterminate = !this.isAll && columns.some(column => !column.disabled && (column.checked || column.halfChecked))
+    },
+    allColumnEvent () {
+      const isAll = !this.isAll
+      XEUtils.eachTree(this.storeData.columns, column => {
+        if (!column.disabled) {
+          column.checked = isAll
+          column.halfChecked = false
+        }
+      })
+      this.isAll = isAll
+      this.checkStatus()
+    },
+    showEvent () {
+      this.$nextTick(() => {
+        const { $refs } = this
+        const targetElem = $refs.filename || $refs.sheetname || $refs.confirmBtn
+        if (targetElem) {
+          targetElem.focus()
+        }
+      })
+      this.checkStatus()
+    },
+    getExportOption () {
+      const { checkedAll, storeData, defaultOptions, supportMerge } = this
+      const { hasMerge, columns } = storeData
+      const expColumns = XEUtils.searchTree(columns, column => column.checked, { children: 'children', mapChildren: 'childNodes', original: true })
+      return Object.assign({}, defaultOptions, {
+        columns: expColumns,
+        isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
+      })
+    },
+    cancelEvent () {
+      this.storeData.visible = false
+    },
+    confirmEvent (evnt) {
+      if (this.storeData.isPrint) {
+        this.printEvent(evnt)
+      } else {
+        this.exportEvent(evnt)
+      }
+    },
+    printEvent () {
+      const $xetable = this.$parent
+      this.storeData.visible = false
+      $xetable.print(Object.assign({}, $xetable.printOpts, this.getExportOption()))
+    },
+    exportEvent () {
+      const $xetable = this.$parent
+      this.loading = true
+      $xetable.exportData(Object.assign({}, $xetable.exportOpts, this.getExportOption())).then(() => {
+        this.loading = false
+        this.storeData.visible = false
+      }).catch(() => {
+        this.loading = false
+      })
+    }
+  }
+}

package/src/components/excelExport/exportFieldDialog.vue

@@ -0,0 +1,73 @@
+<template>
+  <el-dialog
+    title="导出数据"
+    width="355px"
+    custom-class="dialog-style list-dialog"
+    :visible.sync="showDialog"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
+    v-el-drag-dialog
+    v-el-dialog-center
+    @close="dialogClose"
+  >
+    <div class="cont">
+      <el-tree
+        :props="defaultProps"
+        :data="data"
+        show-checkbox
+        node-key="id"
+        ref="tree"
+        highlight-current
+        default-expand-all
+        :expand-on-click-node="true"
+        class="organization-tree"
+        icon-class="el-icon-arrow-right"
+      ></el-tree>
+    </div>
+     <span slot="footer" class="dialog-footer">
+      <el-button type="primary" plain class="button-sty" @click="dialogClose">
+        <i class="el-icon-close el-icon"></i>
+        取 消
+      </el-button>
+      <el-button type="primary" @click="dialogConfirm" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        确 定
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: "exportFieldDialog",
+  prop
+  data(){
+    return {
+      showDialog:true,
+      data:[],
+      defaultProps: {
+        label: 'title', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
+        children: 'children'
+      },
+    }
+  },
+  methods:{
+    init(){
+
+    },
+    dialogClose(){
+      this.showDialog = false;
+      this.$emit('update:visiable', false);
+    },
+    dialogConfirm(){
+      this.dialogClose();
+    }
+  }
+}
+</script>
+
+
+
+<style scoped>
+
+</style>

package/src/components/fileLibrary/index.vue

@@ -192,7 +192,7 @@
                         href="javascript:void(0);"
                         class="a-link ico"
                         v-if="!attachment.dirs && fileObjAuth.downloadAuth"
-                        @click="$commonFileUtil.downloadFile(attachment.domain + attachment.url, attachment.fileName)"
+                        @click="downloadSingerFile(attachment)"
                       >
                         <el-tooltip effect="dark" content="下载" placement="top"
                                     popper-class="tooltip-skin">
@@ -353,7 +353,7 @@
                   href="javascript:void(0);"
                   class="a-link"
                   v-if="fileObjAuth.downloadAuth == 1"
-                  @click="$commonFileUtil.downloadFile(row.domain + row.url,row.fileName)"
+                  @click="downloadSingerFile(row)"
                 >
                   <el-tooltip :enterable="false" effect="dark" :content="$t2('下载','components.fileLibrary.download')"
                               placement="top"

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

@@ -284,6 +284,19 @@ modules = {
               }
             }
           },
+          {
+            title: this.$t1('下载打水印 '),
+            field: 'downWatermarkAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-switch v-model={row.downWatermarkAuth} active-value={1} inactive-value={0}
+                             disabled={row._isParent}></el-switch>
+                ];
+              }
+            }
+          },
           {title: this.$t2('创建人', 'system.label.createBy'), field: 'createBy', width: 150},
           {title: this.$t2('创建时间', 'system.label.createDate'), field: 'createDate', width: 150},
           {title: this.$t2('更新人', 'system.label.modifyBy'), field: 'modifyBy', width: 150},

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

@@ -7,6 +7,7 @@ import shareDialog from "../shareDialog";
 import recycleBinDialog from "../recycleBinDialog";
 import videoDialog from "../../../components/video/dialog";
 import userDialog from "../../../views/user/user/dialog";
+import {encode} from "js-base64";
 
 let modules;
 modules = {
@@ -1746,6 +1747,16 @@ modules = {
       } else {
         return customFileButton.visable;
       }
+    },
+    downloadSingerFile(attachment) {
+      let fileObjAuth = this.fileObjAuth;
+      if (attachment.dirs || !fileObjAuth.downloadAuth) return
+      let url = attachment.domain + attachment.url;
+      let loginAccount = this.$store.getters.loginAccount;
+      if (fileObjAuth.downWatermarkAuth) {
+        url += '?_w=' + encode(loginAccount)
+      }
+      this.$commonFileUtil.downloadFile(url, attachment.fileName)
     }
   },
 };

package/src/layout/components/notify_message/unreadDialog.vue

@@ -118,6 +118,8 @@ export default {
     },
     initSystemNoticeInfoDialog() {
       if (!settingConfig.systemNoticeAutoTip) return
+      let userFlag = this.$store.getters.userFlag
+      if (userFlag == 6 || userFlag == 7 || userFlag == 8) return;
       this.$http({
         url: USER_PREFIX + '/system_notice/listPage',
         data: {publish: true, important: true, readed: 0, size: 1},