Merge pull request #91 from running-elephant/dev

Dev

Author: Cuiyansong

bin/datart-server.sh

@@ -29,7 +29,8 @@ START_CLASS="datart.DatartServerApplication"
 #java -server -Xms2G -Xmx2G  -Dspring.profiles.active=config -Dfile.encoding=UTF-8 -cp "${CLASS_PATH}" datart.DatartServerApplication
 
 datart_status(){
-    result=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}' | wc -l`
+    #result=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}' | wc -l`
+    result=`ps -ef | grep -v grep | grep "${BASE_DIR}/lib" | grep 'DatartServerApplication' | awk {'print $2'} | wc -l`
 
     if [[ $result -eq 0 ]]; then
         return 0
@@ -47,7 +48,8 @@ datart_start(){
 
     else
         echo ""
-        PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+        #PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+        PID=`ps -ef | grep -v grep | grep "${BASE_DIR}/lib" | grep 'DatartServerApplication' | awk {'print $2'}`
         echo "Datart is Running Now..... PID is ${PID} "
     fi
 }
@@ -60,7 +62,8 @@ datart_stop(){
         echo "Datart is not Running....."
         echo ""
     else
-         ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'| xargs kill -9
+         #ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'| xargs kill -9
+         ps -ef | grep -v grep | grep "$BASE_DIR/lib" | grep 'DatartServerApplication' | awk {'print $2'} | xargs kill -9
 
     fi
 }
@@ -77,7 +80,7 @@ case $1 in
     stop )
         echo ""
 
-        echo "Datart Stoping.......... "
+        echo "Datart Stopping.......... "
 
         echo ""
         datart_stop
@@ -100,7 +103,8 @@ case $1 in
             echo ""
         else
             echo ""
-            PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+            #PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+            PID=`ps -ef | grep -v grep | grep "${BASE_DIR}/lib" | grep 'DatartServerApplication' | awk {'print $2'}`
             echo "Datart is Running..... PID is ${PID}"
             echo ""
         fi

config/profiles/application-config.yml

@@ -62,6 +62,12 @@ spring:
 server:
   port: ${server.port:8080}
   address: ${server.ip:0.0.0.0}
+  ssl:
+    enabled: false
+    key-store: keystore.p12 # Absolute path
+    key-store-password: password
+    keyStoreType: PKCS12
+    keyAlias: tomcat
 
 datart:
   server:

frontend/src/app/components/ChartEditor.tsx

@@ -60,6 +60,7 @@ import { FC, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router';
 import styled from 'styled-components/macro';
+import { LEVEL_100 } from 'styles/StyleConstants';
 import { CloneValueDeep, isEmptyArray } from 'utils/object';
 import ChartWorkbench from '../pages/ChartWorkbenchPage/components/ChartWorkbench/ChartWorkbench';
 import {
@@ -597,7 +598,7 @@ const StyledChartWorkbenchPage = styled.div`
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 55;
+  z-index: ${LEVEL_100};
   display: flex;
   min-width: 0;
   min-height: 0;

frontend/src/app/components/ChartGraph/BasicTableChart/TableComponents.tsx

@@ -3,7 +3,7 @@ import { Tooltip } from 'antd';
 import React from 'react';
 import { Resizable } from 'react-resizable';
 import styled from 'styled-components/macro';
-import { BLUE } from 'styles/StyleConstants';
+import { BLUE, LEVEL_1 } from 'styles/StyleConstants';
 
 export const TableComponentsTd = ({
   children,
@@ -78,7 +78,7 @@ const ResizableHandleStyle = styled.span`
   position: absolute;
   right: -5px;
   bottom: 0;
-  z-index: 1;
+  z-index: ${LEVEL_1};
   width: 10px;
   height: 100%;
   cursor: col-resize;

frontend/src/app/components/ChartGraph/PivotSheetChart/AntVS2Wrapper.tsx

@@ -16,47 +16,45 @@
  * limitations under the License.
  */
 
-import { S2Theme } from '@antv/s2';
 import { SheetComponent } from '@antv/s2-react';
 import '@antv/s2-react/dist/style.min.css';
 import { FC, memo } from 'react';
 import styled from 'styled-components/macro';
 import { FONT_SIZE_LABEL } from 'styles/StyleConstants';
+import { AndvS2Config } from './types';
 
-const AntVS2Wrapper: FC<{
-  dataCfg;
-  options;
-  theme?: S2Theme;
-}> = memo(({ dataCfg, options, theme }) => {
-  if (!dataCfg) {
-    return <div></div>;
-  }
+const AntVS2Wrapper: FC<AndvS2Config> = memo(
+  ({ dataCfg, options, theme, palette }) => {
+    if (!dataCfg) {
+      return <div></div>;
+    }
 
-  const onDataCellHover = ({ event, viewMeta }) => {
-    viewMeta.spreadsheet.tooltip.show({
-      position: {
-        x: event.clientX,
-        y: event.clientY,
-      },
-      content: (
-        <TableDataCellTooltip
-          datas={viewMeta.data}
-          meta={viewMeta.spreadsheet.dataCfg.meta}
-        />
-      ),
-    });
-  };
+    const onDataCellHover = ({ event, viewMeta }) => {
+      viewMeta.spreadsheet.tooltip.show({
+        position: {
+          x: event.clientX,
+          y: event.clientY,
+        },
+        content: (
+          <TableDataCellTooltip
+            datas={viewMeta.data}
+            meta={viewMeta.spreadsheet.dataCfg.meta}
+          />
+        ),
+      });
+    };
 
-  return (
-    <StyledAntVS2Wrapper
-      sheetType="pivot"
-      dataCfg={dataCfg}
-      options={options}
-      themeCfg={{ theme }}
-      onDataCellHover={onDataCellHover}
-    />
-  );
-});
+    return (
+      <StyledAntVS2Wrapper
+        sheetType="pivot"
+        dataCfg={dataCfg}
+        options={options}
+        themeCfg={{ theme, palette }}
+        onDataCellHover={onDataCellHover}
+      />
+    );
+  },
+);
 
 const TableDataCellTooltip: FC<{
   datas?: object;
@@ -72,7 +70,11 @@ const TableDataCellTooltip: FC<{
         .map(m => {
           const uniqKey = m?.field;
           if (uniqKey in datas) {
-            return <li>{`${m?.name}: ${m?.formatter(datas[uniqKey])}`}</li>;
+            return (
+              <li key={uniqKey}>{`${m?.name}: ${m?.formatter(
+                datas[uniqKey],
+              )}`}</li>
+            );
           }
           return null;
         })