Merge pull request #3913 from dataease/pr@dev@fix_dataset

Pr@dev@fix dataset
2022-11-28 23:09:14 +08:00 · 2022-11-28 23:09:14 +08:00 · 65be01e479
commit 65be01e479
parent 3e9e9e9169 c52dc9a2df
7 changed files with 113 additions and 111 deletions
--- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
+++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
@ -1011,7 +1011,7 @@ public class ChartDataBuild {
        } else {
            switch (columnPermissionItem.getDesensitizationRule().getCustomBuiltInRule()) {
                case RetainBeforeMAndAfterN:
-                    if (StringUtils.isEmpty(originStr) || originStr.length() < columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) {
+                    if (StringUtils.isEmpty(originStr) || originStr.length() <= columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) {
                        desensitizationStr = String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getM(), "X")) + "***" + String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getN(), "X"));
                    } else {
                        desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM() - 1) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN(), originStr.length() - 1);
--- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
@ -13,6 +13,7 @@ import io.dataease.plugins.common.dto.chart.ChartCustomFilterItemDTO;
 import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.xpack.auth.dto.request.*;
+import io.dataease.plugins.xpack.auth.dto.response.Item;
 import io.dataease.plugins.xpack.auth.service.ColumnPermissionService;
 import io.dataease.plugins.xpack.auth.service.RowPermissionService;
 import org.apache.commons.collections4.CollectionUtils;
@ -112,14 +113,14 @@ public class PermissionService {
            }
            if (CollectionUtils.isNotEmpty(fieldRoleColumnPermissionItems)) {
                if (fieldRoleColumnPermissionItems.stream().map(ColumnPermissionItem::getOpt).collect(Collectors.toList()).contains(ColumnPermissionConstants.Desensitization)) {
-                    desensitizationList.put(field.getDataeaseName(), fieldUserColumnPermissionItems.get(0));
+                    desensitizationList.put(field.getDataeaseName(), fieldRoleColumnPermissionItems.get(0));
                    result.add(field);
                }
                return;
            }
            if (CollectionUtils.isNotEmpty(fieldDeptColumnPermissionItems)) {
                if (fieldDeptColumnPermissionItems.stream().map(ColumnPermissionItem::getOpt).collect(Collectors.toList()).contains(ColumnPermissionConstants.Desensitization)) {
-                    desensitizationList.put(field.getDataeaseName(), fieldUserColumnPermissionItems.get(0));
+                    desensitizationList.put(field.getDataeaseName(), fieldDeptColumnPermissionItems.get(0));
                    result.add(field);
                }
                return;
@ -209,34 +210,46 @@ public class PermissionService {
        dataSetColumnPermissionsDTO.setAuthTargetType("user");
        datasetColumnPermissions.addAll(columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO));
        if (CollectionUtils.isNotEmpty(roleIds)) {
-            dataSetColumnPermissionsDTO.setAuthTargetIds(roleIds);
-            dataSetColumnPermissionsDTO.setAuthTargetType("role");
-            List<DataSetColumnPermissionsDTO> roleColumnPermissionsDTOS = new ArrayList<>();
-            for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
-                columnPermissionsDTO.getWhiteListUser();
-                List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {
-                }.getType());
-                if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) {
-                    roleColumnPermissionsDTOS.add(columnPermissionsDTO);
+            DataSetColumnPermissionsDTO request = new DataSetColumnPermissionsDTO();
+            request.setDatasetId(datasetId);
+            request.setAuthTargetType("role");
+            List<Item> items = (List<Item>)columnPermissionService.authObjs(request);
+            roleIds = roleIds.stream().filter(id -> {return items.stream().map(Item::getId).collect(Collectors.toList()).contains(id);}).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(roleIds)){
+                dataSetColumnPermissionsDTO.setAuthTargetIds(roleIds);
+                dataSetColumnPermissionsDTO.setAuthTargetType("role");
+                List<DataSetColumnPermissionsDTO> roleColumnPermissionsDTOS = new ArrayList<>();
+                for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
+                    columnPermissionsDTO.getWhiteListUser();
+                    List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {
+                    }.getType());
+                    if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) {
+                        roleColumnPermissionsDTOS.add(columnPermissionsDTO);
+                    }
                }
+                datasetColumnPermissions.addAll(roleColumnPermissionsDTOS);
            }
-            datasetColumnPermissions.addAll(roleColumnPermissionsDTOS);
        }

        if (deptId != null) {
-            dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(deptId));
-            dataSetColumnPermissionsDTO.setAuthTargetType("dept");
-            List<DataSetColumnPermissionsDTO> deptColumnPermissionsDTOS = new ArrayList<>();
-            for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
-                List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {
-                }.getType());
-                if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) {
-                    deptColumnPermissionsDTOS.add(columnPermissionsDTO);
+            DataSetColumnPermissionsDTO request = new DataSetColumnPermissionsDTO();
+            request.setDatasetId(datasetId);
+            request.setAuthTargetType("dept");
+            List<Item> items = (List<Item>)columnPermissionService.authObjs(request);
+            if(items.stream().map(Item::getId).collect(Collectors.toList()).contains(deptId)){
+                dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(deptId));
+                dataSetColumnPermissionsDTO.setAuthTargetType("dept");
+                List<DataSetColumnPermissionsDTO> deptColumnPermissionsDTOS = new ArrayList<>();
+                for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
+                    List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {
+                    }.getType());
+                    if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) {
+                        deptColumnPermissionsDTOS.add(columnPermissionsDTO);
+                    }
                }
+                datasetColumnPermissions.addAll(deptColumnPermissionsDTOS);
            }
-            datasetColumnPermissions.addAll(deptColumnPermissionsDTOS);
        }
-
        return datasetColumnPermissions;
    }

--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@ -73,28 +73,7 @@ dataease.sqlinjection.whitelists=/dataset/table/sqlPreview,/dataset/table/update
 server.compression.enabled=true
 server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
 server.compression.min-response-size=1024
-#\u4E0B\u9762\u7684\u914D\u7F6E\u65B0\u589E\u5230/opt/dataease/conf/dataease/properties
-#\u7F13\u5B58\u7C7B\u578B
-##spring.cache.type=redis
-#spring.cache.type=ehcache
-#redis\u516C\u5171\u914D\u7F6E
-#spring.redis.timeout=10000
-#spring.redis.lettuce.pool.max-active=8
-#spring.redis.lettuce.pool.max-wait=-1
-#spring.redis.lettuce.pool.max-idle=8
-#\u5355\u673A\u6A21\u5F0Fredis\u914D\u7F6E
-#spring.redis.database=0
-#spring.redis.host=192.168.0.110
-#spring.redis.port=6379
-#spring.redis.password=DataEase_ZNB@REDIS
-#\u54E8\u5175\u6A21\u5F0Fredis\u914D\u7F6E
-#spring.redis.sentinel.master=mymaster
-#spring.redis.sentinel.nodes=192.168.0.110:26379,192.168.0.110:26380,192.168.0.110:26381
-#spring.redis.sentinel.password=
-#cluster\u6A21\u5F0Fredis\u914D\u7F6E
-#spring.redis.cluster.nodes=192.168.0.110:7001,192.168.0.110:7002,192.168.0.110:7003,192.168.0.110:7004,192.168.0.110:7005,192.168.0.110:7006
-#spring.redis.cluster.max-redirects=3
-#spring.redis.password=DataEase_ZNB@REDIS
+
 server.servlet.context-parameters.configurationStrategy=SYSTEM_PROPERTIES
 server.servlet.session.cookie.http-only=true
 server.servlet.session.tracking-modes=cookie
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@ -136,7 +136,7 @@
          key="__operation"
          :label="$t('commons.operating')"
          fixed="right"
-          min-width="100"
+          min-width="180"
        >
          <template slot-scope="scope">
            <el-button
@ -147,6 +147,15 @@
            >{{
              $t(disableEdit(scope.row) ? 'auth.view' : 'commons.edit')
            }}</el-button>
+
+            <el-button
+              class="de-text-btn mar3 mar6"
+              :disabled="disableExec(scope.row)"
+              type="text"
+              @click="execTask(scope.row)"
+            >{{ $t("emailtask.execute_now") }}
+            </el-button>
+
            <el-dropdown
              size="medium"
              trigger="click"
@ -164,12 +173,6 @@
                <template
                  v-if="!['Exec'].includes(scope.row.status)"
                >
-                  <el-dropdown-item
-                    :disabled="disableExec(scope.row)"
-                    command="exec"
-                  >
-                    {{ $t('components.run_once') }}
-                  </el-dropdown-item>
                  <el-dropdown-item
                    v-if="scope.row.status === 'Pending'"
                    command="continue"
@ -858,8 +861,7 @@ export default {
    },
    disableExec(task) {
      return (
-        task.status === 'Pending' ||
-        !hasDataPermission('manage', task.privileges)
+        task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges)
      )
    },
    disableDelete(task) {
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@ -462,11 +462,7 @@ export default {

    tabClick() {
      if (this.tabActive === 'dataPreview') {
-        const reload = localStorage.getItem('reloadDsData')
-        if (reload === 'true') {
-          localStorage.setItem('reloadDsData', 'false')
-          this.initTable(this.param.id)
-        }
+        this.initTable(this.param.id)
      }
    },

--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@ -385,8 +385,8 @@ export default {
        desc: [
          {
            min: 0,
-            max: 200,
-            message: i18n.t('datasource.input_limit', { num: '0~200' }),
+            max: 50,
+            message: i18n.t('datasource.input_limit', { num: '0~50' }),
            trigger: 'blur'
          }
        ],
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@ -6,12 +6,14 @@
          type="primary"
          icon="el-icon-plus"
          @click="() => selectDataset()"
-        >{{ $t("dataset.add_task") }}</deBtn>
+        >{{ $t("dataset.add_task") }}
+        </deBtn>
        <deBtn
          :disabled="!multipleSelection.length"
          secondary
          @click="confirmDelete"
-        >{{ $t("organization.delete") }}</deBtn>
+        >{{ $t("organization.delete") }}
+        </deBtn>
      </el-col>
      <el-col
        :span="14"
@ -33,10 +35,12 @@
          :plain="!!filterTexts.length"
          icon="iconfont icon-icon-filter"
          @click="filterShow"
-        >{{ $t("user.filter")
-        }}<template v-if="filterTexts.length">
-          ({{ filterTexts.length }})
-        </template>
+        >{{
+            $t("user.filter")
+          }}
+          <template v-if="filterTexts.length">
+            ({{ filterTexts.length }})
+          </template>
        </deBtn>
        <el-dropdown
          trigger="click"
@ -45,7 +49,8 @@
          <deBtn
            secondary
            icon="el-icon-setting"
-          >{{ $t("user.list") }}</deBtn>
+          >{{ $t("user.list") }}
+          </deBtn>
          <el-dropdown-menu
            slot="dropdown"
            class="list-columns-select"
@ -55,7 +60,8 @@
              v-model="checkAll"
              :indeterminate="isIndeterminate"
              @change="handleCheckAllChange"
-            >{{ $t("dataset.check_all") }}</el-checkbox>
+            >{{ $t("dataset.check_all") }}
+            </el-checkbox>
            <el-checkbox-group
              v-model="checkedColumnNames"
              @change="handleCheckedColumnNamesChange"
@ -64,7 +70,8 @@
                v-for="column in columnNames"
                :key="column.props"
                :label="column.props"
-              >{{ $t(column.label) }}</el-checkbox>
+              >{{ $t(column.label) }}
+              </el-checkbox>
            </el-checkbox-group>
          </el-dropdown-menu>
        </el-dropdown>
@ -76,7 +83,7 @@
    >
      <span class="sum">{{ paginationConfig.total }}</span>
      <span class="title">{{ $t("user.result_one") }}</span>
-      <el-divider direction="vertical" />
+      <el-divider direction="vertical"/>
      <i
        v-if="showScroll"
        class="el-icon-arrow-left arrow-filter"
@ -89,9 +96,9 @@
          class="text"
        >
          {{ ele }} <i
-            class="el-icon-close"
-            @click="clearOneFilter(index)"
-          />
+          class="el-icon-close"
+          @click="clearOneFilter(index)"
+        />
        </p>
      </div>
      <i
@ -104,7 +111,8 @@
        class="clear-btn"
        icon="el-icon-delete"
        @click="clearFilter"
-      >{{ $t("user.clear_filter") }}</el-button>
+      >{{ $t("user.clear_filter") }}
+      </el-button>
    </div>
    <div
      id="resize-for-filter"
@ -154,14 +162,14 @@
        >
          <template slot-scope="scope">
            <span v-if="scope.row.rate === 'SIMPLE'">{{
-              $t("dataset.execute_once")
-            }}</span>
+                $t("dataset.execute_once")
+              }}</span>
            <span v-if="scope.row.rate === 'CRON'">{{
-              $t("dataset.cron_config")
-            }}</span>
+                $t("dataset.cron_config")
+              }}</span>
            <span v-if="scope.row.rate === 'SIMPLE_CRON'">{{
-              $t("dataset.simple_cron")
-            }}</span>
+                $t("dataset.simple_cron")
+              }}</span>
          </template>
        </el-table-column>

@ -189,8 +197,8 @@
              v-if="scope.row.lastExecStatus"
              :class="[`de-${scope.row.lastExecStatus}-pre`, 'de-status']"
            >{{
-               $t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`)
-             }}
+                $t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`)
+              }}
              <svg-icon
                v-if="scope.row.lastExecStatus === 'Error'"
                style="cursor: pointer;"
@ -244,16 +252,22 @@
          key="__operation"
          :label="$t('commons.operating')"
          fixed="right"
-          width="100"
+          width="160"
        >
          <template slot-scope="scope">
            <el-button
              class="de-text-btn mar3 mar6"
              type="text"
              @click="selectDataset(scope.row)"
-            >{{
-              $t(disableEdit(scope.row) ? "auth.view" : "commons.edit")
-            }}</el-button>
+            >{{ $t(disableEdit(scope.row) ? "auth.view" : "commons.edit") }}
+            </el-button>
+            <el-button
+              class="de-text-btn mar3 mar6"
+              :disabled="disableExec(scope.row)"
+              type="text"
+              @click="execTask(scope.row)"
+            >{{ $t("emailtask.execute_now") }}
+            </el-button>
            <el-dropdown
              size="medium"
              trigger="click"
@ -270,12 +284,6 @@
                <template
                  v-if="!['Exec'].includes(scope.row.status)"
                >
-                  <el-dropdown-item
-                    :disabled="disableExec(scope.row)"
-                    command="exec"
-                  >
-                    {{ $t("components.run_once") }}
-                  </el-dropdown-item>
                  <el-dropdown-item
                    v-if="scope.row.status === 'Pending'"
                    command="continue"
@ -325,18 +333,18 @@
          secondary
          @click="show_error_massage = false"
        >{{
-          $t("dataset.close")
-        }}</deBtn>
+            $t("dataset.close")
+          }}</deBtn>
      </span>
    </el-dialog>
  </div>
 </template>

 <script>
-import { columnOptions } from './options'
-import { formatOrders } from '@/utils/index'
-import { datasetTaskList, post } from '@/api/dataset/dataset'
-import { hasDataPermission } from '@/utils/permission'
+import {columnOptions} from './options'
+import {formatOrders} from '@/utils/index'
+import {datasetTaskList, post} from '@/api/dataset/dataset'
+import {hasDataPermission} from '@/utils/permission'
 import GridTable from '@/components/gridTable/index.vue'
 import filterUser from './FilterUser.vue'
 import msgCfm from '@/components/msgCfm/index'
@ -345,12 +353,13 @@ import keyEnter from '@/components/msgCfm/keyEnter.js'

 export default {
  name: 'DatasetTaskList',
-  components: { GridTable, filterUser },
+  components: {GridTable, filterUser},
  mixins: [msgCfm, keyEnter],
  props: {
    transCondition: {
      type: Object,
-      default: () => {}
+      default: () => {
+      }
    }
  },
  data() {
@ -387,7 +396,7 @@ export default {
    }
  },
  created() {
-    const { taskId, name } = this.transCondition
+    const {taskId, name} = this.transCondition
    if (taskId) {
      this.nickName = name
    }
@ -418,7 +427,7 @@ export default {
        document.querySelector('#resize-for-filter')
      )
    },
-    layoutResize: _.debounce(function() {
+    layoutResize: _.debounce(function () {
      this.getScrollStatus()
    }, 200),
    scrollPre() {
@ -492,7 +501,7 @@ export default {
      this.handleCurrentChange(1)
    },
    search(showLoading = true) {
-      const { taskId, name } = this.transCondition
+      const {taskId, name} = this.transCondition
      const param = {
        orders: formatOrders(this.orderConditions),
        conditions: [...this.cacheCondition]
@ -511,7 +520,7 @@ export default {
          field: 'dataset_table_task.id'
        })
      }
-      const { currentPage, pageSize } = this.paginationConfig
+      const {currentPage, pageSize} = this.paginationConfig
      datasetTaskList(currentPage, pageSize, param, showLoading).then(
        (response) => {
          const multipleSelection = this.multipleSelection.map(ele => ele.id)
@ -559,7 +568,7 @@ export default {
      })
    },
    changeTaskStatus(task) {
-      const { status } = task
+      const {status} = task
      if (!['Pending', 'Underway'].includes(status)) {
        return
      }
@ -599,11 +608,12 @@ export default {
            this.initSearch(true)
          })
        })
-        .catch(() => {})
+        .catch(() => {
+        })
    },
    selectDataset(row) {
      if (row) {
-        const { datasetName, id, tableId } = row
+        const {datasetName, id, tableId} = row
        this.$router.push({
          path: '/task-ds-form',
          query: {
@ -624,9 +634,7 @@ export default {
      )
    },
    disableExec(task) {
-      return (task.status === 'Pending' ||
-        !hasDataPermission('manage', task.privileges)
-      )
+      return (task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges))
    },
    disableDelete(task) {
      return false
@ -661,6 +669,7 @@ export default {
  height: 100px;
  overflow-y: auto;
 }
+
 .codemirror ::v-deep .CodeMirror-scroll {
  height: 100px;
  overflow-y: auto;
@ -708,6 +717,7 @@ export default {
    border-radius: 4px;
  }
 }
+
 .table-container {
  height: calc(100% - 50px);

@ -744,8 +754,10 @@ export default {
    width: 100%;
  }
 }
+
 .de-card-dropdown {
  margin-top: 0 !important;
+
  .popper__arrow {
    display: none !important;
  }