-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
📚 [在线文档](https://tsdaodao.com/) | 🚀 [演示地址](https://web.botgate.cn/)（账号/密码：15900000002/a1234567）
diff --git a/apps/web/config-overrides.js b/apps/web/config-overrides.js
index b0a616e..afa1d81 100644
--- a/apps/web/config-overrides.js
+++ b/apps/web/config-overrides.js
@@ -1,70 +1,40 @@
var path = require('path')
-
-const { override, babelInclude, addWebpackPlugin } = require('customize-cra')
+const { override, babelInclude, addWebpackPlugin, overrideDevServer } = require('customize-cra')
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const TerserPlugin = require("terser-webpack-plugin");
-// module.exports = override(
-// // 注意是production环境启动该plugin
-// process.env.NODE_ENV === 'production' && addWebpackPlugin(
-// new UglifyJsPlugin({
-// // 开启打包缓存
-// cache: true,
-// // 开启多线程打包
-// parallel: true,
-// uglifyOptions: {
-// // 删除警告
-// warnings: false,
-// // 压缩
-// compress: {
-// // 移除console
-// drop_console: true,
-// // 移除debugger
-// drop_debugger: true
-// }
-// }
-// })
-// )
-// )
+const addDevServerConfig = () => config => {
+ return {
+ ...config,
+ client: {
+ overlay: false
+ }
+ };
+}
-module.exports = function (config, env) {
- if (process.env.NODE_ENV === 'production') {
- config.devtool = false;
- }
- if (env === 'production') {
- config.optimization = {
- minimize: true,
- minimizer: [new TerserPlugin()],
- };
- }
- return Object.assign(
- config,
- override(
- // 判断环境变量ANALYZER参数的值
- process.env.ANALYZER && addWebpackPlugin(new BundleAnalyzerPlugin()),
- // process.env.NODE_ENV === 'production' && addWebpackPlugin(
- // new UglifyJsPlugin({
- // cache: true,
- // // 开启多线程打包
- // parallel: true,
- // uglifyOptions: {
- // // 删除警告
- // warnings: false,
- // // 压缩
- // compress: {
- // // 移除console
- // drop_console: true,
- // // 移除debugger
- // drop_debugger: true
- // }
- // },
- // })
- // ),
- babelInclude([
- /* transpile (converting to es5) code in src/ and shared component library */
- path.resolve('src'),
- path.resolve('../../packages'),
- ])
- )(config, env)
- )
+module.exports = {
+ webpack: function (config, env) {
+ if (process.env.NODE_ENV === 'production') {
+ config.devtool = false;
+ }
+ if (env === 'production') {
+ config.optimization = {
+ minimize: true,
+ minimizer: [new TerserPlugin()],
+ };
+ }
+ return Object.assign(
+ config,
+ override(
+ // 判断环境变量ANALYZER参数的值
+ process.env.ANALYZER && addWebpackPlugin(new BundleAnalyzerPlugin()),
+ babelInclude([
+ /* transpile (converting to es5) code in src/ and shared component library */
+ path.resolve('src'),
+ path.resolve('../../packages'),
+ ])
+ )(config, env)
+ )
+ },
+ devServer: overrideDevServer(addDevServerConfig())
}
\ No newline at end of file
diff --git a/apps/web/electron-builder.js b/apps/web/electron-builder.js
deleted file mode 100644
index 320224a..0000000
--- a/apps/web/electron-builder.js
+++ /dev/null
@@ -1,60 +0,0 @@
-module.exports = {
- productName: "tangsengdaodao", //项目名
- appId: "com.tsdaodao.im",
- copyright: "Copyright © tsdaodao", //版权
- directories: {
- output: "dist-ele", // 输出文件夹
- },
- npmRebuild: false,
- asar: false,
- buildDependenciesFromSource: true,
- electronDownload: {
- mirror: "https://registry.npmmirror.com/-/binary/electron/",
- },
- files: ["resources/**/*","out-election/**/*", "build/**/*"], // 需要打包的文件
- extraMetadata: {
- main: "out-election/main/index.js",
- },
- mac: {
- category: "public.app-category.instant-messaging",
- target: [
- {
- target: 'dmg',
- arch: ['x64', 'arm64']
- }
- ],
- artifactName: '${productName}-${os}-${version}-${arch}.${ext}',
- icon: "resources/icons/icon.icns"
- },
- dmg: {
- // background: 'build/appdmg.png', // dmg安装窗口背景图
- icon: "resources/icons/icon.icns", // 客户端图标
- iconSize: 100, // 安装图标大小
- // 安装窗口中包含的项目和配置
- contents: [
- { x: 380, y: 280, type: "link", path: "/Applications" },
- { x: 110, y: 280, type: "file" },
- ],
- window: { width: 500, height: 500 }, // 安装窗口大小
- },
- win: {
- icon: "resources/icons/icon.ico",
- verifyUpdateCodeSignature: false,
- target: ["nsis", "zip"],
- artifactName: "${productName}-Setup-${version}.${ext}"
- },
- nsis: {
- oneClick: false, // 是否一键安装
- allowElevation: true, // 允许请求提升。 如果为false，则用户必须使用提升的权限重新启动安装程序。
- allowToChangeInstallationDirectory: true, // 允许修改安装目录
- // installerIcon: "./build/icon.ico",// 安装图标
- // uninstallerIcon: "./build/icons/bbb.ico",//卸载图标
- // installerHeaderIcon: "./build/icon.ico", // 安装时头部图标
- createDesktopShortcut: true, // 创建桌面图标
- createStartMenuShortcut: true, // 创建开始菜单图标
- },
- linux: {
- target: ["AppImage", "deb"],
- icon: "resources/icons/icon.icns",
- },
-};
\ No newline at end of file
diff --git a/apps/web/electron-builder.yml b/apps/web/electron-builder.yml
new file mode 100644
index 0000000..1d5f280
--- /dev/null
+++ b/apps/web/electron-builder.yml
@@ -0,0 +1,58 @@
+productName: tangsengdaodao
+appId: com.tsdaodao.im
+copyright: Copyright © tsdaodao
+directories:
+ output: dist-ele
+npmRebuild: false
+asar: false
+buildDependenciesFromSource: true
+electronDownload:
+ mirror: https://npmmirror.com/mirrors/electron/
+files:
+ - resources/**/*
+ - out-election/**/*
+ - build/**/*
+extraMetadata:
+ main: out-election/main/index.js
+mac:
+ category: public.app-category.instant-messaging
+ target:
+ - target: dmg
+ arch:
+ - x64
+ - arm64
+ artifactName: ${productName}-${os}-${version}-${arch}.${ext}
+ icon: resources/icons/icon.icns
+dmg:
+ icon: resources/icons/icon.icns
+ iconSize: 100
+ contents:
+ - x: 380
+ y: 280
+ type: link
+ path: /Applications
+ - x: 110
+ y: 280
+ type: link
+ window:
+ width: 500
+ height: 500
+win:
+ icon: resources/icons/icon.ico
+ verifyUpdateCodeSignature: false
+ target:
+ - nsis
+ - zip
+ artifactName: ${productName}-Setup-${version}.${ext}
+nsis:
+ oneClick: false
+ allowElevation: true
+ allowToChangeInstallationDirectory: true
+ createDesktopShortcut: true
+ createStartMenuShortcut: true
+linux:
+ target:
+ - AppImage
+ - deb
+ icon: resources/icons/icon.icns
+
diff --git a/apps/web/package.json b/apps/web/package.json
index 10fab80..4232297 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -55,7 +55,6 @@
"customize-cra": "^1.0.0",
"electron": "26.0.0",
"electron-builder": "^24.9.1",
- "electron-log": "^5.0.1",
"eslint-config-react-app": "^7.0.1",
"kill-port": "^2.0.1",
"npm-run-all": "^4.1.5",
@@ -64,7 +63,7 @@
"react-scripts": "5.0.0",
"terser-webpack-plugin": "^5.3.9",
"tsc-watch": "^6.0.4",
- "typescript": "^5.3.3",
+ "typescript": "^4.5.5",
"wait-on": "^7.2.0",
"webpack-bundle-analyzer": "^4.5.0"
},
@@ -73,7 +72,7 @@
},
"browserslist": {
"production": [
- ">0.2%",
+ "> 1%",
"not dead",
"not op_mini all"
],
diff --git a/apps/web/resources/icons/icon.icns b/apps/web/resources/icons/icon.icns
new file mode 100644
index 0000000..32360ed
Binary files /dev/null and b/apps/web/resources/icons/icon.icns differ
diff --git a/package.json b/package.json
index 97f03b9..d555a6f 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
{
+ "name": "tsdd",
"private": true,
+ "version": "0.0.0",
"workspaces": [
"apps/*",
"packages/*"
],
"resolutions": {
- "//": "See https://github.com/facebook/create-react-app/issues/11773",
"react-error-overlay": "6.0.11"
},
"scripts": {
- "bootstrap": "yarn install",
"dev": "turbo run dev --parallel",
"dev-ele": "turbo run dev-ele --parallel",
"build": "turbo run build",
@@ -18,7 +18,8 @@
"build-ele:win": "turbo run build-ele:win",
"build-ele:linux": "turbo run build-ele:linux",
"build-ele:linux-arm64": "turbo run build-ele:linux-arm64",
- "clean": "turbo run clean && rimraf node_modules",
+ "bootstrap": "yarn install",
+ "clean": "turbo run clean && rimraf node_modules .turbo",
"lint": "turbo run lint",
"format": "prettier --write \"**/*.{ts,tsx,md}\""
},
@@ -27,7 +28,11 @@
"eslint-config-custom": "*",
"prettier": "^2.5.1",
"rimraf": "^5.0.5",
- "turbo": "latest"
+ "turbo": "2.0.9"
},
- "version": "0.0.0"
+ "packageManager": "yarn@1.22.19",
+ "engines": {
+ "node": ">=18.0.0",
+ "yarn": ">=1.22.19"
+ }
}
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
index 3e2d85b..82db02e 100644
--- a/packages/eslint-config-custom/package.json
+++ b/packages/eslint-config-custom/package.json
@@ -4,7 +4,7 @@
"main": "index.js",
"license": "MIT",
"scripts": {
- "clean": "rimraf node_modules out-election"
+ "clean": "rimraf node_modules .turbo"
},
"dependencies": {
"@typescript-eslint/parser": "^6.16.0",
diff --git a/packages/tsdaodaobase/src/Messages/Image/index.css b/packages/tsdaodaobase/src/Messages/Image/index.css
new file mode 100644
index 0000000..2898e23
--- /dev/null
+++ b/packages/tsdaodaobase/src/Messages/Image/index.css
@@ -0,0 +1,25 @@
+@keyframes loading {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+}
+.loading-box{
+ width: 32px;
+ height: 32px;
+ position:absolute;
+ top:50%;
+ left:50%;
+ transform:translate(-16px,-16px);
+}
+.loading-icon{
+ width: 32px;
+ height: 32px;
+ animation: loading 1s linear infinite;
+}
+.loading-text{
+ font-size: 14px;
+ white-space: nowrap;
+}
diff --git a/packages/tsdaodaobase/src/Messages/Image/index.tsx b/packages/tsdaodaobase/src/Messages/Image/index.tsx
index 4064973..d8c4a7f 100644
--- a/packages/tsdaodaobase/src/Messages/Image/index.tsx
+++ b/packages/tsdaodaobase/src/Messages/Image/index.tsx
@@ -1,124 +1,172 @@
-import { MediaMessageContent } from "wukongimjssdk"
-import React from "react"
-import WKApp from "../../App"
-import { MessageContentTypeConst } from "../../Service/Const"
-import MessageBase from "../Base"
-import { MessageCell } from "../MessageCell"
-import Viewer from 'react-viewer';
-
-
+import WKSDK, { MediaMessageContent, Task } from "wukongimjssdk";
+import React from "react";
+import WKApp from "../../App";
+import { MessageContentTypeConst } from "../../Service/Const";
+import MessageBase from "../Base";
+import { MessageCell } from "../MessageCell";
+import Viewer from "react-viewer";
+import "./index.css";
export class ImageContent extends MediaMessageContent {
- width!: number
- height!: number
- url!: string
- imgData?: string
- constructor(file?: File, imgData?: string, width?: number, height?: number) {
- super()
- this.file = file
- this.imgData = imgData
- this.width = width || 0
- this.height = height || 0
- }
- decodeJSON(content: any) {
- this.width = content["width"] || 0
- this.height = content["height"] || 0
- this.url = content["url"] || ''
- this.remoteUrl = this.url
- }
- encodeJSON() {
- return { "width": this.width || 0, "height": this.height || 0, "url": this.remoteUrl || "" }
- }
- get contentType() {
- return MessageContentTypeConst.image
- }
- get conversationDigest() {
- return "[图片]"
- }
+ width!: number;
+ height!: number;
+ url!: string;
+ imgData?: string;
+ constructor(file?: File, imgData?: string, width?: number, height?: number) {
+ super();
+ this.file = file;
+ this.imgData = imgData;
+ this.width = width || 0;
+ this.height = height || 0;
+ }
+ decodeJSON(content: any) {
+ this.width = content["width"] || 0;
+ this.height = content["height"] || 0;
+ this.url = content["url"] || "";
+ this.remoteUrl = this.url;
+ }
+ encodeJSON() {
+ return { width: this.width || 0, height: this.height || 0, url: this.remoteUrl || "" };
+ }
+ get contentType() {
+ return MessageContentTypeConst.image;
+ }
+ get conversationDigest() {
+ return "[图片]";
+ }
}
-
interface ImageCellState {
- showPreview: boolean
+ showPreview: boolean;
+ loading: boolean;
+ progress: number;
}
export class ImageCell extends MessageCell![]({require("../../assets/loading.png")})
+ {scaleSize.height > 46 && {this.state.progress}%
} + + )} +