From 99960cab6db01e128b510c525b397b4810413609 Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Thu, 4 Aug 2022 10:07:13 +0800
Subject: [PATCH] fix code review issues

---
 client/src/app/app.js            | 4 ++--
 sonar-project.properties         | 3 +++
 ui/src/components/ButtonList.vue | 6 +++---
 ui/src/components/Col.vue        | 5 ++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/src/app/app.js b/client/src/app/app.js
index 1d33881c..b788cdf5 100644
--- a/client/src/app/app.js
+++ b/client/src/app/app.js
@@ -217,8 +217,8 @@ export class ZtfApp {
             return;
         }
 
-        const version = Config.pkg.buildTime ? 'build at ' + new Date(Config.pkg.buildTime).toLocaleString() : '' +
-            DEBUG ? '[debug]' : ''
+        let version = Config.pkg.buildTime ? 'build at ' + new Date(Config.pkg.buildTime).toLocaleString() : ''
+        version +=  DEBUG ? '[debug]' : ''
         app.setAboutPanelOptions({
             applicationName: Lang.string(Config.pkg.name) || Config.pkg.displayName,
             applicationVersion: Config.pkg.version,
diff --git a/sonar-project.properties b/sonar-project.properties
index e24e94ce..00382c66 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -5,3 +5,6 @@ sonar.exclusions=bin/**,demo/**,log/**,xdoc/**,client/node_modules/**,client/ui/
 
 sonar.host.url=http://localhost:59001
 sonar.login=sqp_94f2484e50b1cfea719eb791f4e5d544be887f87
+
+sonar.issue.ignore.multicriteria=e1,e2,e3,e4
+sonar.issue.ignore.multicriteria.e1.ruleKey=javascript:S3358
diff --git a/ui/src/components/ButtonList.vue b/ui/src/components/ButtonList.vue
index d9094430..277c29f2 100644
--- a/ui/src/components/ButtonList.vue
+++ b/ui/src/components/ButtonList.vue
@@ -42,10 +42,10 @@ const buttonPropsList = computed(() => {
         let item: (ButtonProps | Record<string, any>) & {key: string | number | symbol};
 
         if (props.replaceFields && Button.props) {
-            item = Object.keys(Button.props).reduce((item, propName) => {
+            item = Object.keys(Button.props).reduce((item2, propName) => {
                 const replacePropName = props.replaceFields ? props.replaceFields[propName] : null;
-                item[propName] = x[typeof replacePropName === 'string' ? replacePropName : propName];
-                return item;
+              item2[propName] = x[typeof replacePropName === 'string' ? replacePropName : propName];
+                return item2;
             }, {key: x.key !== undefined ? x.key : i});
         } else {
             item = {
diff --git a/ui/src/components/Col.vue b/ui/src/components/Col.vue
index 62bb6ee2..0b3940bc 100644
--- a/ui/src/components/Col.vue
+++ b/ui/src/components/Col.vue
@@ -9,7 +9,6 @@ import {useI18n} from "vue-i18n";
 const { t } = useI18n();
 
 import {computed, defineProps, inject} from "vue";
-import {ButtonProps} from "@/components/Button.vue";
 
 export interface ColumnProps {
   width?: string,
@@ -20,7 +19,7 @@ export interface ColumnProps {
 
 const props = defineProps<ColumnProps>();
 
-let gutter = inject('gutter');
+let gutter = inject('gutter') as any;
 
 const colClass = computed(() => {
   const classes: string[] = [];
@@ -30,7 +29,7 @@ const colClass = computed(() => {
     classes.push(`z-col-${span}`);
   }
 
-  if (props.offset > 0) {
+  if (props.offset && props.offset > 0) {
     classes.push(`z-col-offset-${props.offset}`);
   }
 
-- 
GitLab