Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 00:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/7619

Browse source
This commit is contained in:
Vanessa 2023-03-13 10:53:42 +08:00
parent 41e8fe8c03
commit ffd94d6b51
9 changed files with 1124 additions and 825 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/ai/actions.ts
View file

@ -10,7 +10,7 @@ export const fillContent = (protyle:IProtyle, data:string, elements:Element[]) =
setLastNodeRange(getContenteditableElement(elements[elements.length - 1]), protyle.toolbar.range);
protyle.toolbar.range.collapse(true);
insertHTML(data, protyle, true, true);
}
};
export const AIActions = (elements: Element[], protyle: IProtyle) => {
const ids: string[] = [];

17
app/src/assets/template/app/index.tpl
View file

@ -11,7 +11,10 @@
<div id="loading" class="b3-dialog b3-dialog--open">
<div class="b3-dialog__scrim" style="background-color: #212224"></div>
<img style="position: absolute;width: 36vh;" src="../../icon.png">
<button onclick="window.location.reload()" id="loadingRefresh" style="display: none;position: absolute;bottom: 16px;background: transparent;border: 1px solid #4285f4;color: #4285f4;border-radius: 4px;line-height: 20px;padding: 4px 8px;">Click to Refresh<br>点　击　刷　新</button>
<button onclick="window.location.reload()" id="loadingRefresh"
style="display: none;position: absolute;bottom: 16px;background: transparent;border: 1px solid #4285f4;color: #4285f4;border-radius: 4px;line-height: 20px;padding: 4px 8px;">
Click to Refresh<br>点　击　刷　新
</button>
</div>
<div id="toolbar" class="toolbar fn__flex"></div>
<div class="fn__flex-1 fn__flex">
@ -24,12 +27,12 @@
<div id="commonMenu" class="b3-menu fn__none"></div>
<div id="message" class="b3-snackbars"></div>
<script>
setTimeout(() => {
const refreshElement = document.getElementById("loadingRefresh")
if (refreshElement) {
refreshElement.style.display = ""
}
}, 2000)
setTimeout(() => {
const refreshElement = document.getElementById("loadingRefresh")
if (refreshElement) {
refreshElement.style.display = ""
}
}, 2000)
</script>
</body>
</html>

2
app/src/dialog/processSystem.ts
View file

@ -18,7 +18,7 @@ import {needSubscribe} from "../util/needSubscribe";
export const lockScreen = () => {
if (window.siyuan.config.readonly) {
return
return;
}
/// #if BROWSER
fetchPost("/api/system/logoutAuth", {}, () => {

2
app/src/protyle/markdown/mermaidRender.ts
View file

@ -18,7 +18,7 @@ export const mermaidRender = (element: Element, cdn = Constants.PROTYLE_CDN) =>
if (mermaidElements.length === 0) {
return;
}
addScript(`${cdn}/js/mermaid/mermaid.min.js?v=9.3.0`, "protyleMermaidScript").then(() => {
addScript(`${cdn}/js/mermaid/mermaid.min.js?v=9.4.3`, "protyleMermaidScript").then(() => {
const config: any = {
securityLevel: "loose", // 升级后无 https://github.com/siyuan-note/siyuan/issues/3587，可使用该选项
altFontFamily: "sans-serif",

1118
app/stage/protyle/js/mermaid/mermaid.min.js vendored
View file

File diff suppressed because one or more lines are too long

218
app/webpack.config.js
View file

@ -4,120 +4,120 @@ const pkg = require("./package.json");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const {CleanWebpackPlugin} = require("clean-webpack-plugin");
const { EsbuildPlugin } = require("esbuild-loader");
const {EsbuildPlugin} = require("esbuild-loader");
module.exports = (env, argv) => {
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
target: "electron-renderer",
output: {
publicPath: "",
filename: "[name].[chunkhash].js",
path: path.resolve(__dirname, "stage/build/app"),
},
entry: {
"main": "./src/index.ts",
"window": "./src/window/index.ts",
},
resolve: {
extensions: [".ts", ".js", ".tpl", ".scss", ".png", ".svg"],
},
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
module: {
rules: [
{
test: /\.tpl/,
include: [
path.resolve(__dirname, "src/assets/template/app/index.tpl"),
path.resolve(__dirname, "src/assets/template/app/window.tpl")],
loader: "html-loader",
options: {
sources: false,
},
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
target: "electron-renderer",
output: {
publicPath: "auto",
filename: "[name].[chunkhash].js",
path: path.resolve(__dirname, "stage/build/app"),
},
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader", options: {
BROWSER: false,
MOBILE: false,
},
},
],
entry: {
"main": "./src/index.ts",
"window": "./src/window/index.ts",
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
resolve: {
extensions: [".ts", ".js", ".tpl", ".scss", ".png", ".svg"],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
{
test: /\.(png|svg)$/,
use: [
{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "../../",
},
},
],
module: {
rules: [
{
test: /\.tpl/,
include: [
path.resolve(__dirname, "src/assets/template/app/index.tpl"),
path.resolve(__dirname, "src/assets/template/app/window.tpl")],
loader: "html-loader",
options: {
sources: false,
},
},
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader", options: {
BROWSER: false,
MOBILE: false,
},
},
],
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
},
{
test: /\.(png|svg)$/,
use: [
{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "../../",
},
},
],
},
],
},
],
},
plugins: [
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false,
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/app")],
}),
new webpack.DefinePlugin({
SIYUAN_VERSION: JSON.stringify(pkg.version),
NODE_ENV: JSON.stringify(argv.mode),
}),
new MiniCssExtractPlugin({
filename: "base.[contenthash].css",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["main"],
filename: "index.html",
template: "src/assets/template/app/index.tpl",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["window"],
filename: "window.html",
template: "src/assets/template/app/window.tpl",
}),
],
};
plugins: [
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false,
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/app")],
}),
new webpack.DefinePlugin({
SIYUAN_VERSION: JSON.stringify(pkg.version),
NODE_ENV: JSON.stringify(argv.mode),
}),
new MiniCssExtractPlugin({
filename: "base.[contenthash].css",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["main"],
filename: "index.html",
template: "src/assets/template/app/index.tpl",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["window"],
filename: "window.html",
template: "src/assets/template/app/window.tpl",
}),
],
};
};

212
app/webpack.desktop.js
View file

@ -5,117 +5,117 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const {CleanWebpackPlugin} = require("clean-webpack-plugin");
// const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
const { EsbuildPlugin } = require("esbuild-loader");
const {EsbuildPlugin} = require("esbuild-loader");
module.exports = (env, argv) => {
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
output: {
publicPath: "",
filename: "[name].[chunkhash].js",
path: path.resolve(__dirname, "stage/build/desktop"),
},
entry: {
"main": "./src/index.ts",
},
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
resolve: {
fallback: {
"path": require.resolve("path-browserify"),
},
extensions: [".ts", ".js", ".tpl", ".scss"],
},
module: {
rules: [
{
test: /\.tpl/,
include: [
path.resolve(__dirname, "src/assets/template/desktop/index.tpl")],
loader: "html-loader",
options: {
sources: false,
},
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
output: {
publicPath: "auto",
filename: "[name].[chunkhash].js",
path: path.resolve(__dirname, "stage/build/desktop"),
},
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader",
options: {
"ifdef-verbose": false,
BROWSER: true,
MOBILE: false,
},
},
],
entry: {
"main": "./src/index.ts",
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
},
{
test: /\.(png|svg)$/,
use: [
{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "../../",
},
resolve: {
fallback: {
"path": require.resolve("path-browserify"),
},
],
extensions: [".ts", ".js", ".tpl", ".scss"],
},
],
},
plugins: [
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false,
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/desktop")],
}),
new webpack.DefinePlugin({
SIYUAN_VERSION: JSON.stringify(pkg.version),
NODE_ENV: JSON.stringify(argv.mode),
}),
new MiniCssExtractPlugin({
filename: "base.[contenthash].css",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["main"],
filename: "index.html",
template: "src/assets/template/desktop/index.tpl",
}),
],
};
module: {
rules: [
{
test: /\.tpl/,
include: [
path.resolve(__dirname, "src/assets/template/desktop/index.tpl")],
loader: "html-loader",
options: {
sources: false,
},
},
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader",
options: {
"ifdef-verbose": false,
BROWSER: true,
MOBILE: false,
},
},
],
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
},
{
test: /\.(png|svg)$/,
use: [
{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "../../",
},
},
],
},
],
},
plugins: [
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false,
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/desktop")],
}),
new webpack.DefinePlugin({
SIYUAN_VERSION: JSON.stringify(pkg.version),
NODE_ENV: JSON.stringify(argv.mode),
}),
new MiniCssExtractPlugin({
filename: "base.[contenthash].css",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["main"],
filename: "index.html",
template: "src/assets/template/desktop/index.tpl",
}),
],
};
};

166
app/webpack.export.js
View file

@ -4,92 +4,92 @@ const pkg = require("./package.json");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const {CleanWebpackPlugin} = require("clean-webpack-plugin");
// const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
const { EsbuildPlugin } = require("esbuild-loader");
const {EsbuildPlugin} = require("esbuild-loader");
module.exports = (env, argv) => {
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
output: {
publicPath: "",
filename: "[name].js",
path: path.resolve(__dirname, "stage/build/export"),
libraryTarget: "umd",
library: "Protyle",
libraryExport: "default",
},
entry: {
"protyle-method": "./src/protyle/method.ts",
},
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
resolve: {
fallback: {
"path": require.resolve("path-browserify"),
},
extensions: [".ts", ".js", ".scss"],
},
module: {
rules: [
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader",
options: {
"ifdef-verbose": false,
BROWSER: true,
MOBILE: true,
},
},
],
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
output: {
publicPath: "auto",
filename: "[name].js",
path: path.resolve(__dirname, "stage/build/export"),
libraryTarget: "umd",
library: "Protyle",
libraryExport: "default",
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
entry: {
"protyle-method": "./src/protyle/method.ts",
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
],
},
plugins: [
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin({
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/export")],
}),
new webpack.DefinePlugin({
NODE_ENV: JSON.stringify(argv.mode),
SIYUAN_VERSION: JSON.stringify(pkg.version),
}),
new MiniCssExtractPlugin({
filename: "base.css",
}),
],
};
resolve: {
fallback: {
"path": require.resolve("path-browserify"),
},
extensions: [".ts", ".js", ".scss"],
},
module: {
rules: [
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader",
options: {
"ifdef-verbose": false,
BROWSER: true,
MOBILE: true,
},
},
],
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
},
],
},
plugins: [
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin({
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/export")],
}),
new webpack.DefinePlugin({
NODE_ENV: JSON.stringify(argv.mode),
SIYUAN_VERSION: JSON.stringify(pkg.version),
}),
new MiniCssExtractPlugin({
filename: "base.css",
}),
],
};
};

212
app/webpack.mobile.js
View file

@ -5,117 +5,117 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const {CleanWebpackPlugin} = require("clean-webpack-plugin");
// const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
const { EsbuildPlugin } = require("esbuild-loader");
const {EsbuildPlugin} = require("esbuild-loader");
module.exports = (env, argv) => {
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
output: {
publicPath: "",
filename: "[name].[chunkhash].js",
path: path.resolve(__dirname, "stage/build/mobile"),
},
entry: {
"main": "./src/mobile/index.ts",
},
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
resolve: {
fallback: {
"path": require.resolve("path-browserify"),
},
extensions: [".ts", ".js", ".tpl", ".scss"],
},
module: {
rules: [
{
test: /\.tpl/,
include: [
path.resolve(__dirname, "src/assets/template/mobile/index.tpl")],
loader: "html-loader",
options: {
sources: false,
},
return {
mode: argv.mode || "development",
watch: argv.mode !== "production",
devtool: argv.mode !== "production" ? "eval" : false,
output: {
publicPath: "auto",
filename: "[name].[chunkhash].js",
path: path.resolve(__dirname, "stage/build/mobile"),
},
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader",
options: {
"ifdef-verbose": false,
BROWSER: true,
MOBILE: true,
},
},
],
entry: {
"main": "./src/mobile/index.ts",
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
optimization: {
minimize: true,
minimizer: [
new EsbuildPlugin(),
],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
},
{
test: /\.(png|svg)$/,
use: [
{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "../../",
},
resolve: {
fallback: {
"path": require.resolve("path-browserify"),
},
],
extensions: [".ts", ".js", ".tpl", ".scss"],
},
],
},
plugins: [
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false,
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/mobile")],
}),
new webpack.DefinePlugin({
SIYUAN_VERSION: JSON.stringify(pkg.version),
NODE_ENV: JSON.stringify(argv.mode),
}),
new MiniCssExtractPlugin({
filename: "base.[contenthash].css",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["main"],
filename: "index.html",
template: "src/assets/template/mobile/index.tpl",
}),
],
};
module: {
rules: [
{
test: /\.tpl/,
include: [
path.resolve(__dirname, "src/assets/template/mobile/index.tpl")],
loader: "html-loader",
options: {
sources: false,
},
},
{
test: /\.ts(x?)$/,
include: [path.resolve(__dirname, "src")],
use: [
{
loader: "esbuild-loader",
},
{
loader: "ifdef-loader",
options: {
"ifdef-verbose": false,
BROWSER: true,
MOBILE: true,
},
},
],
},
{
test: /\.scss$/,
include: [
path.resolve(__dirname, "src/assets/scss"),
],
use: [
MiniCssExtractPlugin.loader,
{
loader: "css-loader", // translates CSS into CommonJS
},
{
loader: "sass-loader", // compiles Sass to CSS
},
],
},
{
test: /\.woff$/,
type: "asset/resource",
generator: {
filename: "../fonts/JetBrainsMono-Regular.woff",
},
},
{
test: /\.(png|svg)$/,
use: [
{
loader: "file-loader",
options: {
name: "[name].[ext]",
outputPath: "../../",
},
},
],
},
],
},
plugins: [
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin({
cleanStaleWebpackAssets: false,
cleanOnceBeforeBuildPatterns: [
path.join(__dirname, "stage/build/mobile")],
}),
new webpack.DefinePlugin({
SIYUAN_VERSION: JSON.stringify(pkg.version),
NODE_ENV: JSON.stringify(argv.mode),
}),
new MiniCssExtractPlugin({
filename: "base.[contenthash].css",
}),
new HtmlWebpackPlugin({
inject: "head",
chunks: ["main"],
filename: "index.html",
template: "src/assets/template/mobile/index.tpl",
}),
],
};
};