Merge pull request #1861 from running-elephant/dev

Release RC.1

Author: Cuiyansong

.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

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.0</version>
+        <version>1.0.0-rc.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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}"
     })

data-providers/data-provider-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.0</version>
+        <version>1.0.0-rc.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/data-provider-base/src/main/java/datart/data/provider/ProviderManager.java

@@ -195,7 +195,9 @@ private void excludeColumns(Dataframe data, Set<SelectColumn> include) {
             if (include
                     .stream()
                     .noneMatch(selectColumn ->
-                            column.columnKey().equals(selectColumn.getColumnKey()) || column.columnKey().equals(selectColumn.getAlias()))) {
+                            column.columnKey().equals(selectColumn.getColumnKey())
+                                    || column.columnKey().equals(selectColumn.getAlias())
+                                    || column.columnKey().contains(selectColumn.getColumnKey()))) {
                 excludeIndex.add(i);
             }
         }

data-providers/file-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.0</version>
+        <version>1.0.0-rc.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/http-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.0</version>
+        <version>1.0.0-rc.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

data-providers/jdbc-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.0</version>
+        <version>1.0.0-rc.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.0</version>
+        <version>1.0.0-rc.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

frontend/.gitignore

@@ -34,5 +34,6 @@ yarn-error.log*
 # docs
 /types
 
+/public/custom-chart-plugins/
 /public/task
 /public/antd/theme.less

frontend/.husky/pre-commit

@@ -0,0 +1,6 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd frontend
+npm run lint:css
+npm run lint:style

frontend/.husky/pre-push

@@ -3,3 +3,5 @@
 
 cd frontend
 npm run test:ci
+npm run lint:css
+npm run lint:style

frontend/.stylelintrc renamed to frontend/.stylelintrc.json

@@ -1,14 +1,17 @@
 {
-  "processors": ["stylelint-processor-styled-components"],
   "extends": [
     "stylelint-config-recommended",
     "stylelint-config-styled-components",
     "stylelint-config-recess-order"
   ],
+  "rules": {
+    "function-no-unknown": null,
+    "font-family-no-missing-generic-family-keyword": null
+  },
   "overrides": [
     {
       "files": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
-      "customSyntax": "postcss"
+      "customSyntax": "@stylelint/postcss-css-in-js"
     }
   ]
 }

frontend/craco.config.js

@@ -136,6 +136,13 @@ module.exports = {
         },
       };
 
+      const instanceOfMiniCssExtractPlugin = webpackConfig.plugins.filter(
+        plugin => plugin.constructor.name === 'MiniCssExtractPlugin',
+      )[0];
+      if (instanceOfMiniCssExtractPlugin) {
+        instanceOfMiniCssExtractPlugin.options.ignoreOrder = true;
+      }
+
       const defaultEntryHTMLPlugin = webpackConfig.plugins.filter(plugin => {
         return plugin.constructor.name === 'HtmlWebpackPlugin';
       })[0];
@@ -189,15 +196,14 @@ module.exports = {
     },
     modulePaths: ['../'],
   },
-
   devServer: {
     before: function (app, server, compiler) {
       app.get('/api/v1/plugins/custom/charts', function (req, res) {
         const pluginPath = 'custom-chart-plugins';
         const dir = fs.readdirSync(`./public/${pluginPath}`);
         res.json({
           data: (dir || [])
-            .filter(file => path.extname(file) == '.js')
+            .filter(file => path.extname(file) === '.js')
             .map(file => `${pluginPath}/${file}`),
           errCode: 0,
           success: true,