@fe-free/core 4.1.40 → 4.1.42

package/src/value_type_map/json_modal.tsx

@@ -31,21 +31,23 @@ function Render(text, props: ProFormItemProps<JSONModalProps>) {
   return (
     <>
       <a onClick={() => setShow(true)}>{title}</a>
-      <Modal
-        title={title}
-        open={show}
-        onCancel={() => setShow(false)}
-        onOk={() => setShow(false)}
-        cancelButtonProps={{
-          style: {
-            display: 'none',
-          },
-        }}
-      >
-        <div className="h-[500px]">
-          <EditorJSON value={jsonText} readonly />
-        </div>
-      </Modal>
+      {show && (
+        <Modal
+          title={title}
+          open
+          onCancel={() => setShow(false)}
+          onOk={() => setShow(false)}
+          cancelButtonProps={{
+            style: {
+              display: 'none',
+            },
+          }}
+        >
+          <div className="h-[500px]">
+            <EditorJSON value={jsonText} readonly />
+          </div>
+        </Modal>
+      )}
     </>
   );
 }

package/src/value_type_map/markdown_modal.tsx

@@ -0,0 +1,44 @@
+import { Modal } from 'antd';
+import { useState } from 'react';
+import { Markdown } from '../markdown';
+
+function Render(text) {
+  const [show, setShow] = useState(false);
+
+  if (!text) {
+    return <div>-</div>;
+  }
+
+  return (
+    <>
+      <div onClick={() => setShow(true)} className="flex cursor-pointer items-center">
+        <div className="truncate">{text}</div>
+        <span className="text-primary">查看</span>
+      </div>
+      {show && (
+        <Modal
+          title="Markdown"
+          open
+          onCancel={() => setShow(false)}
+          onOk={() => setShow(false)}
+          cancelButtonProps={{
+            style: {
+              display: 'none',
+            },
+          }}
+        >
+          <div className="h-[500px]">
+            <Markdown content={text} />
+          </div>
+        </Modal>
+      )}
+    </>
+  );
+}
+
+const markdownModalRender = {
+  render: Render,
+  renderFormItem: () => <></>,
+};
+
+export { markdownModalRender };

package/src/value_type_map/value_type_map.stories.tsx

@@ -25,6 +25,7 @@ async function fakeRequest() {
     dateNumber: +dayjs('2024-10-01'),
     seconds: Math.abs(+dayjs('2024-10-01') / 1000),
     jsonText: JSON.stringify({ name: 'hello world hello world hello world' }),
+    markdownText: `# Hello World\n\nThis is a markdown text.`,
     switchNumber: Math.random() > 0.5 ? 1 : 0,
     switchOptions: Math.random() > 0.5 ? 'ON' : 'OFF',
   }));
@@ -84,6 +85,12 @@ const Table = () => {
       ellipsis: true,
       valueType: CustomValueTypeEnum.CustomJSONModal,
     },
+    {
+      title: 'markdownModal',
+      dataIndex: 'markdownText',
+      ellipsis: true,
+      valueType: CustomValueTypeEnum.CustomMarkdownModal,
+    },
     {
       title: '开关 number',
       dataIndex: 'switchNumber',
@@ -104,6 +111,7 @@ const Table = () => {
     <CRUD
       actions={[]}
       tableProps={{
+        rowKey: 'id',
         columns,
         request: fakeRequest,
       }}

package/src/markdown/deep_seek.tsx

@@ -1,53 +0,0 @@
-import { DownOutlined, UpOutlined } from '@fe-free/icons';
-import { useState } from 'react';
-
-function DeepSeekBlock(props: { children: string }) {
-  const [show, setShow] = useState(true);
-
-  return (
-    <div className="markdown-body-block-deep-seek mb-3 flex flex-col gap-2 text-[12px] text-03">
-      <div
-        className="cursor-pointer"
-        onClick={() => {
-          setShow((v) => !v);
-        }}
-      >
-        深度思考 {show ? <UpOutlined /> : <DownOutlined />}
-      </div>
-      {show && (
-        <div className="relative pl-[15px]">
-          <div className="top=0 absolute left-0 h-full w-[2px] bg-[#00000014]" />
-          {props.children === '<br/>' ? undefined : props.children}
-        </div>
-      )}
-    </div>
-  );
-}
-
-function processWithDeepSeek(text: string) {
-  // 开始 <think> 才算开始
-  if (!text.startsWith('<think>')) {
-    return text;
-  }
-
-  const [left, right] = text.split('</think>');
-
-  let newText = text;
-
-  // 如果 think 部分是 <think>\n\n</think>，相当于没有，则直接返回 right
-  if (text.startsWith('<think>\n\n</think>')) {
-    newText = right;
-  }
-  // 否则做一些处理
-  else {
-    newText =
-      left
-        .replace('<think>\n', '<think>')
-        .replace('\n</think>', '</think>')
-        .replace(/\n/g, '<br/>') + (right || '');
-  }
-
-  return newText;
-}
-
-export { DeepSeekBlock, processWithDeepSeek };

package/src/markdown/style.scss

@@ -1,46 +0,0 @@
-.markdown-body {
-  font-size: 14px;
-
-  pre {
-    padding: 0;
-  }
-
-  .markdown-body-block-code {
-    margin: 0.5rem 0;
-
-    & > div {
-      margin: 0 !important;
-    }
-  }
-
-  .markdown-body-block-chart {
-    background: white;
-    border-radius: 6px;
-    margin: 0.5rem;
-
-    .markdown-body-block-chart-title {
-      font-size: 16px;
-      font-weight: bold;
-      padding: 10px;
-    }
-  }
-
-  .markdown-body-block-knowledge-ref[data-id] {
-    height: 16px;
-    min-width: 16px;
-    cursor: pointer;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 999px;
-    border: 1px solid #0374e9;
-    color: #0374e9;
-    font-size: 12px;
-    padding: 0 4px;
-  }
-
-  .markdown-body-block-knowledge-ref-source {
-    color: #0374e9;
-    cursor: pointer;
-  }
-}