|
@@ -31,6 +31,7 @@ import {bindRollupData, getRollupHTML, goSearchRollupCol} from "./rollup";
|
|
import {updateCellsValue} from "./cell";
|
|
import {updateCellsValue} from "./cell";
|
|
import {openCalcMenu} from "./calc";
|
|
import {openCalcMenu} from "./calc";
|
|
import * as dayjs from "dayjs";
|
|
import * as dayjs from "dayjs";
|
|
|
|
+import {confirmDialog} from "../../../dialog/confirmDialog";
|
|
|
|
|
|
export const openMenuPanel = (options: {
|
|
export const openMenuPanel = (options: {
|
|
protyle: IProtyle,
|
|
protyle: IProtyle,
|
|
@@ -1025,38 +1026,40 @@ export const openMenuPanel = (options: {
|
|
event.stopPropagation();
|
|
event.stopPropagation();
|
|
break;
|
|
break;
|
|
} else if (type === "removeCol") {
|
|
} else if (type === "removeCol") {
|
|
- const colId = menuElement.querySelector(".b3-menu__item").getAttribute("data-col-id");
|
|
|
|
- let previousID: string;
|
|
|
|
- const colData = data.view.columns.find((item: IAVColumn, index) => {
|
|
|
|
- if (item.id === colId) {
|
|
|
|
- previousID = data.view.columns[index - 1]?.id;
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- const newUpdated = dayjs().format("YYYYMMDDHHmmss");
|
|
|
|
- transaction(options.protyle, [{
|
|
|
|
- action: "removeAttrViewCol",
|
|
|
|
- id: colId,
|
|
|
|
- avID,
|
|
|
|
- }, {
|
|
|
|
- action: "doUpdateUpdated",
|
|
|
|
- id: blockID,
|
|
|
|
- data: newUpdated,
|
|
|
|
- }], [{
|
|
|
|
- action: "addAttrViewCol",
|
|
|
|
- name: colData.name,
|
|
|
|
- avID,
|
|
|
|
- type: colData.type,
|
|
|
|
- id: colId,
|
|
|
|
- previousID
|
|
|
|
- }, {
|
|
|
|
- action: "doUpdateUpdated",
|
|
|
|
- id: blockID,
|
|
|
|
- data: options.blockElement.getAttribute("updated")
|
|
|
|
- }]);
|
|
|
|
- removeAttrViewColAnimation(options.blockElement, colId);
|
|
|
|
- options.blockElement.setAttribute("updated", newUpdated);
|
|
|
|
- avPanelElement.remove();
|
|
|
|
|
|
+ confirmDialog(isCustomAttr ? window.siyuan.languages.deleteOpConfirm : "", isCustomAttr ? window.siyuan.languages.removeCol.replace("${x}", menuElement.querySelector("input").value) : "", () => {
|
|
|
|
+ const colId = menuElement.querySelector(".b3-menu__item").getAttribute("data-col-id");
|
|
|
|
+ let previousID: string;
|
|
|
|
+ const colData = data.view.columns.find((item: IAVColumn, index) => {
|
|
|
|
+ if (item.id === colId) {
|
|
|
|
+ previousID = data.view.columns[index - 1]?.id;
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ const newUpdated = dayjs().format("YYYYMMDDHHmmss");
|
|
|
|
+ transaction(options.protyle, [{
|
|
|
|
+ action: "removeAttrViewCol",
|
|
|
|
+ id: colId,
|
|
|
|
+ avID,
|
|
|
|
+ }, {
|
|
|
|
+ action: "doUpdateUpdated",
|
|
|
|
+ id: blockID,
|
|
|
|
+ data: newUpdated,
|
|
|
|
+ }], [{
|
|
|
|
+ action: "addAttrViewCol",
|
|
|
|
+ name: colData.name,
|
|
|
|
+ avID,
|
|
|
|
+ type: colData.type,
|
|
|
|
+ id: colId,
|
|
|
|
+ previousID
|
|
|
|
+ }, {
|
|
|
|
+ action: "doUpdateUpdated",
|
|
|
|
+ id: blockID,
|
|
|
|
+ data: options.blockElement.getAttribute("updated")
|
|
|
|
+ }]);
|
|
|
|
+ removeAttrViewColAnimation(options.blockElement, colId);
|
|
|
|
+ options.blockElement.setAttribute("updated", newUpdated);
|
|
|
|
+ avPanelElement.remove();
|
|
|
|
+ })
|
|
event.preventDefault();
|
|
event.preventDefault();
|
|
event.stopPropagation();
|
|
event.stopPropagation();
|
|
break;
|
|
break;
|