Merge pull request #137 from running-elephant/dev

Dev
running-elephant · Jul 28, 2022 · 9f6acc6 · 9f6acc6
2 parents eae4861 + 4ab658a
commit 9f6acc6
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/.github/workflows/dev-ut-stage.js.yml b/.github/workflows/dev-ut-stage.js.yml
@@ -33,3 +33,7 @@ jobs:
       working-directory: ./frontend
     - run: npm run test:ci
       working-directory: ./frontend
+    - run: npm run lint:css
+      working-directory: ./frontend
+    - run: npm run lint:style
+      working-directory: ./frontend
diff --git a/core/src/main/java/datart/core/mappers/ext/VariableMapperExt.java b/core/src/main/java/datart/core/mappers/ext/VariableMapperExt.java
@@ -18,6 +18,19 @@ public interface VariableMapperExt extends VariableMapper {
     })
     List<Variable> selectByIds(Collection<String> ids);
 
+    @Select({
+            "<script>",
+            "SELECT count(1) FROM variable WHERE org_id=#{orgId} AND `name` = #{name}",
+            "<if test=\"viewId==null\">",
+            " AND view_id IS NULL ",
+            "</if>",
+            "<if test=\"viewId!=null\">",
+            " AND view_id=#{viewId} ",
+            "</if>",
+            "</script>",
+    })
+    int checkVariableName(String orgId, String viewId, String name);
+
     @Select({
             "SELECT * FROM variable WHERE view_id = #{viewId}"
     })

diff --git a/frontend/src/app/components/ChartEditor.tsx b/frontend/src/app/components/ChartEditor.tsx
@@ -502,7 +502,7 @@ export const ChartEditor: FC<ChartEditorProps> = ({
       } else {
         // dataChart
         confirm({
-          title: '保存修改后不能撤销，确定继续保存吗？',
+          title: tg('button.saveConfirm'),
           icon: <ExclamationCircleOutlined />,
           async onOk() {
             dispatch(
@@ -540,6 +540,7 @@ export const ChartEditor: FC<ChartEditorProps> = ({
     chartConfig,
     dataview?.computedFields,
     history,
+    tg,
   ]);
 
   const saveChartToDashBoard = useCallback(

diff --git a/frontend/src/locales/en/translation.json b/frontend/src/locales/en/translation.json
@@ -20,7 +20,8 @@
       "saveAs": "Save As",
       "cancel": "Cancel",
       "ok": "OK",
-      "shortcuts": "Shortcuts"
+      "shortcuts": "Shortcuts",
+      "saveConfirm": "After saving the changes, it cannot be undone. Are you sure you want to continue saving?"
     },
     "operation": {
       "archiveConfirm": "Archive confirm",

diff --git a/frontend/src/locales/zh/translation.json b/frontend/src/locales/zh/translation.json
@@ -20,7 +20,8 @@
       "saveAs": "另存为",
       "cancel": "取消",
       "ok": "确定",
-      "shortcuts": "快捷键"
+      "shortcuts": "快捷键",
+      "saveConfirm": "保存修改后不能撤销，确定继续保存吗？"
     },
     "operation": {
       "archiveConfirm": "确定移至回收站？",

diff --git a/server/src/main/java/datart/server/service/impl/VariableServiceImpl.java b/server/src/main/java/datart/server/service/impl/VariableServiceImpl.java
@@ -20,6 +20,8 @@
 
 import com.alibaba.fastjson.JSON;
 import datart.core.base.consts.VariableTypeEnum;
+import datart.core.base.exception.Exceptions;
+import datart.core.base.exception.ParamException;
 import datart.core.common.UUIDGenerator;
 import datart.core.entity.RelVariableSubject;
 import datart.core.entity.Role;
@@ -67,11 +69,10 @@ public void requirePermission(Variable entity, int permission) {
 
     @Override
     public boolean checkUnique(String orgId, String viewId, String name) {
-        Variable variable = new Variable();
-        variable.setOrgId(orgId);
-        variable.setName(name);
-        variable.setViewId(viewId);
-        return checkUnique(variable);
+        if (variableMapper.checkVariableName(orgId, viewId, name) != 0) {
+            Exceptions.tr(ParamException.class, "error.param.exists.name");
+        }
+        return true;
     }
 
     @Override
@@ -267,7 +268,7 @@ public boolean update(BaseUpdateParam updateParam) {
         VariableUpdateParam param = (VariableUpdateParam) updateParam;
         Variable retrieve = retrieve(updateParam.getId());
         if (!param.getName().equalsIgnoreCase(retrieve.getName())) {
-            checkUnique(retrieve.getOrgId(), null, param.getName());
+            checkUnique(retrieve.getOrgId(), retrieve.getViewId(), param.getName());
         }
         if (param.getRelVariableSubjects() != null) {
             rvsMapper.deleteByVariables(Collections.singleton(param.getId()));