Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-01 adb31b71f8c3490b923c8cb6f12b74be6ca3a02d

 ruoyi-ui/src/views/system/oss/config.vue

@@ -69,17 +69,6 @@
          v-hasPermi="['system:oss:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:ossConfig:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

@@ -149,7 +138,7 @@
          <el-input v-model="form.accessKey" placeholder="请输入accessKey" />
        </el-form-item>
        <el-form-item label="secretKey" prop="secretKey">
          <el-input v-model="form.secretKey" placeholder="请输入秘钥" />
          <el-input v-model="form.secretKey" placeholder="请输入秘钥" show-password />
        </el-form-item>
        <el-form-item label="桶名称" prop="bucketName">
          <el-input v-model="form.bucketName" placeholder="请输入桶名称" />
@@ -168,15 +157,6 @@
        </el-form-item>
        <el-form-item label="域" prop="region">
          <el-input v-model="form.region" placeholder="请输入域" />
        </el-form-item>
        <el-form-item label="状态">
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in statusOptions"
              :key="dict.dictValue"
              :label="dict.dictValue"
            >{{dict.dictLabel}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -345,6 +325,12 @@
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.ossConfigId)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
@@ -402,7 +388,9 @@
        this.loading = false;
        this.getList();
        this.msgSuccess("删除成功");
      }).catch(() => {});
      }).finally(() => {
        this.loading = false;
      });
    },
    // 云存储配置状态修改
    handleStatusChange(row) {
@@ -412,16 +400,15 @@
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
      }).then(function () {
      }).then(() => {
        return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
      }).then(() => {
        this.getList()
        this.msgSuccess(text + "成功");
      }).catch(function () {
      }).catch(() => {
        row.status = row.status === "0" ? "1" : "0";
      }).finally(() => {
      });
    },
  },
      })
    }
  }
};
</script>