Merge pull request #190 from actiontech/fix_upgrade_render_sql_render

[fix](com render sql): replace code for render sql com
actiontech · Jan 25, 2024 · 6d80343 · 6d80343
2 parents d893dc4 + 34a438f
commit 6d80343
Show file tree

Hide file tree

Showing 13 changed files with 5,590 additions and 5,172 deletions.
diff --git a/packages/sqle/src/components/RenderSQL/index.tsx b/packages/sqle/src/components/RenderSQL/index.tsx
@@ -8,7 +8,7 @@ import { RenderSQLStyleWrapper } from './style';
 const RenderSQL: React.FC<RenderSQLProps> = ({
   sql,
   rows = 10,
-  tooltip,
+  tooltip = true,
   onClick
 }) => {
   if (!sql) {

diff --git a/packages/sqle/src/page/AuditPlan/PlanDetail/DetailCom/index.tsx b/packages/sqle/src/page/AuditPlan/PlanDetail/DetailCom/index.tsx
@@ -16,9 +16,10 @@ import audit_plan from '@actiontech/shared/lib/api/sqle/service/audit_plan';
 import { IAuditPlanSQLHeadV1 } from '@actiontech/shared/lib/api/sqle/service/common';
 import { AuditPlanSQLHeadV1TypeEnum } from '@actiontech/shared/lib/api/sqle/service/common.enum';
 import { formatTime } from '@actiontech/shared/lib/utils/Common';
-import HighlightCode from '../../../../utils/HighlightCode';
 import { useTableRequestParams } from '@actiontech/shared/lib/components/ActiontechTable';
 
+import RenderSQL from '../../../../components/RenderSQL';
+
 const DetailCom = () => {
   const { t } = useTranslation();
 
@@ -71,18 +72,12 @@ const DetailCom = () => {
           (head as IAuditPlanSQLHeadV1[]).map((item) => ({
             title: item.desc,
             dataIndex: item.name,
-            width: item.type === AuditPlanSQLHeadV1TypeEnum.sql ? 300 : 'auto',
+            width: item.type === AuditPlanSQLHeadV1TypeEnum.sql ? 500 : 'auto',
             render: (text) => {
               if (item.type === AuditPlanSQLHeadV1TypeEnum.sql) {
-                // todo: RenderSQL
                 return (
-                  <div className="sql-cont-width">
-                    <pre
-                      dangerouslySetInnerHTML={{
-                        __html: HighlightCode.highlightSql(text)
-                      }}
-                      className="pre-warp-break-all"
-                    ></pre>
+                  <div className="sql-cont-width" style={{ width: 500 }}>
+                    <RenderSQL sql={text} />
                   </div>
                 );
               }