ID
-
+
${window.siyuan.languages.anchor}
`,
@@ -910,7 +910,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
iconHTML: "",
type: "readonly",
label: `${window.siyuan.languages.imageURL}
-
+
${window.siyuan.languages.title}
@@ -1005,7 +1005,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
submenu: [{
iconHTML: "",
type: "readonly",
- label: ``,
+ label: ``,
bind(element) {
element.style.maxWidth = "none";
fetchPost("/api/asset/getImageOCRText", {
@@ -1139,7 +1139,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
iconHTML: "",
type: "readonly",
label: `${window.siyuan.languages.link}
-
+
${window.siyuan.languages.anchor}
@@ -1479,7 +1479,7 @@ export const iframeMenu = (protyle: IProtyle, nodeElement: Element) => {
const subMenus: IMenu[] = [{
iconHTML: "",
type: "readonly",
- label: ``,
+ label: ``,
bind(element) {
element.style.maxWidth = "none";
element.querySelector("textarea").addEventListener("change", (event) => {
@@ -1550,7 +1550,7 @@ export const videoMenu = (protyle: IProtyle, nodeElement: Element, type: string)
const subMenus: IMenu[] = [{
iconHTML: "",
type: "readonly",
- label: ``,
+ label: ``,
bind(element) {
element.style.maxWidth = "none";
element.querySelector("textarea").addEventListener("change", (event) => {
diff --git a/app/src/mobile/editor.ts b/app/src/mobile/editor.ts
index 9f252a840c..84d17f7a5b 100644
--- a/app/src/mobile/editor.ts
+++ b/app/src/mobile/editor.ts
@@ -73,7 +73,12 @@ export const openMobileFileById = (app: App, id: string, action = [Constants.CB_
getDocByScroll({
protyle: window.siyuan.mobile.editor.protyle,
scrollAttr: window.siyuan.storage[Constants.LOCAL_FILEPOSITION][data.data.rootID],
- mergedOptions: protyleOptions
+ mergedOptions: protyleOptions,
+ cb() {
+ app.plugins.forEach(item => {
+ item.eventBus.emit("switch-protyle", {protyle: window.siyuan.mobile.editor.protyle});
+ });
+ }
});
} else {
fetchPost("/api/filetree/getDoc", {
@@ -84,7 +89,12 @@ export const openMobileFileById = (app: App, id: string, action = [Constants.CB_
onGet({
data: getResponse,
protyle: window.siyuan.mobile.editor.protyle,
- action
+ action,
+ afterCB() {
+ app.plugins.forEach(item => {
+ item.eventBus.emit("switch-protyle", {protyle: window.siyuan.mobile.editor.protyle});
+ });
+ }
});
});
}
@@ -95,8 +105,5 @@ export const openMobileFileById = (app: App, id: string, action = [Constants.CB_
(document.getElementById("toolbarName") as HTMLInputElement).value = data.data.rootTitle === window.siyuan.languages.untitled ? "" : data.data.rootTitle;
setEditor();
closePanel();
- app.plugins.forEach(item => {
- item.eventBus.emit("switch-protyle", {protyle: window.siyuan.mobile.editor.protyle});
- });
});
};
diff --git a/app/src/mobile/util/touch.ts b/app/src/mobile/util/touch.ts
index e62e6ef62b..f7de9434dc 100644
--- a/app/src/mobile/util/touch.ts
+++ b/app/src/mobile/util/touch.ts
@@ -54,6 +54,7 @@ export const handleTouchEnd = (event: TouchEvent, app: App) => {
// 有些事件不经过 touchmove
if (scrollBlock) {
+ closePanel();
return;
}
@@ -236,7 +237,7 @@ export const handleTouchMove = (event: TouchEvent) => {
} else if (scrollElement.dataset.type === "NodeMathBlock") {
scrollElement = target;
while (scrollElement && scrollElement.dataset.type !== "NodeMathBlock") {
- if (scrollElement.nodeType === 1 && scrollElement.scrollWidth > scrollElement.clientWidth) {
+ if (scrollElement.nodeType === 1 && scrollElement.scrollLeft > 0) {
break;
}
scrollElement = scrollElement.parentElement;
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index c95a1ef419..95ca64d012 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -3,20 +3,14 @@ import {
hasClosestByAttribute,
hasClosestByClassName,
hasClosestByMatchTag,
- hasClosestByTag, hasTopClosestByClassName
+ hasClosestByTag,
+ hasTopClosestByClassName
} from "../util/hasClosest";
import {getIconByType} from "../../editor/getIcon";
import {enterBack, iframeMenu, setFold, tableMenu, videoMenu, zoomOut} from "../../menus/protyle";
import {MenuItem} from "../../menus/Menu";
import {copySubMenu, openAttr, openWechatNotify} from "../../menus/commonMenuItem";
-import {
- copyPlainText,
- isMac,
- isOnlyMeta,
- openByMobile,
- updateHotkeyTip,
- writeText
-} from "../util/compatibility";
+import {copyPlainText, isMac, isOnlyMeta, openByMobile, updateHotkeyTip, writeText} from "../util/compatibility";
import {
transaction,
turnsIntoOneTransaction,
@@ -34,7 +28,7 @@ import {removeEmbed} from "../wysiwyg/removeEmbed";
import {getContenteditableElement, getTopAloneElement, isNotEditBlock} from "../wysiwyg/getBlock";
// import * as dayjs from "dayjs";
import {formatDate} from "sofill/mid";
-import { parseNumber2FormatString } from "../../sillot/util/date";
+import {isInvalidStringStrict} from "sofill/api"
import {fetchPost, fetchSyncPost} from "../../util/fetch";
import {cancelSB, genEmptyElement, insertEmptyBlock, jumpToParentNext} from "../../block/util";
import {countBlockWord} from "../../layout/status";
@@ -62,6 +56,7 @@ import {insertAttrViewBlockAnimation} from "../render/av/row";
import {avContextmenu} from "../render/av/action";
import {openSearchAV} from "../render/av/relation";
import {getPlainText} from "../util/paste";
+import {Menu} from "../../plugin/Menu";
export class Gutter {
public element: HTMLElement;
@@ -77,6 +72,7 @@ export class Gutter {
this.element.className = "protyle-gutters";
this.element.addEventListener("dragstart", (event: DragEvent & { target: HTMLElement }) => {
hideTooltip();
+ window.siyuan.menus.menu.remove();
const buttonElement = event.target.parentElement;
let selectIds: string[] = [];
let selectElements: Element[] = [];
@@ -831,6 +827,7 @@ export class Gutter {
});
}
}).element);
+ const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined;
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.addToDatabase,
accelerator: window.siyuan.config.keymap.general.addToDatabase.custom,
@@ -858,6 +855,7 @@ export class Gutter {
srcIDs: sourceIds,
avID,
}]);
+ focusByRange(range);
});
}
}).element);
@@ -947,7 +945,10 @@ export class Gutter {
}
// 单个块的菜单
hideElements(["util", "toolbar", "hint"], protyle);
- window.siyuan.menus.menu.remove();
+ const menu = new Menu("gutter");
+ if (menu.isOpen) {
+ return;
+ }
if (isMobile()) {
activeBlur();
}
@@ -1321,6 +1322,7 @@ export class Gutter {
});
}
}).element);
+ const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined;
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.addToDatabase,
accelerator: window.siyuan.config.keymap.general.addToDatabase.custom,
@@ -1345,6 +1347,7 @@ export class Gutter {
srcIDs: sourceIds,
avID,
}]);
+ focusByRange(range);
});
}
}).element);
@@ -1823,13 +1826,15 @@ export class Gutter {
}
let updateHTML = nodeElement.getAttribute("updated") || "";
- if (updateHTML) {
- updateHTML = `${window.siyuan.languages.modifiedAt} ${parseNumber2FormatString(updateHTML,'yyyy-MM-dd HH:mm:ss')}`; + if (!isInvalidStringStrict(updateHTML)) { + updateHTML = `${window.siyuan.languages.modifiedAt} ${formatDate(updateHTML,'yyyy-MM-dd HH:mm:ss')}
`; + } else { + updateHTML = `${window.siyuan.languages.modifiedAt} ${formatDate(new Date(),'yyyy-MM-dd HH:mm:ss')}
`; // 使用新时间覆盖丢失的 } window.siyuan.menus.menu.append(new MenuItem({ iconHTML: "", type: "readonly", - label: `${updateHTML}${window.siyuan.languages.createdAt} ${parseNumber2FormatString(id.substring(0, 14),'yyyy-MM-dd HH:mm:ss')}`, + label: `${updateHTML}${window.siyuan.languages.createdAt} ${formatDate(id.substring(0, 14),'yyyy-MM-dd HH:mm:ss')}`, }).element); return window.siyuan.menus.menu; } diff --git a/app/src/protyle/header/Title.ts b/app/src/protyle/header/Title.ts index ed23aacf9c..7ff72ed2b1 100644 --- a/app/src/protyle/header/Title.ts +++ b/app/src/protyle/header/Title.ts @@ -240,6 +240,7 @@ export class Title { }).element); window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.selectAll, + icon: "iconSelect", accelerator: "⌘A", click: () => { range.selectNodeContents(this.editElement); diff --git a/app/src/protyle/header/openTitleMenu.ts b/app/src/protyle/header/openTitleMenu.ts index d2d2005ebf..f4f6956697 100644 --- a/app/src/protyle/header/openTitleMenu.ts +++ b/app/src/protyle/header/openTitleMenu.ts @@ -23,6 +23,7 @@ import {genImportMenu} from "../../menus/navigation"; import {transferBlockRef} from "../../menus/block"; import {openSearchAV} from "../render/av/relation"; import {transaction} from "../wysiwyg/transaction"; +import {focusByRange} from "../util/selection"; export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { window.sout.tracker("invoked"); @@ -46,6 +47,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { }).element); if (!protyle.disabled) { window.siyuan.menus.menu.append(movePathToMenu([protyle.path])); + const range = getSelection().rangeCount > 0 ? getSelection().getRangeAt(0) : undefined; window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.addToDatabase, accelerator: window.siyuan.config.keymap.general.addToDatabase.custom, @@ -70,6 +72,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { srcIDs: sourceIds, avID, }]); + focusByRange(range); }); } }).element); diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index c87354bddd..968320ecc0 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -793,7 +793,7 @@ ${genHintItemHTML(item)} focusBlock(nodeElement); } else if (nodeElement.classList.contains("av")) { avRender(nodeElement, protyle, () => { - focusBlock(nodeElement); + (nodeElement.querySelector(".av__title") as HTMLInputElement).focus(); }); } else { focusByWbr(nodeElement, range); diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts index e3b20bb68d..3c04b50357 100644 --- a/app/src/protyle/render/av/action.ts +++ b/app/src/protyle/render/av/action.ts @@ -34,6 +34,7 @@ import {openCalcMenu} from "./calc"; import {avRender} from "./render"; import {addView, openViewMenu} from "./view"; import {isOnlyMeta, openByMobile, writeText} from "../../util/compatibility"; +import {openSearchAV} from "./relation"; export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLElement }) => { window.sout.tracker("invoked"); @@ -251,7 +252,8 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle return; } const type = getTypeByCellElement(target); - if (type === "updated" || type === "created" || (type === "block" && !target.getAttribute("data-detached"))) { + // TODO 点击单元格的时候， lineNumber 选中整行 + if (type === "updated" || type === "created" || type === "lineNumber" || (type === "block" && !target.getAttribute("data-detached"))) { selectRow(rowElement.querySelector(".av__firstcol"), "toggle"); } else { scrollElement.querySelectorAll(".av__row--select").forEach(item => { @@ -316,6 +318,32 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi type: "submenu", submenu: copySubMenu(blockId) }); + menu.addItem({ + label: window.siyuan.languages.addToDatabase, + icon: "iconDatabase", + click() { + openSearchAV(blockElement.getAttribute("data-av-id"), rowElements[0] as HTMLElement, (listItemElement) => { + const sourceIds: string[] = [blockId]; + const avID = listItemElement.dataset.avId; + transaction(protyle, [{ + action: "insertAttrViewBlock", + avID, + ignoreFillFilter: true, + srcIDs: sourceIds, + isDetached: false, + blockID: listItemElement.dataset.nodeId + }, { + action: "doUpdateUpdated", + id: listItemElement.dataset.nodeId, + data: dayjs().format("YYYYMMDDHHmmss"), + }], [{ + action: "removeAttrViewBlock", + srcIDs: sourceIds, + avID, + }]); + }); + } + }); menu.addItem({ label: window.siyuan.languages.unbindBlock, icon: "iconLinkOff", diff --git a/app/src/protyle/render/av/asset.ts b/app/src/protyle/render/av/asset.ts index 7665d2a3f9..7019b1f5aa 100644 --- a/app/src/protyle/render/av/asset.ts +++ b/app/src/protyle/render/av/asset.ts @@ -44,8 +44,7 @@ export const bindAssetEvent = (options: { protyle: options.protyle, data: options.data, cellElements: options.cellElements, - type: "addUpdate", - addUpdateValue: value, + addValue: value, blockElement: options.blockElement }); }); @@ -55,20 +54,20 @@ export const bindAssetEvent = (options: { export const getAssetHTML = (cellElements: HTMLElement[]) => { window.sout.tracker("invoked"); let html = ""; - genCellValueByElement("mAsset", cellElements[0]).mAsset.forEach(item => { + genCellValueByElement("mAsset", cellElements[0]).mAsset.forEach((item, index) => { if (!item.content) { return; } let contentHTML; if (item.type === "image") { - contentHTML = ` + contentHTML = `
${getCalcValue(column) || '' + window.siyuan.languages.calc}
`;
+
+ // lineNumber type 不参与计算操作
+ if (column.type === "lineNumber") {
+ calcHTML += `${getCalcValue(column) || '' + window.siyuan.languages.calc}
`;
+ }
+
if (pinIndex === index) {
calcHTML += "";
}
@@ -144,7 +151,7 @@ style="width: ${index === 0 ? ((parseInt(column.width || "200") + 24) + "px") :
`;
// body
- data.rows.forEach((row: IAVRow) => {
+ data.rows.forEach((row: IAVRow, rowIndex: number) => {
tableHTML += ``;
if (pinIndex > -1) {
tableHTML += '
`;
if (pinIndex === index) {
tableHTML += "";
@@ -231,7 +238,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}`;
${response.data.isMirror ? `
` : ""}
- ';
@@ -167,7 +174,7 @@ ${cell.value?.isDetached ? ' data-detached="true"' : ""}
style="width: ${data.columns[index].width || "200px"};
${cell.valueType === "number" ? "text-align: right;" : ""}
${cell.bgColor ? `background-color:${cell.bgColor};` : ""}
-${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}
`;
+${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)}${response.data.name || ""}
+ ${response.data.name || ""}
@@ -256,6 +263,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}
`;
+ ${Constants.ZWSP}
`;
e.setAttribute("data-render", "true");
// 历史兼容
diff --git a/app/src/protyle/render/av/select.ts b/app/src/protyle/render/av/select.ts
index 6940847f60..73b1a9cf98 100644
--- a/app/src/protyle/render/av/select.ts
+++ b/app/src/protyle/render/av/select.ts
@@ -18,13 +18,12 @@ const filterSelectHTML = (key: string, options: { name: string, color: string }[
selected.push(item.dataset.content);
});
}
- const checkedName = document.querySelector('.av__panel .b3-menu__item--current[data-type="addColOptionOrCell"]')?.getAttribute("data-name") || "";
if (options) {
options.forEach(item => {
if (!key ||
(key.toLowerCase().indexOf(item.name.toLowerCase()) > -1 ||
item.name.toLowerCase().indexOf(key.toLowerCase()) > -1)) {
- html += `