n20-common-lib 3.0.33 → 3.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.0.33",
+  "version": "3.0.34",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AdvancedFilter/index.vue

@@ -89,7 +89,7 @@
       :destroy-on-close="true"
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="form" label-width="80px" :inline="false" size="normal" label-position="top">
+      <el-form ref="stform" :model="form" label-width="80px" :inline="false" size="normal" label-position="top">
         <el-form-item
           :label="$lc('视图名称')"
           prop="viewName"
@@ -226,23 +226,22 @@ export default {
   methods: {
     // 保存视图
     saveSt() {
-      if (this.form.viewName === '') {
-        this.$message.warning('请输入视图名称')
-      }
-      // 保存筛选视图
-      const obj = {
-        viewName: this.form.viewName,
-        viewType: '0',
-        bussId: this.bussId,
-        viewConfig: JSON.stringify(this.model),
-        keyIds: JSON.stringify(this.checkList)
-      }
-      console.log(obj, 'obj')
-      axios.post(`/bems/query/viewColumn/saveOrUpdateViewInfo`, obj).then((res) => {
-        if (res.code === 200) {
-          this.stVisible = false
-          this.$message.success('保存成功')
-          this.$emit('refresh')
+      this.$refs.stform.validate(async (valid) => {
+        if (valid) {
+          // 保存筛选视图
+          const obj = {
+            viewName: this.form.viewName,
+            viewType: '0',
+            bussId: this.bussId,
+            viewConfig: JSON.stringify(this.model),
+            keyIds: JSON.stringify(this.checkList)
+          }
+          const { code } = await axios.post(`/bems/query/viewColumn/saveOrUpdateViewInfo`, obj)
+          if (code === 200) {
+            this.stVisible = false
+            this.$message.success('保存成功')
+            this.$emit('refresh')
+          }
         }
       })
     },

package/src/components/ProFilterView/index.vue

@@ -403,13 +403,18 @@ export default {
       })
     },
     // 删除
-    deleteOne() {
+    deleteOne(row) {
       this.$msgboxPor({
         title: '确认要删除吗？',
         message: '内容从页面删除，将不可恢复',
         type: 'error',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
+      }).then(async () => {
+        const { code } = await axios.post('/bems/query/viewColumn/deleteViewInfo', { viewId: row.viewId })
+        if (code !== 200) return
+        this.$message.success('删除成功')
+        this.getFilterList()
       })
     },
     // 选中视图