@opentiny/tiny-engine-toolbar-save 2.2.0 → 2.3.0

package/dist/index.js

@@ -1,11 +1,11 @@
 import "./style.css";
-import { reactive as x, ref as P, onMounted as w, onUnmounted as D, resolveComponent as m, openBlock as A, createElementBlock as L, createVNode as d, withCtx as r, createElementVNode as g, createTextVNode as k, createBlock as M, createCommentVNode as U } from "vue";
-import { VueMonaco as G, ToolbarBase as J } from "@opentiny/tiny-engine-common";
-import { Button as R, Popover as j, DialogBox as Y, Checkbox as I, Select as q } from "@opentiny/vue";
-import { usePage as z, useCanvas as S, getOptions as F, useNotify as C, useLayout as H, getMetaApi as K, META_APP as Q, useBlock as W } from "@opentiny/tiny-engine-meta-register";
-import { constants as B } from "@opentiny/tiny-engine-utils";
-import { handlePageUpdate as X } from "@opentiny/tiny-engine-common/js/http";
-const E = {
+import { reactive as N, ref as B, resolveComponent as f, createElementBlock as L, openBlock as x, createVNode as v, withCtx as d, createBlock as U, createCommentVNode as I, createTextVNode as S, createElementVNode as k, onMounted as P, onUnmounted as E } from "vue";
+import { ToolbarBase as G, VueMonaco as R } from "@opentiny/tiny-engine-common";
+import { Select as j, Checkbox as Y, DialogBox as q, Popover as z, Button as F } from "@opentiny/vue";
+import { useCanvas as C, getOptions as H, useNotify as A, useLayout as K, usePage as Q, getMetaApi as W, META_APP as X, useBlock as Z, useMessage as $ } from "@opentiny/tiny-engine-meta-register";
+import { constants as V } from "@opentiny/tiny-engine-utils";
+import { handlePageUpdate as ee } from "@opentiny/tiny-engine-common/js/http";
+const w = {
   id: "engine.toolbars.save",
   type: "toolbars",
   title: "save",
@@ -15,100 +15,100 @@ const E = {
     },
     renderType: "button"
   }
-}, { PAGE_STATUS: v, AUTO_SAVED: V } = B, _ = x({
+}, { PAGE_STATUS: g, AUTO_SAVED: D } = V, _ = N({
   visible: !1,
   code: "",
   originalCode: "",
   disabled: !1
-}), y = P(!1), Z = async (n) => {
-  var i;
-  const e = K(Q.BlockManage), { getCurrentBlock: o } = W(), t = o();
-  t.label = n.fileName, t.content = n, y.value = !0, t.screenshot = await e.getBlockBase64(), await ((i = e.saveBlock) == null ? void 0 : i.call(e, t)), y.value = !1;
-}, $ = async (n) => {
-  const { currentPage: e } = S().pageState, o = {
-    page_content: n
+}), b = B(!1), te = async (a) => {
+  var s;
+  const e = W(X.BlockManage), { getCurrentBlock: o } = Z(), t = o();
+  t.label = a.fileName, t.content = a, b.value = !0, t.screenshot = await e.getBlockBase64(), await ((s = e.saveBlock) == null ? void 0 : s.call(e, t)), b.value = !1;
+}, oe = async (a) => {
+  const { currentPage: e } = C().pageState, o = {
+    page_content: a
   };
-  y.value = !0, await X(e.id, { ...e, ...o }, !1, !0), y.value = !1;
-}, T = (n) => {
-  const { pageSettingState: e, isTemporaryPage: o } = z(), { isBlock: t, canvasApi: i, pageState: a, resetBlockCanvasState: u, resetPageCanvasState: l } = S(), s = JSON.parse(n), { selectNode: c } = i.value;
-  if (t() ? u({ ...a, pageSchema: s }) : l({ ...a, pageSchema: s }), e != null && e.isAIPage) {
+  b.value = !0, await ee(e.id, { ...e, ...o }, !1, !0), b.value = !1;
+}, O = (a) => {
+  const { pageSettingState: e, isTemporaryPage: o } = Q(), { isBlock: t, canvasApi: s, pageState: l, resetBlockCanvasState: r, resetPageCanvasState: i } = C(), n = JSON.parse(a), { selectNode: c } = s.value;
+  if (t() ? r({ ...l, pageSchema: n }) : i({ ...l, pageSchema: n }), e != null && e.isAIPage) {
     o.saved && (o.saved = !1), o.saved = !0;
     const p = "page_content";
-    return e.currentPageData[p] = s, Promise.resolve();
+    return e.currentPageData[p] = n, Promise.resolve();
   }
-  return c(null), t() ? Z(s) : $(s);
-}, N = async () => {
+  return c(null), t() ? te(n) : oe(n);
+}, M = async () => {
   var p;
-  const { isSaved: n, getSchema: e } = S();
-  if (n() || _.disabled)
+  const { isSaved: a, getSchema: e } = C();
+  if (a() || _.disabled)
     return;
-  const { beforeSave: o, saveMethod: t, saved: i } = F(E.id);
+  const { beforeSave: o, saveMethod: t, saved: s } = H(w.id);
   try {
     if (typeof o == "function" && await o(), typeof t == "function" && await t())
       return;
-  } catch (f) {
-    C({
+  } catch (u) {
+    A({
       type: "error",
-      message: `Error in saving: ${f}`
+      message: `Error in saving: ${u}`
     });
   }
-  const a = (p = H().layoutState) == null ? void 0 : p.pageStatus, u = a == null ? void 0 : a.state, l = a == null ? void 0 : a.data, s = {
-    [v.Release]: "当前页面未锁定，请先锁定再保存",
-    [v.Empty]: "当前应用无页面，请先新建页面再保存",
-    [v.Guest]: "官网演示应用不能保存页面，如需体验请切换应用",
-    [v.Lock]: `当前页面被 ${l == null ? void 0 : l.username} ${l == null ? void 0 : l.resetPasswordToken} 锁定，如需编辑请先联系他解锁文件，然后再锁定该页面后编辑！`
+  const l = (p = K().layoutState) == null ? void 0 : p.pageStatus, r = l == null ? void 0 : l.state, i = l == null ? void 0 : l.data, n = {
+    [g.Release]: "当前页面未锁定，请先锁定再保存",
+    [g.Empty]: "当前应用无页面，请先新建页面再保存",
+    [g.Guest]: "官网演示应用不能保存页面，如需体验请切换应用",
+    [g.Lock]: `当前页面被 ${i == null ? void 0 : i.username} ${i == null ? void 0 : i.resetPasswordToken} 锁定，如需编辑请先联系他解锁文件，然后再锁定该页面后编辑！`
   };
-  if ([v.Release, v.Empty, v.Guest, v.Lock].includes(u)) {
-    C({
+  if ([g.Release, g.Empty, g.Guest, g.Lock].includes(r)) {
+    A({
       type: "error",
       title: "保存失败",
-      message: s[u]
+      message: n[r]
     });
     return;
   }
   _.disabled = !0;
   const c = e();
-  _.code = JSON.stringify(c || {}, null, 2), T(_.code).finally(() => {
-    if (_.disabled = !1, typeof i == "function")
+  _.code = JSON.stringify(c || {}, null, 2), O(_.code).finally(() => {
+    if (_.disabled = !1, typeof s == "function")
       try {
-        i();
-      } catch (f) {
-        C({
+        s();
+      } catch (u) {
+        A({
           type: "error",
-          message: `Error in saved: ${f}`
+          message: `Error in saved: ${u}`
         });
       }
   });
-}, ee = () => {
+}, ae = () => {
   try {
-    const n = localStorage.getItem(V);
-    return JSON.parse(n) ?? !1;
+    const a = localStorage.getItem(D);
+    return JSON.parse(a) ?? !1;
   } catch {
     return !1;
   }
-}, te = (n) => {
+}, ne = (a) => {
   try {
-    return localStorage.setItem(V, JSON.stringify(n)), !0;
+    return localStorage.setItem(D, JSON.stringify(a)), !0;
   } catch {
     return !1;
   }
-}, oe = (n, e) => {
-  const o = n.__vccOpts || n;
-  for (const [t, i] of e)
-    o[t] = i;
+}, se = (a, e) => {
+  const o = a.__vccOpts || a;
+  for (const [t, s] of e)
+    o[t] = s;
   return o;
-}, { OPEN_DELAY: ne } = B, ae = {
-  saveCommon: T,
-  openCommon: N
-}, se = {
+}, { OPEN_DELAY: ie } = V, le = {
+  saveCommon: O,
+  openCommon: M
+}, ce = {
   components: {
-    VueMonaco: G,
-    TinyButton: R,
-    TinyPopover: j,
-    TinyDialogBox: Y,
-    TinyCheckbox: I,
-    TinySelect: q,
-    ToolbarBase: J
+    VueMonaco: R,
+    TinyButton: F,
+    TinyPopover: z,
+    TinyDialogBox: q,
+    TinyCheckbox: Y,
+    TinySelect: j,
+    ToolbarBase: G
   },
   props: {
     iconExpand: {
@@ -121,105 +121,134 @@ const E = {
     }
   },
   setup() {
-    const { isSaved: n } = S(), e = [
+    const a = [
       { value: 5, label: "5分钟" },
       { value: 10, label: "10分钟" },
       { value: 15, label: "15分钟" }
-    ], o = x({
+    ], e = N({
       visible: !1,
       code: "",
       originalCode: "",
-      disabled: !1,
-      timeValue: 5,
       checked: !1,
+      timeValue: 5,
       preservationTime: null
-    }), t = P(null), i = () => {
-      o.visible = !1, o.originalCode = "";
-    }, a = () => {
-      y.value || N();
+    }), o = B(null), { isSaved: t, setSaved: s, getSchema: l } = C(), { subscribe: r, unsubscribe: i } = $(), n = "toolbar-save", c = B(null);
+    P(() => {
+      r({
+        topic: "pageOrBlockInit",
+        subscriber: n,
+        callback: (y) => {
+          c.value = JSON.stringify(y), s(!0);
+        }
+      }), r({
+        topic: "schemaChange",
+        subscriber: n,
+        callback: () => {
+          if (c.value) {
+            const y = JSON.stringify(l()) === c.value;
+            s(y);
+          }
+        }
+      }), r({
+        topic: "schemaImport",
+        subscriber: n,
+        callback: () => {
+          if (c.value) {
+            const y = JSON.stringify(l()) === c.value;
+            s(y);
+          }
+        }
+      });
+    }), E(() => {
+      i({ topic: "pageOrBlockInit", subscriber: n }), i({ topic: "schemaChange", subscriber: n }), i({ topic: "schemaImport", subscriber: n });
+    });
+    const p = () => {
+      e.visible = !1, e.originalCode = "";
     }, u = () => {
-      T();
-    }, l = {
+      b.value || M();
+    }, h = () => {
+      O();
+    }, T = {
       language: "json",
       lineNumbers: !0,
       minimap: {
         enabled: !1
       }
-    }, s = () => {
-      clearTimeout(o.preservationTime), o.preservationTime = setTimeout(() => {
-        a(), s();
-      }, o.timeValue * 60 * 1e3);
-    }, c = () => {
-      te(o.checked), o.checked ? s() : clearTimeout(o.preservationTime);
+    }, m = () => {
+      clearTimeout(e.preservationTime), e.preservationTime = setTimeout(() => {
+        u(), m();
+      }, e.timeValue * 60 * 1e3);
+    }, J = () => {
+      ne(e.checked), e.checked ? m() : clearTimeout(e.preservationTime);
     };
-    return w(() => {
-      o.checked = ee(), o.checked && s();
-    }), D(() => {
-      clearTimeout(o.preservationTime);
+    return P(() => {
+      e.checked = ae(), e.checked && m();
+    }), E(() => {
+      clearTimeout(e.preservationTime);
     }), {
-      state: o,
-      editor: t,
-      editorOptions: l,
-      isLoading: y,
-      isSaved: n,
-      close: i,
-      openApi: a,
-      saveApi: u,
-      delayOptions: e,
-      saveConfig: c,
-      OPEN_DELAY: ne
+      state: e,
+      editor: o,
+      editorOptions: T,
+      isLoading: b,
+      isSaved: t,
+      close: p,
+      openApi: u,
+      saveApi: h,
+      delayOptions: a,
+      saveConfig: J,
+      OPEN_DELAY: ie
     };
   }
-}, ie = { class: "toolbar-save" }, le = { class: "save-style" }, re = { class: "save-time" }, ce = { class: "save-button-group" };
-function de(n, e, o, t, i, a) {
-  const u = m("svg-icon"), l = m("tiny-checkbox"), s = m("tiny-select"), c = m("tiny-button"), p = m("tiny-popover"), f = m("vue-monaco"), O = m("tiny-dialog-box"), h = m("toolbar-base");
-  return A(), L("div", ie, [
-    d(h, {
+}, re = { class: "toolbar-save" }, de = { class: "save-style" }, ue = { class: "save-time" }, me = { class: "save-button-group" };
+function ve(a, e, o, t, s, l) {
+  const r = f("svg-icon"), i = f("tiny-checkbox"), n = f("tiny-select"), c = f("tiny-button"), p = f("tiny-popover"), u = f("vue-monaco"), h = f("tiny-dialog-box"), T = f("toolbar-base");
+  return x(), L("div", re, [
+    v(T, {
       content: t.isLoading ? "保存中" : "保存",
       icon: o.options.icon.default || o.options.icon,
       options: { ...o.options, showDots: !t.isSaved() },
       onClickApi: t.openApi
     }, {
-      button: r(() => [
-        d(p, {
+      button: d(() => [
+        v(p, {
           "visible-arrow": !1,
           width: "203",
           trigger: "click",
           "open-delay": t.OPEN_DELAY.Default
         }, {
-          reference: r(() => [
-            d(u, { name: o.iconExpand }, null, 8, ["name"])
+          reference: d(() => [
+            v(r, { name: o.iconExpand }, null, 8, ["name"])
           ]),
-          default: r(() => [
-            g("div", le, [
-              e[6] || (e[6] = g("div", { class: "save-setting" }, "保存设置", -1)),
-              d(l, {
+          default: d(() => [
+            k("div", de, [
+              e[6] || (e[6] = k("div", { class: "save-setting" }, "保存设置", -1)),
+              v(i, {
                 modelValue: t.state.checked,
-                "onUpdate:modelValue": e[0] || (e[0] = (b) => t.state.checked = b),
+                "onUpdate:modelValue": e[0] || (e[0] = (m) => t.state.checked = m),
                 name: "tiny-checkbox"
               }, {
-                default: r(() => e[3] || (e[3] = [
-                  k("自动保存")
+                default: d(() => e[3] || (e[3] = [
+                  S("自动保存")
                 ])),
                 _: 1
               }, 8, ["modelValue"]),
-              g("div", re, [
-                e[4] || (e[4] = g("div", { class: "save-time-label" }, "保存间隔", -1)),
-                d(s, {
+              k("div", ue, [
+                e[4] || (e[4] = k("div", { class: "save-time-label" }, "保存间隔", -1)),
+                v(n, {
                   modelValue: t.state.timeValue,
-                  "onUpdate:modelValue": e[1] || (e[1] = (b) => t.state.timeValue = b),
+                  "onUpdate:modelValue": e[1] || (e[1] = (m) => t.state.timeValue = m),
                   options: t.delayOptions,
                   disabled: !t.state.checked,
                   autocomplete: ""
                 }, null, 8, ["modelValue", "options", "disabled"])
               ]),
-              g("div", ce, [
-                d(c, {
+              k("div", me, [
+                v(c, {
                   type: "primary",
                   onClick: t.saveConfig
                 }, {
-                  default: r(() => e[5] || (e[5] = [
-                    k("设置并保存")
+                  default: d(() => e[5] || (e[5] = [
+                    S("设置并保存")
                   ])),
                   _: 1
                 }, 8, ["onClick"])
@@ -229,35 +258,35 @@ function de(n, e, o, t, i, a) {
           _: 1
         }, 8, ["open-delay"])
       ]),
-      default: r(() => [
-        d(O, {
+      default: d(() => [
+        v(h, {
           class: "dialog-box",
           modal: !1,
           fullscreen: !0,
           "append-to-body": !0,
           visible: t.state.visible,
           title: "Schema 本地与线上差异",
-          "onUpdate:visible": e[2] || (e[2] = (b) => t.state.visible = b)
+          "onUpdate:visible": e[2] || (e[2] = (m) => t.state.visible = m)
         }, {
-          footer: r(() => [
-            d(c, { onClick: t.close }, {
-              default: r(() => e[7] || (e[7] = [
-                k("取 消")
+          footer: d(() => [
+            v(c, { onClick: t.close }, {
+              default: d(() => e[7] || (e[7] = [
+                S("取 消")
               ])),
               _: 1
             }, 8, ["onClick"]),
-            d(c, {
+            v(c, {
               type: "primary",
               onClick: t.saveApi
             }, {
-              default: r(() => e[8] || (e[8] = [
-                k("保 存")
+              default: d(() => e[8] || (e[8] = [
+                S("保 存")
               ])),
               _: 1
             }, 8, ["onClick"])
           ]),
-          default: r(() => [
-            t.state.visible ? (A(), M(f, {
+          default: d(() => [
+            t.state.visible ? (x(), U(u, {
               key: 0,
               ref: "editor",
               class: "monaco-editor",
@@ -265,7 +294,7 @@ function de(n, e, o, t, i, a) {
               options: t.editorOptions,
               value: t.state.code,
               original: t.state.originalCode
-            }, null, 8, ["options", "value", "original"])) : U("", !0)
+            }, null, 8, ["options", "value", "original"])) : I("", !0)
           ]),
           _: 1
         }, 8, ["visible"])
@@ -274,11 +303,11 @@ function de(n, e, o, t, i, a) {
     }, 8, ["content", "icon", "options", "onClickApi"])
   ]);
 }
-const ue = /* @__PURE__ */ oe(se, [["render", de], ["__scopeId", "data-v-d7b68e59"]]), _e = {
-  ...E,
-  entry: ue,
-  apis: ae
+const pe = /* @__PURE__ */ se(ce, [["render", ve], ["__scopeId", "data-v-204025a1"]]), Ce = {
+  ...w,
+  entry: pe,
+  apis: le
 };
 export {
-  _e as default
+  Ce as default
 };

package/dist/style.css

@@ -1 +1 @@
-.dots[data-v-d7b68e59]{width:6px;height:6px;background:var(--ti-lowcode-toolbar-dot-color);border-radius:50%;display:inline-block;position:absolute;top:4px;right:3px;z-index:100}.toolbar-save .icon-down-arrow.icon-down-arrow[data-v-d7b68e59]{margin-left:var(--te-base-space-2x);margin-right:var(--te-base-space-0)}.toolbar-save .save-button[data-v-d7b68e59]{background-color:var(--ti-lowcode-toolbar-button-bg);border:none;min-width:70px;height:26px;display:flex;align-items:center;padding:0 8px;border-radius:4px}.toolbar-save .save-button[data-v-d7b68e59]:not(.disabled):hover{background-color:var(--ti-lowcode-toolbar-button-bg)}.toolbar-save[data-v-d7b68e59] .icon-down-arrow:focus{outline:none}.save-style[data-v-d7b68e59]{padding:8px 4px;font-size:12px}.save-style .save-setting[data-v-d7b68e59]{font-size:14px;font-weight:600;line-height:20px;height:20px;margin-bottom:16px}.save-style .save-time[data-v-d7b68e59]{line-height:24px;font-size:12px;margin:12px 0 16px;display:flex}.save-style .save-time .save-time-label[data-v-d7b68e59]{width:60px;color:var(--te-common-text-secondary)}.save-style .save-time .tiny-select[data-v-d7b68e59]{width:103px;margin-left:12px}.save-style .save-time .tiny-select[data-v-d7b68e59] .tiny-input__suffix{width:12px;top:12px}.save-style .save-button-group[data-v-d7b68e59]{text-align:right}#saving[data-v-d7b68e59]{cursor:not-allowed;color:var(--ti-lowcode-disabled-color)}#saving[data-v-d7b68e59] svg{color:var(--ti-lowcode-disabled-color)}.dialog-box[data-v-d7b68e59] .tiny-dialog-box{display:flex;flex-direction:column}.dialog-box[data-v-d7b68e59] .tiny-dialog-box .tiny-dialog-box__body{flex:1}.dialog-box .monaco-editor[data-v-d7b68e59]{width:100%;height:100%}.changeRole a{color:var(--ti-lowcode-canvas-handle-hover-bg);padding:0 5px}.save-style .save-time .tiny-input__inner{height:24px!important}
+.dots[data-v-204025a1]{width:6px;height:6px;background:var(--te-toolbars-save-dot-color);border-radius:50%;display:inline-block;position:absolute;top:4px;right:3px;z-index:100}.toolbar-save .icon-down-arrow.icon-down-arrow[data-v-204025a1]{margin-left:var(--te-base-space-2x);margin-right:var(--te-base-space-0)}.toolbar-save .save-button[data-v-204025a1]{background-color:var(--te-toolbars-save-button-bg-color);border:none;min-width:70px;height:26px;display:flex;align-items:center;padding:0 8px;border-radius:4px}.toolbar-save .save-button[data-v-204025a1]:not(.disabled):hover{background-color:var(--te-toolbars-save-button-bg-color)}.toolbar-save[data-v-204025a1] .icon-down-arrow:focus{outline:none}.save-style[data-v-204025a1]{padding:8px 4px;font-size:12px}.save-style .save-setting[data-v-204025a1]{font-size:14px;font-weight:600;line-height:20px;height:20px;margin-bottom:16px}.save-style .save-time[data-v-204025a1]{line-height:24px;font-size:12px;margin:12px 0 16px;display:flex}.save-style .save-time .save-time-label[data-v-204025a1]{width:60px;color:var(--te-toolbars-save-text-color)}.save-style .save-time .tiny-select[data-v-204025a1]{width:103px;margin-left:12px}.save-style .save-time .tiny-select[data-v-204025a1] .tiny-input__suffix{width:12px}.save-style .save-time[data-v-204025a1] .tiny-select.is-disabled .tiny-input__suffix{display:flex}.save-style .save-button-group[data-v-204025a1]{text-align:right}#saving[data-v-204025a1]{cursor:not-allowed;color:var(--te-toolbars-save-text-color-disabled)}#saving[data-v-204025a1] svg{color:var(--te-toolbars-save-text-color-disabled)}.dialog-box[data-v-204025a1] .tiny-dialog-box{display:flex;flex-direction:column}.dialog-box[data-v-204025a1] .tiny-dialog-box .tiny-dialog-box__body{flex:1}.dialog-box .monaco-editor[data-v-204025a1]{width:100%;height:100%}.changeRole a{color:var(--te-toolbars-save-text-color-link);padding:0 5px}.save-style .save-time .tiny-input__inner{height:24px!important}:root{--te-toolbars-save-text-color: var(--te-common-text-secondary);--te-toolbars-save-text-color-disabled: var(--te-common-text-disabled);--te-toolbars-save-dot-color: var(--te-common-color-error);--te-toolbars-save-button-bg-color: var(--te-common-bg-prompt);--te-toolbars-save-text-color-link: var(--te-common-text-link)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-save",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -25,19 +25,19 @@
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
   "dependencies": {
-    "@opentiny/tiny-engine-common": "2.2.0",
-    "@opentiny/tiny-engine-meta-register": "2.2.0",
-    "@opentiny/tiny-engine-utils": "2.2.0"
+    "@opentiny/tiny-engine-common": "2.3.0",
+    "@opentiny/tiny-engine-meta-register": "2.3.0",
+    "@opentiny/tiny-engine-utils": "2.3.0"
   },
   "devDependencies": {
-    "@opentiny/tiny-engine-vite-plugin-meta-comments": "2.2.0",
+    "@opentiny/tiny-engine-vite-plugin-meta-comments": "2.3.0",
     "@vitejs/plugin-vue": "^5.1.2",
     "@vitejs/plugin-vue-jsx": "^4.0.1",
     "vite": "^5.4.2"
   },
   "peerDependencies": {
-    "@opentiny/vue": "^3.14.0",
+    "@opentiny/vue": "^3.20.0",
     "vue": "^3.4.15"
   },
-  "gitHead": "34525174aa47280dda7d42d8835ebe235e169ed6"
+  "gitHead": "330c4d2b319d5b5ba6ad64c270c21a7931a2e400"
 }