@fe-free/core 1.4.14 → 1.4.17

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @fe-free/core
 
+## 1.4.17
+
+### Patch Changes
+
+- feat: re
+  - @fe-free/tool@1.4.17
+
+## 1.4.16
+
+### Patch Changes
+
+- feat: modify EditorLogs
+  - @fe-free/tool@1.4.16
+
+## 1.4.15
+
+### Patch Changes
+
+- feat: editor
+  - @fe-free/tool@1.4.15
+
 ## 1.4.14
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "1.4.14",
+  "version": "1.4.17",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -36,7 +36,7 @@
     "react-syntax-highlighter": "^15.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "1.4.14"
+    "@fe-free/tool": "1.4.17"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "^2.8.7",

package/src/editor/editor.stories.tsx

@@ -39,6 +39,14 @@ export const ReadOnly: Story = {
   render: (props) => <BasicDemo {...props} />,
 };
 
+export const Wrap: Story = {
+  args: {
+    value:
+      'hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!hello world!',
+  },
+  render: (props) => <BasicDemo {...props} />,
+};
+
 // 不可编辑模式
 export const Editable: Story = {
   args: {

package/src/editor/index.tsx

@@ -2,6 +2,7 @@ import { javascript } from '@codemirror/lang-javascript';
 import { json } from '@codemirror/lang-json';
 import { markdown } from '@codemirror/lang-markdown';
 import { python } from '@codemirror/lang-python';
+import { EditorView } from '@codemirror/view';
 import { basicDarkInit } from '@uiw/codemirror-theme-basic/dark';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 import CodeMirror from '@uiw/react-codemirror';
@@ -47,7 +48,7 @@ function Editor(props: EditorProps) {
   } = props;
 
   const extensions = useMemo(() => {
-    const result: ReactCodeMirrorProps['extensions'] = [];
+    const result: ReactCodeMirrorProps['extensions'] = [EditorView.lineWrapping];
 
     if (originExtensions) {
       result.push(...originExtensions);

package/src/editor_logs/editor_logs.stories.tsx

@@ -42,6 +42,38 @@ export const Basic: Story = {
         message:
           'This is a debug log message. This is a debug log message This is a debug log message This is a debug log message This is a debug log message',
       },
+      {
+        timestamp: '2023-01-01 12:00:00',
+        message: 'This is an log message.',
+      },
+      {
+        level: 'info',
+        message: 'This is an log message.',
+      },
+      {
+        message: 'This is an log message.',
+      },
+    ],
+  },
+  render: (props) => (
+    <div style={{ width: '500px', height: '500px' }}>
+      <EditorLogs {...props} />
+    </div>
+  ),
+};
+
+export const Pure: Story = {
+  args: {
+    logs: [
+      {
+        message: 'This is an info log message.',
+      },
+      {
+        message: 'This is a warning log message.',
+      },
+      {
+        message: 'This is an error log message.',
+      },
     ],
   },
   render: (props) => (

package/src/editor_logs/index.tsx

@@ -6,19 +6,35 @@ import { Editor } from '../editor';
 
 interface EditorLogsProps {
   logs: {
-    timestamp: string;
-    level: 'info' | 'warn' | 'error' | 'system';
+    timestamp?: string;
+    level?: 'info' | 'warn' | 'error' | 'system';
     message: string;
   }[];
 }
 
 const EditorLogs: React.FC<EditorLogsProps> = ({ logs }) => {
-  const formattedLogs = logs
-    .map((log) => {
-      const levelPadded = `[${log.level}]`.padEnd(8, ' ');
-      return `${log.timestamp} ${levelPadded.toUpperCase()} ${log.message}`;
-    })
-    .join('\n');
+  const notPure = logs.find((item) => item.timestamp || item.level);
+
+  let formattedLogs = '';
+  if (notPure) {
+    formattedLogs = logs
+      .map((log) => {
+        const arr: string[] = [];
+
+        arr.push((log.timestamp || '').padEnd(19, ' '));
+
+        arr.push(`[${log.level || ''}]`.padEnd(8, ' ').toUpperCase());
+
+        if (log.message) {
+          arr.push(log.message);
+        }
+
+        return arr.join(' ');
+      })
+      .join('\n');
+  } else {
+    formattedLogs = logs.map((log) => log.message).join('\n');
+  }
 
   const logExtension = [
     StreamLanguage.define({