@fe-free/core 1.6.1 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @fe-free/core
 
+## 2.0.0
+
+### Major Changes
+
+- feat: remove some
+
+### Patch Changes
+
+- @fe-free/tool@2.0.0
+
 ## 1.6.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "1.6.1",
+  "version": "2.0.0",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -25,7 +25,6 @@
     "@uiw/codemirror-theme-basic": "^4.23.12",
     "@uiw/codemirror-themes": "^4.23.12",
     "@uiw/react-codemirror": "^4.23.12",
-    "ace-builds": "^1.33.1",
     "ahooks": "^3.7.8",
     "axios": "^1.6.5",
     "classnames": "^2.5.1",
@@ -39,7 +38,7 @@
     "remark-gfm": "^4.0.1",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "1.6.1"
+    "@fe-free/tool": "2.0.0"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "^2.8.7",

package/src/editor_json/editor_json.stories.tsx

@@ -11,94 +11,78 @@ const meta: Meta<typeof EditorJSON> = {
 export default meta;
 type Story = StoryObj<typeof EditorJSON>;
 
-// 基础示例
-const BasicDemo = () => {
-  const [value, setValue] = useState(
-    JSON.stringify(
-      {
-        name: 'world',
-      },
-      null,
-      2,
-    ),
-  );
-
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorJSON value={value} onChange={setValue} />
-    </div>
-  );
-};
-
 export const Basic: Story = {
-  render: () => <BasicDemo />,
-};
-
-// 只读模式
-const ReadonlyDemo = () => {
-  const [value, setValue] = useState(
-    JSON.stringify(
-      {
+  render: (args) => {
+    const [value, setValue] = useState(
+      JSON.stringify({
         name: 'world',
-      },
-      null,
-      2,
-    ),
-  );
+      }),
+    );
 
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorJSON value={value} onChange={setValue} readonly />
-    </div>
-  );
+    return (
+      <div style={{ width: '500px', height: '500px' }}>
+        <EditorJSON {...args} value={value} onChange={setValue} />
+      </div>
+    );
+  },
 };
 
 export const Readonly: Story = {
-  render: () => <ReadonlyDemo />,
-};
+  render: () => {
+    const [value, setValue] = useState(
+      JSON.stringify(
+        {
+          name: 'world',
+        },
+        null,
+        2,
+      ),
+    );
 
-// 树形模式
-const TreeModeDemo = () => {
-  const [value, setValue] = useState(
-    JSON.stringify(
-      {
-        name: 'world',
-      },
-      null,
-      2,
-    ),
-  );
-
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorJSON value={value} onChange={setValue} mode="tree" readonly />
-    </div>
-  );
+    return (
+      <div style={{ width: '500px', height: '500px' }}>
+        <EditorJSON value={value} onChange={setValue} readonly />
+      </div>
+    );
+  },
 };
 
 export const TreeMode: Story = {
-  render: () => <TreeModeDemo />,
-};
+  render: () => {
+    const [value, setValue] = useState(
+      JSON.stringify(
+        {
+          name: 'world',
+        },
+        null,
+        2,
+      ),
+    );
 
-// 无菜单栏的只读树形模式
-const NoMenuBarDemo = () => {
-  const [value, setValue] = useState(
-    JSON.stringify(
-      {
-        name: 'world',
-      },
-      null,
-      2,
-    ),
-  );
-
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorJSON value={value} onChange={setValue} readonly mode="tree" mainMenuBar={false} />
-    </div>
-  );
+    return (
+      <div style={{ width: '500px', height: '500px' }}>
+        <EditorJSON value={value} onChange={setValue} mode="tree" readonly />
+      </div>
+    );
+  },
 };
 
 export const NoMenuBar: Story = {
-  render: () => <NoMenuBarDemo />,
+  render: () => {
+    const [value, setValue] = useState(
+      JSON.stringify(
+        {
+          name: 'world',
+        },
+        null,
+        2,
+      ),
+    );
+
+    return (
+      <div style={{ width: '500px', height: '500px' }}>
+        <EditorJSON value={value} onChange={setValue} readonly mode="tree" mainMenuBar={false} />
+      </div>
+    );
+  },
 };

package/src/form/pro_form_javascript.tsx

@@ -1,22 +1,22 @@
 import type { ProFormItemProps } from '@ant-design/pro-components';
 import { ProForm } from '@ant-design/pro-components';
-import type { EditorJavascriptProps } from '../editor_javascript';
-import { EditorJavascript } from '../editor_javascript';
+import type { EditorProps } from '../editor';
+import { Editor } from '../editor';
 
-function JavascriptItem(props: EditorJavascriptProps) {
+function JavascriptItem(props: EditorProps) {
   return (
     <div style={{ height: '300px' }}>
-      <EditorJavascript {...props} />
+      <Editor {...props} language="javascript" />
     </div>
   );
 }
 
-function ProFormJavascript(props: ProFormItemProps<EditorJavascriptProps>) {
+function ProFormJavascript(props: ProFormItemProps<EditorProps>) {
   const { fieldProps, ...rest } = props;
 
   return (
     <ProForm.Item {...rest}>
-      <JavascriptItem {...(fieldProps as EditorJavascriptProps)} />
+      <JavascriptItem {...(fieldProps as EditorProps)} />
     </ProForm.Item>
   );
 }

package/src/index.ts

@@ -5,14 +5,10 @@ export { CRUD, CRUDDetail, CRUDOfSimple, OperateDelete, useDelete } from './crud
 export type { CRUDDetailProps, CRUDMethods, CRUDOfSimpleProps, CRUDProps } from './crud';
 export { Editor } from './editor';
 export type { EditorProps } from './editor';
-export { EditorJavascript } from './editor_javascript';
-export type { EditorJavascriptProps } from './editor_javascript';
 export { EditorJSON } from './editor_json';
 export type { EditorJSONProps } from './editor_json';
 export { EditorLogs } from './editor_logs';
 export type { EditorLogsProps } from './editor_logs';
-export { EditorMarkdown } from './editor_markdown';
-export type { EditorMarkdownProps } from './editor_markdown';
 export {
   ProFormEditor,
   ProFormJSON,

package/src/editor_javascript/editor_javascript.stories.tsx

@@ -1,50 +0,0 @@
-import { EditorJavascript } from '@fe-free/core';
-import type { Meta, StoryObj } from '@storybook/react-vite';
-import { useState } from 'react';
-
-const meta: Meta<typeof EditorJavascript> = {
-  title: '@fe-free/core/EditorJavascript',
-  component: EditorJavascript,
-  tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<typeof EditorJavascript>;
-
-// 常规示例
-const BasicDemo = () => {
-  const [value, setValue] = useState(
-    `const name = 'world';
-console.log('hello', name);
-`,
-  );
-
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorJavascript value={value} onChange={setValue} />
-    </div>
-  );
-};
-
-export const Basic: Story = {
-  render: () => <BasicDemo />,
-};
-
-// readonly 示例
-const ReadonlyDemo = () => {
-  const [value, setValue] = useState(
-    `const name = 'world';
-console.log('hello', name);
-`,
-  );
-
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorJavascript value={value} onChange={setValue} readonly />
-    </div>
-  );
-};
-
-export const Readonly: Story = {
-  render: () => <ReadonlyDemo />,
-};

package/src/editor_javascript/index.tsx

@@ -1,38 +0,0 @@
-import AceEditor from 'react-ace';
-
-import 'ace-builds/src-noconflict/ext-language_tools';
-import 'ace-builds/src-noconflict/mode-javascript';
-import 'ace-builds/src-noconflict/theme-monokai';
-
-const fullStyle = { width: '100%', height: '100%' };
-
-interface EditorJavascriptProps {
-  value: string;
-  onChange?: (value: string, event?: any) => void;
-  readonly?: boolean;
-}
-
-function EditorJavascript({ value, onChange, readonly }: EditorJavascriptProps) {
-  return (
-    <AceEditor
-      style={fullStyle}
-      mode="javascript"
-      theme="monokai"
-      value={value}
-      onChange={onChange}
-      readOnly={readonly}
-      name="javascript_editor"
-      editorProps={{ $blockScrolling: true }}
-      setOptions={{
-        enableBasicAutocompletion: true,
-        enableLiveAutocompletion: true,
-        enableSnippets: true,
-        showLineNumbers: true,
-        tabSize: 2,
-      }}
-    />
-  );
-}
-
-export { EditorJavascript };
-export type { EditorJavascriptProps };

package/src/editor_markdown/editor_markdown.stories.tsx

@@ -1,32 +0,0 @@
-import { EditorMarkdown } from '@fe-free/core';
-import type { Meta, StoryObj } from '@storybook/react-vite';
-import { useState } from 'react';
-
-const meta: Meta<typeof EditorMarkdown> = {
-  title: '@fe-free/core/EditorMarkdown',
-  component: EditorMarkdown,
-  tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<typeof EditorMarkdown>;
-
-// 常规示例
-const BasicDemo = () => {
-  const [value] = useState(
-    `# hello
-
-world
-`,
-  );
-
-  return (
-    <div style={{ width: '500px', height: '500px' }}>
-      <EditorMarkdown value={value} />
-    </div>
-  );
-};
-
-export const Basic: Story = {
-  render: () => <BasicDemo />,
-};

package/src/editor_markdown/index.tsx

@@ -1,40 +0,0 @@
-import Markdown from 'react-markdown';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-
-interface EditorMarkdownProps {
-  value: string;
-}
-
-function EditorMarkdown({ value }: EditorMarkdownProps) {
-  return (
-    <Markdown
-      unwrapDisallowed
-      components={{
-        code(props) {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const { children, className, node, ...rest } = props;
-          const match = /language-(\w+)/.exec(className || '');
-          return match ? (
-            <SyntaxHighlighter
-              {...rest}
-              PreTag="div"
-              wrapLongLines
-              // eslint-disable-next-line react/no-children-prop
-              children={String(children).replace(/\n$/, '')}
-              language={match[1].toLowerCase()}
-            />
-          ) : (
-            <code {...rest} className={className}>
-              {children}
-            </code>
-          );
-        },
-      }}
-    >
-      {value || ''}
-    </Markdown>
-  );
-}
-
-export { EditorMarkdown };
-export type { EditorMarkdownProps };