Merge pull request #787 from qxqzx13/master

fix table odd and even background color

Author: scottsut

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

@@ -92,17 +92,13 @@ const StyledTable = styled(Table)<{ tableStyleConfig?: TableStyleConfigProps }>`
     background: #fafafa;
   }
 
-  .ant-table .ant-table-container .ant-table-body .ant-table-tbody td {
-    background: transparent;
-  }
-
-  .odd {
+  .ant-table .ant-table-container .ant-table-body .odd td{
     background: ${p =>
       p?.tableStyleConfig?.odd?.backgroundColor || 'transparent'};
     color: ${p => p?.tableStyleConfig?.odd?.color || 'auto'};
   }
 
-  .even {
+  .ant-table .ant-table-container .ant-table-body .even td{
     background: ${p =>
       p?.tableStyleConfig?.even?.backgroundColor || 'transparent'};
     color: ${p => p?.tableStyleConfig?.even?.color || 'auto'};

frontend/src/app/components/ChartGraph/ClusterBarChart/config.ts

@@ -436,12 +436,12 @@ const config: ChartConfig = {
   ],
   settings: [
     {
-      label: 'paging.title',
+      label: 'viz.palette.setting.paging.title',
       key: 'paging',
       comType: 'group',
       rows: [
         {
-          label: 'paging.pageSize',
+          label: 'viz.palette.setting.paging.pageSize',
           key: 'pageSize',
           default: 1000,
           comType: 'inputNumber',
@@ -537,10 +537,6 @@ const config: ChartConfig = {
           title: '参考线',
           open: '点击参考线配置',
         },
-        paging: {
-          title: '常规',
-          pageSize: '总行数',
-        },
       },
     },
     {
@@ -612,10 +608,6 @@ const config: ChartConfig = {
           title: 'Reference Line',
           open: 'Open',
         },
-        paging: {
-          title: 'Paging',
-          pageSize: 'Page Size',
-        },
       },
     },
   ],

frontend/src/app/components/ChartGraph/ClusterColumnChart/config.ts

@@ -436,12 +436,12 @@ const config: ChartConfig = {
   ],
   settings: [
     {
-      label: 'paging.title',
+      label: 'viz.palette.setting.paging.title',
       key: 'paging',
       comType: 'group',
       rows: [
         {
-          label: 'paging.pageSize',
+          label: 'viz.palette.setting.paging.pageSize',
           key: 'pageSize',
           default: 1000,
           comType: 'inputNumber',
@@ -537,10 +537,6 @@ const config: ChartConfig = {
           title: '参考线',
           open: '点击参考线配置',
         },
-        paging: {
-          title: '常规',
-          pageSize: '总行数',
-        },
       },
     },
     {
@@ -612,10 +608,6 @@ const config: ChartConfig = {
           title: 'Reference Line',
           open: 'Open',
         },
-        paging: {
-          title: 'Paging',
-          pageSize: 'Page Size',
-        },
       },
     },
   ],

frontend/src/app/components/ChartGraph/PivotSheetChart/config.ts

@@ -377,10 +377,6 @@ const config: ChartConfig = {
           subTotalPosition: 'Sub Total Position',
           aggregateFields: 'Summary Fields',
         },
-        paging: {
-          title: 'Paging',
-          pageSize: 'Page Size',
-        },
       },
     },
   ],

frontend/src/app/components/ChartGraph/ScoreChart/config.ts

@@ -250,12 +250,12 @@ const config: ChartConfig = {
   ],
   settings: [
     {
-      label: 'paging.title',
+      label: 'viz.palette.setting.paging.title',
       key: 'paging',
       comType: 'group',
       rows: [
         {
-          label: 'paging.pageSize',
+          label: 'viz.palette.setting.paging.pageSize',
           key: 'pageSize',
           default: 1000,
           comType: 'inputNumber',
@@ -287,10 +287,6 @@ const config: ChartConfig = {
           bodyFontSize: '主体字体大小',
           footerFontSize: '尾部字体大小',
         },
-        paging: {
-          title: '常规',
-          pageSize: '总行数',
-        },
       },
     },
     {
@@ -311,10 +307,6 @@ const config: ChartConfig = {
           bodyFontSize: 'Body Font Size',
           footerFontSize: 'Footer Font Size',
         },
-        paging: {
-          title: 'Paging',
-          pageSize: 'Page Size',
-        },
       },
     },
   ],

frontend/src/app/components/FormGenerator/Basic/BasicInput.tsx

@@ -28,7 +28,7 @@ import { BW } from './components/BasicWrapper';
 const BasicInput: FC<ItemLayoutProps<ChartStyleConfig>> = memo(
   ({ ancestors, translate: t = title => title, data, onChange }) => {
     const [cache, setCache] = useState(data);
-    const { comType, options, disabled, ...rest } = cache;
+    const { comType, options, disabled, label, ...rest } = cache;
 
     const debouncedDataChange = useMemo(
       () =>
@@ -39,7 +39,7 @@ const BasicInput: FC<ItemLayoutProps<ChartStyleConfig>> = memo(
     );
 
     return (
-      <Wrapper label={t(cache.label, true)}>
+      <Wrapper label={t(data?.label, true)}>
         <Input
           disabled={data?.disabled}
           {...rest}

frontend/src/app/components/FormGenerator/Basic/BasicInputNumber.tsx

@@ -29,7 +29,7 @@ import { BW } from './components/BasicWrapper';
 const BasicInputNumber: FC<ItemLayoutProps<ChartStyleConfig>> = memo(
   ({ ancestors, translate: t = title => title, data, onChange }) => {
     const [cache, setCache] = useState(data);
-    const { comType, options, disabled, ...rest } = cache;
+    const { comType, options, disabled, label, ...rest } = cache;
 
     const debouncedDataChange = useMemo(
       () =>
@@ -40,7 +40,7 @@ const BasicInputNumber: FC<ItemLayoutProps<ChartStyleConfig>> = memo(
     );
 
     return (
-      <Wrapper label={t(cache.label, true)}>
+      <Wrapper label={t(data?.label, true)}>
         <InputNumber
           disabled={data?.disabled}
           {...rest}

frontend/src/app/types/ChartConfigDTO.d.ts

@@ -23,6 +23,7 @@ export type ChartStyleConfigDTO = {
   key: string;
   value?: any;
   rows?: ChartStyleConfigDTO[];
+  comType?: string;
 };
 
 export type ChartDataConfigDTO = ChartDataConfig & {};

frontend/src/app/utils/internalChartHelper.ts

@@ -413,7 +413,12 @@ export function mergeChartStyleConfigs(
     const sEle =
       'key' in tEle ? source?.find(s => s?.key === tEle.key) : source?.[index];
 
-    if (!isUndefined(sEle?.['value'])) {
+    if (!isUndefined(sEle?.['value']) && (!sEle?.comType || !tEle.comType)) {
+      tEle['value'] = sEle?.['value'];
+    } else if (
+      !isUndefined(sEle?.['value']) &&
+      sEle?.comType === tEle.comType
+    ) {
       tEle['value'] = sEle?.['value'];
     }
     if (!isEmptyArray(tEle?.rows)) {