已成功发起导出任务，您可以操作其他事务
稍后可在 任务中心 查看执行结果
`, + type: "success", + confirmButtonText: "知道了", + dangerouslyUseHTMLString: true, + center: true + }).catch(() => {}) + }else{ + this.$alert(res.message || "未知错误", "发起任务失败", { + type: "error", + center: true + }).catch(() => {}) + } + }).catch(() => { + this.asyncLoading = false + }) + }, toQueryString(obj){ let arr = [] for (var k in obj) { diff --git a/src/components/scFilterBar/index.vue b/src/components/scFilterBar/index.vue index 4e3653b7..04b8e2a7 100644 --- a/src/components/scFilterBar/index.vue +++ b/src/components/scFilterBar/index.vue @@ -1,10 +1,10 @@ @@ -39,10 +39,10 @@
-
+
+
-
-
+
@@ -27,6 +27,7 @@
props: {
apiObj: { type: Object, default: () => {} },
dic: { type: String, default: "" },
+ objValueType: { type: Boolean, default: false },
params: { type: Object, default: () => ({}) }
},
data() {
@@ -40,7 +41,7 @@
},
created() {
//如果有默认值就去请求接口获取options
- if(this.$attrs.modelValue && this.$attrs.modelValue.length > 0){
+ if(this.hasValue()){
this.initloading = true
this.getRemoteData()
}
@@ -66,6 +67,16 @@
this.options = response.data
this.loading = false
this.initloading = false
+ },
+ //判断是否有回显默认值
+ hasValue(){
+ if(Array.isArray(this.$attrs.modelValue) && this.$attrs.modelValue.length <= 0){
+ return false
+ }else if(this.$attrs.modelValue){
+ return true
+ }else{
+ return false
+ }
}
}
}
diff --git a/src/components/scSelectFilter/index.vue b/src/components/scSelectFilter/index.vue
index 3064680c..c62fd19b 100644
--- a/src/components/scSelectFilter/index.vue
+++ b/src/components/scSelectFilter/index.vue
@@ -42,7 +42,8 @@
watch:{
data(val) {
val.forEach(item => {
- this.selected[item.key] = this.selectedValues[item.key] || [item.options[0].value]
+ this.selected[item.key] = this.selectedValues[item.key] ||
+ (Array.isArray(item.options) && item.options.length) ? [item.options[0].value] : []
})
}
},
@@ -58,7 +59,8 @@
mounted() {
//默认赋值
this.data.forEach(item => {
- this.selected[item.key] = this.selectedValues[item.key] || [item.options[0].value]
+ this.selected[item.key] = this.selectedValues[item.key] ||
+ (Array.isArray(item.options) && item.options.length) ? [item.options[0].value] : []
})
},
methods: {
diff --git a/src/components/scTableSelect/index.vue b/src/components/scTableSelect/index.vue
index e3186dee..772a7cc3 100644
--- a/src/components/scTableSelect/index.vue
+++ b/src/components/scTableSelect/index.vue
@@ -1,14 +1,14 @@
-
+
+
+
-
{{scope.$index + 1}}
-
-
@@ -38,7 +38,12 @@
apiObj: { type: Object, default: () => {} },
params: { type: Object, default: () => {} },
placeholder: { type: String, default: "请选择" },
+ size: { type: String, default: "default" },
+ clearable: { type: Boolean, default: false },
multiple: { type: Boolean, default: false },
+ filterable: { type: Boolean, default: false },
+ collapseTags: { type: Boolean, default: false },
+ collapseTagsTooltip: { type: Boolean, default: false },
disabled: { type: Boolean, default: false },
tableWidth: {type: Number, default: 400},
mode: { type: String, default: "popover" },
@@ -119,7 +124,7 @@
var setrow = this.tableData.filter(item => item[this.defaultProps.value]===this.defaultValue[this.defaultProps.value] )
this.$refs.table.setCurrentRow(setrow[0]);
}
- this.$refs.table.$el.querySelector('.el-table__body-wrapper').scrollTop = 0
+ this.$refs.table.setScrollTop(0)
})
},
//插糟表单提交
diff --git a/src/components/scUpload/file.vue b/src/components/scUpload/file.vue
index 46fd9ea0..f8ec732c 100644
--- a/src/components/scUpload/file.vue
+++ b/src/components/scUpload/file.vue
@@ -1,22 +1,22 @@
-
Click to upload
@@ -34,7 +34,7 @@
export default {
props: {
- modelValue: { type: String, default: "" },
+ modelValue: { type: [String, Array], default: "" },
tip: { type: String, default: "" },
action: { type: String, default: "" },
apiObj: { type: Object, default: () => {} },
@@ -58,22 +58,29 @@
},
watch:{
modelValue(val){
- if (val != this.toStr(this.defaultFileList)) {
- this.defaultFileList = this.toArr(val)
- this.value = val
+ if(Array.isArray(val)){
+ if (JSON.stringify(val) != JSON.stringify(this.formatArr(this.defaultFileList))) {
+ this.defaultFileList = val
+ this.value = val
+ }
+ }else{
+ if (val != this.toStr(this.defaultFileList)) {
+ this.defaultFileList = this.toArr(val)
+ this.value = val
+ }
}
},
defaultFileList: {
handler(val){
- this.$emit('update:modelValue', this.toStr(val))
+ this.$emit('update:modelValue', Array.isArray(this.modelValue) ? this.formatArr(val) : this.toStr(val))
this.value = this.toStr(val)
},
deep: true
}
},
mounted() {
+ this.defaultFileList = Array.isArray(this.modelValue) ? this.modelValue : this.toArr(this.modelValue)
this.value = this.modelValue
- this.defaultFileList = this.toArr(this.modelValue)
},
methods: {
//默认值转换为数组
@@ -90,12 +97,25 @@
})
}
})
- return _arr;
+ return _arr
},
//数组转换为原始值
toStr(arr){
return arr.map(v => v.url).join(",")
},
+ //格式化数组值
+ formatArr(arr){
+ var _arr = []
+ arr.forEach(item => {
+ if(item){
+ _arr.push({
+ name: item.name,
+ url: item.url
+ })
+ }
+ })
+ return _arr
+ },
before(file){
const maxSize = file.size / 1024 / 1024 < this.maxSize;
if (!maxSize) {
diff --git a/src/components/scUpload/index.vue b/src/components/scUpload/index.vue
index 6b93f843..5c712346 100644
--- a/src/components/scUpload/index.vue
+++ b/src/components/scUpload/index.vue
@@ -150,7 +150,10 @@
this.$refs.uploader.clearFiles()
})
},
- change(file){
+ change(file,files){
+ if(files.length > 1){
+ files.splice(0, 1)
+ }
if(this.cropper && file.status=='ready'){
const acceptIncludes = ["image/gif", "image/jpeg", "image/png"].includes(file.raw.type)
if(!acceptIncludes){
diff --git a/src/components/scUpload/multiple.vue b/src/components/scUpload/multiple.vue
index f36103df..a622e783 100644
--- a/src/components/scUpload/multiple.vue
+++ b/src/components/scUpload/multiple.vue
@@ -1,21 +1,21 @@
-
diff --git a/src/layout/components/setting.vue b/src/layout/components/setting.vue
index 9366c506..e8ef2e13 100644
--- a/src/layout/components/setting.vue
+++ b/src/layout/components/setting.vue
@@ -73,6 +73,10 @@
this.$TOOL.data.set("APP_LANG", val);
},
colorPrimary(val){
+ if(!val){
+ val = '#409EFF'
+ this.colorPrimary = '#409EFF'
+ }
document.documentElement.style.setProperty('--el-color-primary', val);
for (let i = 1; i <= 9; i++) {
document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, colorTool.lighten(val,i/10));
diff --git a/src/layout/components/tags.vue b/src/layout/components/tags.vue
index 397a8803..ae23c706 100644
--- a/src/layout/components/tags.vue
+++ b/src/layout/components/tags.vue
@@ -1,21 +1,13 @@
@@ -43,7 +35,6 @@
left: 0,
top: 0,
tagList: this.$store.state.viewTags.viewTags,
- tipVisible: false,
tipDisplayed: false
}
},
@@ -60,23 +51,30 @@
targetTag.scrollIntoView()
//显示提示
if(!this.tipDisplayed){
- this.tipVisible = true
+ this.$msgbox({
+ type: 'warning',
+ center: true,
+ title: '提示',
+ message: '当前标签数量过多，可通过鼠标滚轴滚动标签栏。关闭标签数量可减少系统性能消耗。',
+ confirmButtonText: '知道了'
+ })
+ this.tipDisplayed = true
}
+
}
})
},
contextMenuVisible(value) {
- var _this = this;
- var cm = function(e){
- let sp = document.getElementById("contextmenu");
- if(sp&&!sp.contains(e.target)){
- _this.closeMenu()
+ const cm = (e) => {
+ const sp = document.getElementById("contextmenu");
+ if (sp && !sp.contains(e.target)) {
+ this.closeMenu()
}
}
if (value) {
- document.body.addEventListener('click', e=>cm(e))
- }else{
- document.body.removeEventListener('click', e=>cm(e))
+ document.body.addEventListener('click', e => cm(e))
+ } else {
+ document.body.removeEventListener('click', e => cm(e))
}
}
},
@@ -126,13 +124,14 @@
},
//关闭tag
closeSelectedTag(tag, autoPushLatestView=true) {
+ const nowTagIndex = this.tagList.findIndex(item => item.fullPath == tag.fullPath)
this.$store.commit("removeViewTags", tag)
this.$store.commit("removeIframeList", tag)
this.$store.commit("removeKeepLive", tag.name)
if (autoPushLatestView && this.isActive(tag)) {
- const latestView = this.tagList.slice(-1)[0]
- if (latestView) {
- this.$router.push(latestView)
+ const leftView = this.tagList[nowTagIndex - 1]
+ if (leftView) {
+ this.$router.push(leftView)
} else {
this.$router.push('/')
}
@@ -160,24 +159,24 @@
this.contextMenuVisible = false
},
//TAB 刷新
- refreshTab(){
- var nowTag = this.contextMenuItem;
+ refreshTab() {
this.contextMenuVisible = false
+ const nowTag = this.contextMenuItem;
//判断是否当前路由，否的话跳转
- if(this.$route.fullPath != nowTag.fullPath){
+ if (this.$route.fullPath !== nowTag.fullPath) {
this.$router.push({
path: nowTag.fullPath,
query: nowTag.query
})
}
+
this.$store.commit("refreshIframe", nowTag)
- var _this = this;
- setTimeout(function() {
- _this.$store.commit("removeKeepLive", nowTag.name)
- _this.$store.commit("setRouteShow", false)
- _this.$nextTick(() => {
- _this.$store.commit("pushKeepLive",nowTag.name)
- _this.$store.commit("setRouteShow", true)
+ setTimeout(() => {
+ this.$store.commit("removeKeepLive", nowTag.name)
+ this.$store.commit("setRouteShow", false)
+ this.$nextTick(() => {
+ this.$store.commit("pushKeepLive", nowTag.name)
+ this.$store.commit("setRouteShow", true)
})
}, 0);
},
@@ -249,10 +248,6 @@
}
scrollDiv.scrollLeft += step;
}
- },
- hideTip(){
- this.tipVisible = false
- this.tipDisplayed = true
}
}
}
diff --git a/src/layout/components/tasks.vue b/src/layout/components/tasks.vue
new file mode 100644
index 00000000..e14ab99f
--- /dev/null
+++ b/src/layout/components/tasks.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/topbar.vue b/src/layout/components/topbar.vue
index 7834bb4e..bcc9ed51 100644
--- a/src/layout/components/topbar.vue
+++ b/src/layout/components/topbar.vue
@@ -2,7 +2,7 @@
没有正在执行的任务
+ +在处理耗时过久的任务时为了不阻碍正在处理的工作，可在任务中心进行异步执行。
+