feat: Handle merge errors

This commit is contained in:
wb-lh513319
2024-08-12 10:37:35 +08:00
parent 929d7756db
commit bf732ebf7e
3 changed files with 2270 additions and 584 deletions

View File

@@ -38,6 +38,7 @@ interface IChatContext {
}; };
setCurrentDialogInfo: (val: { chat_scene: string; app_code: string }) => void; setCurrentDialogInfo: (val: { chat_scene: string; app_code: string }) => void;
adminList: UserInfoResponse[]; adminList: UserInfoResponse[];
refreshDialogList?: any;
} }
function getDefaultTheme(): ThemeMode { function getDefaultTheme(): ThemeMode {
@@ -71,6 +72,7 @@ const ChatContext = createContext<IChatContext>({
}, },
setCurrentDialogInfo: () => {}, setCurrentDialogInfo: () => {},
adminList: [], adminList: [],
refreshDialogList: () => {},
}); });
const ChatContextProvider = ({ children }: { children: React.ReactElement }) => { const ChatContextProvider = ({ children }: { children: React.ReactElement }) => {

View File

@@ -1,4 +1,5 @@
/** @type {import('next').NextConfig} */ /** @type {import('next').NextConfig} */
const CopyPlugin = require('copy-webpack-plugin');
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin'); const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
const path = require('path'); const path = require('path');
const nextConfig = { const nextConfig = {

2851
web_new/package-lock.json generated

File diff suppressed because it is too large Load Diff