diygw-designer 1.4.3 → 1.5.1

package/dist/miniapp-designer/src/MiniProgramDesigner.vue.cjs

@@ -1 +1 @@
-"use strict";const r=require("vue");;/* empty css                */;/* empty css                          */;/* empty css                                    */;/* empty css                                                */;/* empty css                                                     */const s=require("../../manager/src/pluginManager.cjs");require("jsep");require("@vueuse/core");require("../../hooks/src/store/index.cjs");;/* empty css                                              */require("vue-draggable-plus");;/* empty css                                                               */require("element-plus");;/* empty css                                                             */;/* empty css                                                             */;/* empty css                                     */const i=require("../../ui-kit/panel-ui/src/activitybars/pageManager/storage.cjs");require("../../ui-kit/panel-ui/src/activitybars/pageManager/pageDraftBootstrap.cjs");require("../../core/src/components/builder/hooks/usePageDataSources.cjs");const f=require("../../core/src/components/designer/src/designer.vue.cjs"),S=require("../../ui/elementPlus/src/index.cjs"),q=require("./setupMiniProgramDesigner.cjs"),h={key:0},P=r.defineComponent({__name:"MiniProgramDesigner",props:{multiPage:{type:Boolean,default:!0},projectId:{},pageStorageHttp:{},pageStorageNamespace:{},syncProjectKeyFromUrl:{type:Boolean,default:!0},initialPageSchema:{},title:{default:"小程序设计页面"},headerPrefix:{},onSaveSchema:{}},emits:["save"],setup(o,{emit:u}){var c;const e=o,n=r.computed(()=>e.headerPrefix===void 0?"小程序":e.headerPrefix),g=r.computed(()=>{var a;return!(e.multiPage===!1&&((a=e.projectId)!=null&&a.trim()))});e.pageStorageHttp?i.configurePageStorage({adapter:i.createHttpStorageAdapter(e.pageStorageHttp)}):e.pageStorageNamespace?i.configurePageStorage({namespace:e.pageStorageNamespace}):(c=e.projectId)!=null&&c.trim()?i.configurePageStorage({projectKey:e.projectId}):e.syncProjectKeyFromUrl&&i.syncPageStorageNamespaceFromLocation(),S.setupElementPlus(s.pluginManager);const{defaultSchema:l}=q.setupMiniProgramDesigner(s.pluginManager),p=r.computed(()=>{var t;const a=e.initialPageSchema;return(t=a==null?void 0:a.schemas)!=null&&t.length?JSON.parse(JSON.stringify(a)):{schemas:[JSON.parse(JSON.stringify(l))]}}),m=u;async function d(a){var t;await i.flushPageStorage(),await((t=e.onSaveSchema)==null?void 0:t.call(e,a)),m("save",a)}return(a,t)=>(r.openBlock(),r.createBlock(r.unref(f),{"canvas-mode":"mobile","form-mode":"","lock-default-schema-edit":"","default-schema":p.value,"enable-page-manager":o.multiPage,"page-tree-persistence":g.value,title:o.title,onSave:d},{"header-prefix":r.withCtx(()=>[r.renderSlot(a.$slots,"header-prefix",{},()=>[n.value?(r.openBlock(),r.createElementBlock("div",h,r.toDisplayString(n.value),1)):r.createCommentVNode("",!0)])]),_:3},8,["default-schema","enable-page-manager","page-tree-persistence","title"]))}});module.exports=P;
+"use strict";const t=require("vue");;/* empty css                */;/* empty css                          */;/* empty css                                    */;/* empty css                                                */;/* empty css                                                     */const u=require("../../manager/src/pluginManager.cjs");require("jsep");require("@vueuse/core");require("../../hooks/src/store/index.cjs");;/* empty css                                              */require("vue-draggable-plus");;/* empty css                                                               */require("element-plus");;/* empty css                                                             */;/* empty css                                                             */;/* empty css                                     */const i=require("../../ui-kit/panel-ui/src/activitybars/pageManager/storage.cjs");require("../../ui-kit/panel-ui/src/activitybars/pageManager/pageDraftBootstrap.cjs");require("../../core/src/components/builder/hooks/usePageDataSources.cjs");const f=require("../../core/src/components/designer/src/designer.vue.cjs"),S=require("../../ui/elementPlus/src/index.cjs"),h=require("./setupMiniProgramDesigner.cjs"),q={key:0},P=t.defineComponent({__name:"MiniProgramDesigner",props:{multiPage:{type:Boolean,default:!0},projectId:{},pageStorageHttp:{},pageStorageNamespace:{},syncProjectKeyFromUrl:{type:Boolean,default:!0},initialPageSchema:{},title:{default:"小程序设计页面"},headerPrefix:{},onSaveSchema:{}},emits:["save"],setup(o,{emit:s}){const e=o,g=s,n=t.computed(()=>e.headerPrefix===void 0?"小程序":e.headerPrefix),p=t.computed(()=>{var r;return!(e.multiPage===!1&&((r=e.projectId)!=null&&r.trim()))});function c(){var r;e.pageStorageHttp?i.configurePageStorage({adapter:i.createHttpStorageAdapter(e.pageStorageHttp),projectKey:e.projectId}):e.pageStorageNamespace?i.configurePageStorage({namespace:e.pageStorageNamespace,projectKey:e.projectId}):(r=e.projectId)!=null&&r.trim()?i.configurePageStorage({projectKey:e.projectId}):e.syncProjectKeyFromUrl&&i.syncPageStorageNamespaceFromLocation()}c(),t.watch([()=>e.pageStorageHttp,()=>e.pageStorageNamespace,()=>e.projectId,()=>e.syncProjectKeyFromUrl],()=>{c()},{deep:!0,immediate:!0}),S.setupElementPlus(u.pluginManager);const{defaultSchema:l}=h.setupMiniProgramDesigner(u.pluginManager),m=t.computed(()=>{var a;const r=e.initialPageSchema;return(a=r==null?void 0:r.schemas)!=null&&a.length?JSON.parse(JSON.stringify(r)):{schemas:[JSON.parse(JSON.stringify(l))]}});async function d(r){var a;await i.flushPageStorage(),await((a=e.onSaveSchema)==null?void 0:a.call(e,r)),g("save",r)}return(r,a)=>(t.openBlock(),t.createBlock(t.unref(f),{"canvas-mode":"mobile","form-mode":"","lock-default-schema-edit":"","default-schema":m.value,"enable-page-manager":o.multiPage,"page-tree-persistence":p.value,title:o.title,onSave:d},{"header-prefix":t.withCtx(()=>[t.renderSlot(r.$slots,"header-prefix",{},()=>[n.value?(t.openBlock(),t.createElementBlock("div",q,t.toDisplayString(n.value),1)):t.createCommentVNode("",!0)])]),_:3},8,["default-schema","enable-page-manager","page-tree-persistence","title"]))}});module.exports=P;

package/dist/miniapp-designer/src/MiniProgramDesigner.vue.js

@@ -1,10 +1,10 @@
-import { defineComponent as S, computed as o, createBlock as h, openBlock as n, unref as P, withCtx as v, renderSlot as y, createElementBlock as x, createCommentVNode as N, toDisplayString as j } from "vue";
+import { defineComponent as S, computed as o, watch as h, createBlock as P, openBlock as c, unref as y, withCtx as j, renderSlot as v, createElementBlock as N, createCommentVNode as x, toDisplayString as I } from "vue";
 /* empty css              */
 /* empty css                        */
 /* empty css                                  */
 /* empty css                                              */
 /* empty css                                                   */
-import { pluginManager as c } from "../../manager/src/pluginManager.js";
+import { pluginManager as n } from "../../manager/src/pluginManager.js";
 import "jsep";
 import "@vueuse/core";
 import "../../hooks/src/store/index.js";
@@ -15,13 +15,13 @@ import "element-plus";
 /* empty css                                                           */
 /* empty css                                                           */
 /* empty css                                   */
-import { configurePageStorage as i, createHttpStorageAdapter as B, syncPageStorageNamespaceFromLocation as _, flushPageStorage as k } from "../../ui-kit/panel-ui/src/activitybars/pageManager/storage.js";
+import { configurePageStorage as i, createHttpStorageAdapter as B, syncPageStorageNamespaceFromLocation as K, flushPageStorage as _ } from "../../ui-kit/panel-ui/src/activitybars/pageManager/storage.js";
 import "../../ui-kit/panel-ui/src/activitybars/pageManager/pageDraftBootstrap.js";
 import "../../core/src/components/builder/hooks/usePageDataSources.js";
-import H from "../../core/src/components/designer/src/designer.vue.js";
-import { setupElementPlus as I } from "../../ui/elementPlus/src/index.js";
-import { setupMiniProgramDesigner as J } from "./setupMiniProgramDesigner.js";
-const O = { key: 0 }, ee = /* @__PURE__ */ S({
+import k from "../../core/src/components/designer/src/designer.vue.js";
+import { setupElementPlus as H } from "../../ui/elementPlus/src/index.js";
+import { setupMiniProgramDesigner as w } from "./setupMiniProgramDesigner.js";
+const C = { key: 0 }, te = /* @__PURE__ */ S({
   __name: "MiniProgramDesigner",
   props: {
     multiPage: { type: Boolean, default: !0 },
@@ -36,8 +36,7 @@ const O = { key: 0 }, ee = /* @__PURE__ */ S({
   },
   emits: ["save"],
   setup(r, { emit: s }) {
-    var p;
-    const e = r, m = o(
+    const e = r, g = s, m = o(
       () => e.headerPrefix === void 0 ? "小程序" : e.headerPrefix
     ), l = o(
       () => {
@@ -45,35 +44,57 @@ const O = { key: 0 }, ee = /* @__PURE__ */ S({
         return !(e.multiPage === !1 && ((t = e.projectId) != null && t.trim()));
       }
     );
-    e.pageStorageHttp ? i({
-      adapter: B(e.pageStorageHttp)
-    }) : e.pageStorageNamespace ? i({ namespace: e.pageStorageNamespace }) : (p = e.projectId) != null && p.trim() ? i({
-      projectKey: e.projectId
-    }) : e.syncProjectKeyFromUrl && _(), I(c);
-    const { defaultSchema: g } = J(c), f = o(() => {
+    function p() {
+      var t;
+      e.pageStorageHttp ? i({
+        adapter: B(e.pageStorageHttp),
+        projectKey: e.projectId
+      }) : e.pageStorageNamespace ? i({
+        namespace: e.pageStorageNamespace,
+        projectKey: e.projectId
+      }) : (t = e.projectId) != null && t.trim() ? i({
+        projectKey: e.projectId
+      }) : e.syncProjectKeyFromUrl && K();
+    }
+    p(), h(
+      [
+        () => e.pageStorageHttp,
+        () => e.pageStorageNamespace,
+        () => e.projectId,
+        () => e.syncProjectKeyFromUrl
+      ],
+      () => {
+        p();
+      },
+      {
+        deep: !0,
+        immediate: !0
+      }
+    ), H(n);
+    const { defaultSchema: f } = w(n), d = o(() => {
       var a;
       const t = e.initialPageSchema;
       return (a = t == null ? void 0 : t.schemas) != null && a.length ? JSON.parse(JSON.stringify(t)) : {
-        schemas: [JSON.parse(JSON.stringify(g))]
+        schemas: [JSON.parse(JSON.stringify(f))]
       };
-    }), u = s;
-    async function d(t) {
+    });
+    async function u(t) {
       var a;
-      await k(), await ((a = e.onSaveSchema) == null ? void 0 : a.call(e, t)), u("save", t);
+      await _(), await ((a = e.onSaveSchema) == null ? void 0 : a.call(e, t)), g("save", t);
     }
-    return (t, a) => (n(), h(P(H), {
+    return (t, a) => (c(), P(y(k), {
       "canvas-mode": "mobile",
       "form-mode": "",
       "lock-default-schema-edit": "",
-      "default-schema": f.value,
+      "default-schema": d.value,
       "enable-page-manager": r.multiPage,
       "page-tree-persistence": l.value,
       title: r.title,
-      onSave: d
+      onSave: u
     }, {
-      "header-prefix": v(() => [
-        y(t.$slots, "header-prefix", {}, () => [
-          m.value ? (n(), x("div", O, j(m.value), 1)) : N("", !0)
+      "header-prefix": j(() => [
+        v(t.$slots, "header-prefix", {}, () => [
+          m.value ? (c(), N("div", C, I(m.value), 1)) : x("", !0)
         ])
       ]),
       _: 3
@@ -81,5 +102,5 @@ const O = { key: 0 }, ee = /* @__PURE__ */ S({
   }
 });
 export {
-  ee as default
+  te as default
 };

package/dist/ui-kit/panel-ui/src/activitybars/pageManager/usePageManagerSingleton.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("vue"),C=require("element-plus");;/* empty css                                   */;/* empty css                                               */;/* empty css                                                    */const ge=require("../../../../../manager/src/pluginManager.cjs");;/* empty css                                             */require("vue-draggable-plus");const c=require("../../../../../utils/src/common/data.cjs");require("jsep");require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");const pe=require("../../../../../hooks/src/designer/useDesignerContext.cjs"),z=require("../../../../../hooks/src/plugin/usePageSchema.cjs"),H=require("./pageDraftBootstrap.cjs"),V=require("./storage.cjs"),j="__DIYGW_PAGE_MANAGER_RUNTIME__";function ve(){const p=window;return p[j]||(p[j]={currentPageId:""}),p[j]}let B=null;function he(){const p=pe.useDesignerContext(),l=p.pageSchema,y=p.revoke,g=V.getPageStorageAdapter(),A=ve(),s=o.ref([]),S=o.ref(""),d=o.ref(A.currentPageId||""),h=o.ref(""),X=o.ref(),N=o.ref(!1);let w=null,D=Promise.resolve();const L=V.getPageDraftStorageKey(),_=o.ref(!1),E=o.ref(!1),q=o.ref("page"),v=o.ref(null),I=o.ref(""),Z={children:"children",label:"name"},K=o.ref(null);function b(){try{const e=localStorage.getItem(L);if(!e)return null;const t=JSON.parse(e);return!t||!Array.isArray(t.tree)?null:{currentPageId:String(t.currentPageId??""),pages:t.pages??{},scripts:t.scripts&&typeof t.scripts=="object"?t.scripts:void 0,tree:t.tree,updatedAt:Number(t.updatedAt??Date.now())}}catch{return null}}function $(e){localStorage.setItem(L,JSON.stringify(c.deepClone(e)))}function F(e,t,a){const r=b();$({currentPageId:d.value,pages:t??(r==null?void 0:r.pages)??{},scripts:a??(r==null?void 0:r.scripts)??{},tree:c.deepClone(e),updatedAt:Date.now()})}function ee(e,t){const a=b(),r={...(a==null?void 0:a.pages)??{},[e]:c.deepClone(t)},n={...(a==null?void 0:a.scripts)??{},[e]:l.script??""};$({currentPageId:d.value||e,pages:r,scripts:n,tree:c.deepClone((a==null?void 0:a.tree)??s.value),updatedAt:Date.now()})}function M(e){return`${e}_${Date.now()}_${Math.random().toString(36).slice(2,7)}`}function x(e,t,a=null){e.forEach((r,n)=>{var i;t(r,a,n),(i=r.children)!=null&&i.length&&x(r.children,t,r)})}function O(e){let t=null;return x(s.value,(a,r)=>{!t&&a.id===e&&(t={node:a,parent:r})}),t}function R(e){var a;if(e.type==="page")return[e.id];const t=[];return(a=e.children)==null||a.forEach(r=>{t.push(...R(r))}),t}function k(e){let t="";const a=r=>{var n;for(const i of r){if(i.type==="page"){t=i.id;return}if((n=i.children)!=null&&n.length&&(a(i.children),t))return}};return a(e),t}function J(e,t){if(!e)return!1;let a=!1;return x(t,r=>{r.type==="page"&&r.id===e&&(a=!0)}),a}function U(e){var n;const t=K.value??c.deepClone((n=ge.pluginManager.component.getConfigByType("page"))==null?void 0:n.defaultSchema),a=c.generateNewSchema(c.deepClone(t),[]),r=e.trim()||a.label||"新页面";return G(a,r),a}function G(e,t){var r;e.label=t,e.props={...e.props??{},name:t,title:t};const a=(r=e.children)==null?void 0:r[0];a!=null&&a.props&&Object.prototype.hasOwnProperty.call(a.props,"text")&&(a.props.text=t)}async function P(){await g.saveTree(c.deepClone(s.value)),await F(s.value)}async function T(){if(N.value||!d.value||!l.schemas[0])return;const e=d.value,t=c.deepClone(l.schemas[0]);D=D.then(async()=>{await g.savePage(e,t),await ee(e,t)}),await D}function Y(){w&&clearTimeout(w),w=setTimeout(()=>{w=null,T()},180)}async function Q(){w?(clearTimeout(w),w=null,await T()):await D}async function m(e,t=!1){if(d.value===e&&l.schemas[0]){S.value=e,h.value=e;return}t||(await Q(),await T()),N.value=!0;try{let a=await g.loadPage(e);a||(a=U("新页面"),await g.savePage(e,a)),d.value=e,l.schemas=[c.deepClone(a)];const r=b();l.script=r!=null&&r.scripts&&Object.prototype.hasOwnProperty.call(r.scripts,e)?r.scripts[e]:z.INITIAL_PAGE_SCRIPT,S.value=e,h.value=e,await o.nextTick(),p.setSelectedNode(l.schemas[0])}finally{N.value=!1}}async function te(){var r;await H.awaitPageDraftBootstrap(),K.value=c.deepClone(l.schemas[0]);const e=H.takeRestoredDraftPayload();if(e){const{currentPageId:n,draft:i}=e;s.value=c.deepClone(i.tree);const u=(n&&J(n,s.value)?n:k(s.value))||"";if(u){d.value=u,A.currentPageId=u;const f=i.pages[u];f?(l.schemas=[c.deepClone(f)],l.script=i.scripts&&Object.prototype.hasOwnProperty.call(i.scripts,u)?i.scripts[u]:z.INITIAL_PAGE_SCRIPT,S.value=u,h.value=u,await o.nextTick(),p.setSelectedNode(l.schemas[0])):await m(u,!0)}await F(s.value,c.deepClone(i.pages),c.deepClone(i.scripts??{}));return}const t=await g.loadTree();if(!t||!t.length){const n=c.deepClone(l.schemas[0]),i=n.id||M("page"),u=((r=n.props)==null?void 0:r.name)||n.label||"首页";s.value=[{id:i,name:u,type:"page"}],await g.savePage(i,n),await P(),await m(i,!0);return}if(s.value=t,d.value&&l.schemas[0]&&await T(),J(d.value,s.value)&&l.schemas[0]){S.value=d.value,h.value=d.value;return}const a=k(s.value);if(!a){C.ElMessage.warning("页面树中没有页面节点，请先新增页面");return}await m(a,!0)}function ae(e){h.value=e.id,e.type==="page"&&m(e.id)}function re(e){var a,r;if(!e)return s.value;const t=(a=O(e))==null?void 0:a.node;if(!t)return s.value;if(t.type==="page"){const n=(r=O(e))==null?void 0:r.parent;return(n==null?void 0:n.children)??s.value}return t.children??(t.children=[]),t.children}function ne(e){q.value=e,I.value="",_.value=!0}async function ie(){const e=I.value.trim();if(!e){C.ElMessage.warning("请输入名称");return}const t=h.value||null,a=re(t);if(q.value==="folder"){a.push({id:M("folder"),name:e,type:"folder",children:[]}),await P(),_.value=!1,y.push("新增目录",!0);return}const r=M("page");a.push({id:r,name:e,type:"page"});const n=U(e);await g.savePage(r,n),await P(),_.value=!1,await m(r),y.push("新增页面",!0)}function se(e){v.value=e,I.value=e.name,E.value=!0}async function le(){if(!v.value)return;const e=I.value.trim();if(!e){C.ElMessage.warning("请输入名称");return}if(v.value.name=e,v.value.type==="page")if(d.value===v.value.id&&l.schemas[0])G(l.schemas[0],e),await T();else{const t=await g.loadPage(v.value.id);t&&(G(t,e),await g.savePage(v.value.id,t))}await P(),E.value=!1,y.push("修改节点名称",!0)}async function ue(e){var u;const t=O(e.id);if(!t)return;const a=R(t.node),r=R({id:"root",type:"folder",children:s.value});if(a.length&&a.length===r.length){C.ElMessage.warning("至少保留一个页面");return}const n=((u=t.parent)==null?void 0:u.children)??s.value,i=n.findIndex(f=>f.id===e.id);i>=0&&n.splice(i,1);for(const f of a)await g.deletePage(f);if(await P(),a.includes(d.value)){const f=k(s.value);f&&await m(f,!0)}y.push("删除节点",!0)}function oe(e,t,a){var i,u,f,W;const r=e.data.type,n=t.data.type;if(r==="folder"){if(a==="inner")return n==="folder";if(n!=="folder")return!1;const de=((u=(i=e.parent)==null?void 0:i.data)==null?void 0:u.id)??"__root__",fe=((W=(f=t.parent)==null?void 0:f.data)==null?void 0:W.id)??"__root__";return de===fe}return a==="inner"?n==="folder":!0}async function ce(){await Q(),await P(),y.push("树结构拖动",!0)}return o.watch(()=>l.schemas,()=>{Y()},{deep:!0}),o.watch(()=>l.script,()=>{Y()}),o.watch(d,e=>{A.currentPageId=e}),te(),{activePageId:S,addType:q,allowDrop:oe,currentPageId:d,editTarget:v,handleAdd:ie,handleDelete:ue,handleEdit:le,handleNodeClick:ae,handleNodeDrop:ce,inputName:I,openAddDialog:ne,openEditDialog:se,selectedNodeId:h,showAddDialog:_,showEditDialog:E,treeData:s,treeProps:Z,treeRef:X}}function we(){return B||(B=he()),B}exports.usePageManagerSingleton=we;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("vue"),_=require("element-plus");;/* empty css                                   */;/* empty css                                               */;/* empty css                                                    */const pe=require("../../../../../manager/src/pluginManager.cjs");;/* empty css                                             */require("vue-draggable-plus");const c=require("../../../../../utils/src/common/data.cjs");require("jsep");require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");const X=require("../../../../../hooks/src/designer/useDesignerContext.cjs"),Q=require("../../../../../hooks/src/plugin/usePageSchema.cjs"),z=require("./pageDraftBootstrap.cjs"),H=require("./storage.cjs"),j="__DIYGW_PAGE_MANAGER_RUNTIME__";function ve(){const g=window;return g[j]||(g[j]={currentPageId:""}),g[j]}const V=new WeakMap;function he(){const g=X.useDesignerContext(),s=g.pageSchema,v=g.revoke,p=()=>H.getPageStorageAdapter(),A=ve(),u=o.ref([]),S=o.ref(""),d=o.ref(A.currentPageId||""),w=o.ref(""),Z=o.ref(),N=o.ref(!1);let P=null,D=Promise.resolve();const B=()=>H.getPageDraftStorageKey(),C=o.ref(!1),E=o.ref(!1),M=o.ref("page"),h=o.ref(null),I=o.ref(""),ee={children:"children",label:"name"},L=o.ref(null);function q(){try{const e=localStorage.getItem(B());if(!e)return null;const t=JSON.parse(e);return!t||!Array.isArray(t.tree)?null:{currentPageId:String(t.currentPageId??""),pages:t.pages??{},scripts:t.scripts&&typeof t.scripts=="object"?t.scripts:void 0,tree:t.tree,updatedAt:Number(t.updatedAt??Date.now())}}catch{return null}}function $(e){localStorage.setItem(B(),JSON.stringify(c.deepClone(e)))}function K(e,t,a){const n=q();$({currentPageId:d.value,pages:t??(n==null?void 0:n.pages)??{},scripts:a??(n==null?void 0:n.scripts)??{},tree:c.deepClone(e),updatedAt:Date.now()})}function te(e,t){const a=q(),n={...(a==null?void 0:a.pages)??{},[e]:c.deepClone(t)},r={...(a==null?void 0:a.scripts)??{},[e]:s.script??""};$({currentPageId:d.value||e,pages:n,scripts:r,tree:c.deepClone((a==null?void 0:a.tree)??u.value),updatedAt:Date.now()})}function b(e){return`${e}_${Date.now()}_${Math.random().toString(36).slice(2,7)}`}function x(e,t,a=null){e.forEach((n,r)=>{var i;t(n,a,r),(i=n.children)!=null&&i.length&&x(n.children,t,n)})}function O(e){let t=null;return x(u.value,(a,n)=>{!t&&a.id===e&&(t={node:a,parent:n})}),t}function R(e){var a;if(e.type==="page")return[e.id];const t=[];return(a=e.children)==null||a.forEach(n=>{t.push(...R(n))}),t}function k(e){let t="";const a=n=>{var r;for(const i of n){if(i.type==="page"){t=i.id;return}if((r=i.children)!=null&&r.length&&(a(i.children),t))return}};return a(e),t}function F(e,t){if(!e)return!1;let a=!1;return x(t,n=>{n.type==="page"&&n.id===e&&(a=!0)}),a}function J(e){var r;const t=L.value??c.deepClone((r=pe.pluginManager.component.getConfigByType("page"))==null?void 0:r.defaultSchema),a=c.generateNewSchema(c.deepClone(t),[]),n=e.trim()||a.label||"新页面";return G(a,n),a}function G(e,t){var n;e.label=t,e.props={...e.props??{},name:t,title:t};const a=(n=e.children)==null?void 0:n[0];a!=null&&a.props&&Object.prototype.hasOwnProperty.call(a.props,"text")&&(a.props.text=t)}async function m(){await p().saveTree(c.deepClone(u.value)),await K(u.value)}async function T(){if(N.value||!d.value||!s.schemas[0])return;const e=d.value,t=c.deepClone(s.schemas[0]);D=D.then(async()=>{await p().savePage(e,t),await te(e,t)}),await D}function U(){P&&clearTimeout(P),P=setTimeout(()=>{P=null,T()},180)}async function W(){P?(clearTimeout(P),P=null,await T()):await D}async function y(e,t=!1){if(d.value===e&&s.schemas[0]){S.value=e,w.value=e;return}t||(await W(),await T()),N.value=!0;try{let a=await p().loadPage(e);a||(a=J("新页面"),await p().savePage(e,a)),d.value=e,s.schemas=[c.deepClone(a)];const n=q();s.script=n!=null&&n.scripts&&Object.prototype.hasOwnProperty.call(n.scripts,e)?n.scripts[e]:Q.INITIAL_PAGE_SCRIPT,S.value=e,w.value=e,await o.nextTick(),g.setSelectedNode(s.schemas[0])}finally{N.value=!1}}async function ae(){var n;await z.awaitPageDraftBootstrap(),L.value=c.deepClone(s.schemas[0]);const e=z.takeRestoredDraftPayload();if(e){const{currentPageId:r,draft:i}=e;u.value=c.deepClone(i.tree);const l=(r&&F(r,u.value)?r:k(u.value))||"";if(l){d.value=l,A.currentPageId=l;const f=i.pages[l];f?(s.schemas=[c.deepClone(f)],s.script=i.scripts&&Object.prototype.hasOwnProperty.call(i.scripts,l)?i.scripts[l]:Q.INITIAL_PAGE_SCRIPT,S.value=l,w.value=l,await o.nextTick(),g.setSelectedNode(s.schemas[0])):await y(l,!0)}await K(u.value,c.deepClone(i.pages),c.deepClone(i.scripts??{}));return}const t=await p().loadTree();if(!t||!t.length){const r=c.deepClone(s.schemas[0]),i=r.id||b("page"),l=((n=r.props)==null?void 0:n.name)||r.label||"首页";u.value=[{id:i,name:l,type:"page"}],await p().savePage(i,r),await m(),await y(i,!0);return}if(u.value=t,d.value&&s.schemas[0]&&await T(),F(d.value,u.value)&&s.schemas[0]){S.value=d.value,w.value=d.value;return}const a=k(u.value);if(!a){_.ElMessage.warning("页面树中没有页面节点，请先新增页面");return}await y(a,!0)}function ne(e){w.value=e.id,e.type==="page"&&y(e.id)}function re(e){var a,n;if(!e)return u.value;const t=(a=O(e))==null?void 0:a.node;if(!t)return u.value;if(t.type==="page"){const r=(n=O(e))==null?void 0:n.parent;return(r==null?void 0:r.children)??u.value}return t.children??(t.children=[]),t.children}function ie(e){M.value=e,I.value="",C.value=!0}async function se(){const e=I.value.trim();if(!e){_.ElMessage.warning("请输入名称");return}const t=w.value||null,a=re(t);if(M.value==="folder"){a.push({id:b("folder"),name:e,type:"folder",children:[]}),await m(),C.value=!1,v.push("新增目录",!0);return}const n=b("page");a.push({id:n,name:e,type:"page"});const r=J(e);await p().savePage(n,r),await m(),C.value=!1,await y(n),v.push("新增页面",!0)}function ue(e){h.value=e,I.value=e.name,E.value=!0}async function le(){if(!h.value)return;const e=I.value.trim();if(!e){_.ElMessage.warning("请输入名称");return}if(h.value.name=e,h.value.type==="page")if(d.value===h.value.id&&s.schemas[0])G(s.schemas[0],e),await T();else{const t=await p().loadPage(h.value.id);t&&(G(t,e),await p().savePage(h.value.id,t))}await m(),E.value=!1,v.push("修改节点名称",!0)}async function oe(e){var l;const t=O(e.id);if(!t)return;const a=R(t.node),n=R({id:"root",type:"folder",children:u.value});if(a.length&&a.length===n.length){_.ElMessage.warning("至少保留一个页面");return}const r=((l=t.parent)==null?void 0:l.children)??u.value,i=r.findIndex(f=>f.id===e.id);i>=0&&r.splice(i,1);for(const f of a)await p().deletePage(f);if(await m(),a.includes(d.value)){const f=k(u.value);f&&await y(f,!0)}v.push("删除节点",!0)}function ce(e,t,a){var i,l,f,Y;const n=e.data.type,r=t.data.type;if(n==="folder"){if(a==="inner")return r==="folder";if(r!=="folder")return!1;const fe=((l=(i=e.parent)==null?void 0:i.data)==null?void 0:l.id)??"__root__",ge=((Y=(f=t.parent)==null?void 0:f.data)==null?void 0:Y.id)??"__root__";return fe===ge}return a==="inner"?r==="folder":!0}async function de(){await W(),await m(),v.push("树结构拖动",!0)}return o.watch(()=>s.schemas,()=>{U()},{deep:!0}),o.watch(()=>s.script,()=>{U()}),o.watch(d,e=>{A.currentPageId=e}),ae(),{activePageId:S,addType:M,allowDrop:ce,currentPageId:d,editTarget:h,handleAdd:se,handleDelete:oe,handleEdit:le,handleNodeClick:ne,handleNodeDrop:de,inputName:I,openAddDialog:ie,openEditDialog:ue,selectedNodeId:w,showAddDialog:C,showEditDialog:E,treeData:u,treeProps:ee,treeRef:Z}}function we(){const g=X.useDesignerContext(),s=V.get(g);if(s)return s;const v=he();return V.set(g,v),v}exports.usePageManagerSingleton=we;

package/dist/ui-kit/panel-ui/src/activitybars/pageManager/usePageManagerSingleton.js

@@ -1,37 +1,37 @@
-import { ref as d, watch as B, nextTick as H } from "vue";
+import { ref as d, watch as B, nextTick as z } from "vue";
 import { ElMessage as A } from "element-plus";
 /* empty css                                 */
 /* empty css                                             */
 /* empty css                                                  */
-import { pluginManager as pe } from "../../../../../manager/src/pluginManager.js";
+import { pluginManager as ge } from "../../../../../manager/src/pluginManager.js";
 /* empty css                                           */
 import "vue-draggable-plus";
-import { deepClone as c, generateNewSchema as ge } from "../../../../../utils/src/common/data.js";
+import { deepClone as l, generateNewSchema as ve } from "../../../../../utils/src/common/data.js";
 import "jsep";
 import "@vueuse/core";
 import "../../../../../hooks/src/store/index.js";
-import { useDesignerContext as ve } from "../../../../../hooks/src/designer/useDesignerContext.js";
-import { INITIAL_PAGE_SCRIPT as V } from "../../../../../hooks/src/plugin/usePageSchema.js";
+import { useDesignerContext as X } from "../../../../../hooks/src/designer/useDesignerContext.js";
+import { INITIAL_PAGE_SCRIPT as H } from "../../../../../hooks/src/plugin/usePageSchema.js";
 import { awaitPageDraftBootstrap as me, takeRestoredDraftPayload as he } from "./pageDraftBootstrap.js";
 import { getPageStorageAdapter as we, getPageDraftStorageKey as Pe } from "./storage.js";
 const K = "__DIYGW_PAGE_MANAGER_RUNTIME__";
 function ye() {
-  const g = window;
-  return g[K] || (g[K] = {
+  const p = window;
+  return p[K] || (p[K] = {
     currentPageId: ""
-  }), g[K];
+  }), p[K];
 }
-let L = null;
+const V = /* @__PURE__ */ new WeakMap();
 function Se() {
-  const g = ve(), o = g.pageSchema, y = g.revoke, p = we(), N = ye(), s = d([]), S = d(""), u = d(N.currentPageId || ""), m = d(""), X = d(), E = d(!1);
-  let h = null, D = Promise.resolve();
-  const $ = Pe(), _ = d(!1), b = d(!1), x = d("page"), v = d(null), I = d(""), Z = {
+  const p = X(), s = p.pageSchema, v = p.revoke, g = () => we(), N = ye(), o = d([]), S = d(""), u = d(N.currentPageId || ""), h = d(""), Z = d(), E = d(!1);
+  let w = null, D = Promise.resolve();
+  const L = () => Pe(), _ = d(!1), b = d(!1), x = d("page"), m = d(null), I = d(""), ee = {
     children: "children",
     label: "name"
-  }, F = d(null);
+  }, $ = d(null);
   function M() {
     try {
-      const e = localStorage.getItem($);
+      const e = localStorage.getItem(L());
       if (!e) return null;
       const t = JSON.parse(e);
       return !t || !Array.isArray(t.tree) ? null : {
@@ -45,32 +45,32 @@ function Se() {
       return null;
     }
   }
-  function J(e) {
-    localStorage.setItem($, JSON.stringify(c(e)));
+  function F(e) {
+    localStorage.setItem(L(), JSON.stringify(l(e)));
   }
-  function U(e, t, a) {
+  function J(e, t, a) {
     const r = M();
-    J({
+    F({
       currentPageId: u.value,
       pages: t ?? (r == null ? void 0 : r.pages) ?? {},
       scripts: a ?? (r == null ? void 0 : r.scripts) ?? {},
-      tree: c(e),
+      tree: l(e),
       updatedAt: Date.now()
     });
   }
-  function ee(e, t) {
+  function te(e, t) {
     const a = M(), r = {
       ...(a == null ? void 0 : a.pages) ?? {},
-      [e]: c(t)
+      [e]: l(t)
     }, n = {
       ...(a == null ? void 0 : a.scripts) ?? {},
-      [e]: o.script ?? ""
+      [e]: s.script ?? ""
     };
-    J({
+    F({
       currentPageId: u.value || e,
       pages: r,
       scripts: n,
-      tree: c((a == null ? void 0 : a.tree) ?? s.value),
+      tree: l((a == null ? void 0 : a.tree) ?? o.value),
       updatedAt: Date.now()
     });
   }
@@ -83,18 +83,18 @@ function Se() {
       t(r, a, n), (i = r.children) != null && i.length && R(r.children, t, r);
     });
   }
-  function C(e) {
+  function k(e) {
     let t = null;
-    return R(s.value, (a, r) => {
+    return R(o.value, (a, r) => {
       !t && a.id === e && (t = { node: a, parent: r });
     }), t;
   }
-  function k(e) {
+  function C(e) {
     var a;
     if (e.type === "page") return [e.id];
     const t = [];
     return (a = e.children) == null || a.forEach((r) => {
-      t.push(...k(r));
+      t.push(...C(r));
     }), t;
   }
   function G(e) {
@@ -112,18 +112,18 @@ function Se() {
     };
     return a(e), t;
   }
-  function Y(e, t) {
+  function U(e, t) {
     if (!e) return !1;
     let a = !1;
     return R(t, (r) => {
       r.type === "page" && r.id === e && (a = !0);
     }), a;
   }
-  function Q(e) {
+  function W(e) {
     var n;
-    const t = F.value ?? c(
-      (n = pe.component.getConfigByType("page")) == null ? void 0 : n.defaultSchema
-    ), a = ge(c(t), []), r = e.trim() || a.label || "新页面";
+    const t = $.value ?? l(
+      (n = ge.component.getConfigByType("page")) == null ? void 0 : n.defaultSchema
+    ), a = ve(l(t), []), r = e.trim() || a.label || "新页面";
     return j(a, r), a;
   }
   function j(e, t) {
@@ -136,114 +136,114 @@ function Se() {
     const a = (r = e.children) == null ? void 0 : r[0];
     a != null && a.props && Object.prototype.hasOwnProperty.call(a.props, "text") && (a.props.text = t);
   }
-  async function w() {
-    await p.saveTree(c(s.value)), await U(s.value);
+  async function P() {
+    await g().saveTree(l(o.value)), await J(o.value);
   }
   async function T() {
-    if (E.value || !u.value || !o.schemas[0])
+    if (E.value || !u.value || !s.schemas[0])
       return;
-    const e = u.value, t = c(o.schemas[0]);
+    const e = u.value, t = l(s.schemas[0]);
     D = D.then(async () => {
-      await p.savePage(e, t), await ee(e, t);
+      await g().savePage(e, t), await te(e, t);
     }), await D;
   }
-  function W() {
-    h && clearTimeout(h), h = setTimeout(() => {
-      h = null, T();
+  function Y() {
+    w && clearTimeout(w), w = setTimeout(() => {
+      w = null, T();
     }, 180);
   }
-  async function q() {
-    h ? (clearTimeout(h), h = null, await T()) : await D;
+  async function Q() {
+    w ? (clearTimeout(w), w = null, await T()) : await D;
   }
-  async function P(e, t = !1) {
-    if (u.value === e && o.schemas[0]) {
-      S.value = e, m.value = e;
+  async function y(e, t = !1) {
+    if (u.value === e && s.schemas[0]) {
+      S.value = e, h.value = e;
       return;
     }
-    t || (await q(), await T()), E.value = !0;
+    t || (await Q(), await T()), E.value = !0;
     try {
-      let a = await p.loadPage(e);
-      a || (a = Q("新页面"), await p.savePage(e, a)), u.value = e, o.schemas = [c(a)];
+      let a = await g().loadPage(e);
+      a || (a = W("新页面"), await g().savePage(e, a)), u.value = e, s.schemas = [l(a)];
       const r = M();
-      o.script = r != null && r.scripts && Object.prototype.hasOwnProperty.call(r.scripts, e) ? r.scripts[e] : V, S.value = e, m.value = e, await H(), g.setSelectedNode(o.schemas[0]);
+      s.script = r != null && r.scripts && Object.prototype.hasOwnProperty.call(r.scripts, e) ? r.scripts[e] : H, S.value = e, h.value = e, await z(), p.setSelectedNode(s.schemas[0]);
     } finally {
       E.value = !1;
     }
   }
-  async function te() {
+  async function ae() {
     var r;
-    await me(), F.value = c(o.schemas[0]);
+    await me(), $.value = l(s.schemas[0]);
     const e = he();
     if (e) {
       const { currentPageId: n, draft: i } = e;
-      s.value = c(i.tree);
-      const l = (n && Y(n, s.value) ? n : G(s.value)) || "";
-      if (l) {
-        u.value = l, N.currentPageId = l;
-        const f = i.pages[l];
-        f ? (o.schemas = [c(f)], o.script = i.scripts && Object.prototype.hasOwnProperty.call(i.scripts, l) ? i.scripts[l] : V, S.value = l, m.value = l, await H(), g.setSelectedNode(o.schemas[0])) : await P(l, !0);
+      o.value = l(i.tree);
+      const c = (n && U(n, o.value) ? n : G(o.value)) || "";
+      if (c) {
+        u.value = c, N.currentPageId = c;
+        const f = i.pages[c];
+        f ? (s.schemas = [l(f)], s.script = i.scripts && Object.prototype.hasOwnProperty.call(i.scripts, c) ? i.scripts[c] : H, S.value = c, h.value = c, await z(), p.setSelectedNode(s.schemas[0])) : await y(c, !0);
       }
-      await U(
-        s.value,
-        c(i.pages),
-        c(i.scripts ?? {})
+      await J(
+        o.value,
+        l(i.pages),
+        l(i.scripts ?? {})
       );
       return;
     }
-    const t = await p.loadTree();
+    const t = await g().loadTree();
     if (!t || !t.length) {
-      const n = c(o.schemas[0]), i = n.id || O("page"), l = ((r = n.props) == null ? void 0 : r.name) || n.label || "首页";
-      s.value = [
+      const n = l(s.schemas[0]), i = n.id || O("page"), c = ((r = n.props) == null ? void 0 : r.name) || n.label || "首页";
+      o.value = [
         {
           id: i,
-          name: l,
+          name: c,
           type: "page"
         }
-      ], await p.savePage(i, n), await w(), await P(i, !0);
+      ], await g().savePage(i, n), await P(), await y(i, !0);
       return;
     }
-    if (s.value = t, u.value && o.schemas[0] && await T(), Y(u.value, s.value) && o.schemas[0]) {
-      S.value = u.value, m.value = u.value;
+    if (o.value = t, u.value && s.schemas[0] && await T(), U(u.value, o.value) && s.schemas[0]) {
+      S.value = u.value, h.value = u.value;
       return;
     }
-    const a = G(s.value);
+    const a = G(o.value);
     if (!a) {
       A.warning("页面树中没有页面节点，请先新增页面");
       return;
     }
-    await P(a, !0);
-  }
-  function ae(e) {
-    m.value = e.id, e.type === "page" && P(e.id);
+    await y(a, !0);
   }
   function re(e) {
+    h.value = e.id, e.type === "page" && y(e.id);
+  }
+  function ne(e) {
     var a, r;
-    if (!e) return s.value;
-    const t = (a = C(e)) == null ? void 0 : a.node;
-    if (!t) return s.value;
+    if (!e) return o.value;
+    const t = (a = k(e)) == null ? void 0 : a.node;
+    if (!t) return o.value;
     if (t.type === "page") {
-      const n = (r = C(e)) == null ? void 0 : r.parent;
-      return (n == null ? void 0 : n.children) ?? s.value;
+      const n = (r = k(e)) == null ? void 0 : r.parent;
+      return (n == null ? void 0 : n.children) ?? o.value;
     }
     return t.children ?? (t.children = []), t.children;
   }
-  function ne(e) {
+  function ie(e) {
     x.value = e, I.value = "", _.value = !0;
   }
-  async function ie() {
+  async function se() {
     const e = I.value.trim();
     if (!e) {
       A.warning("请输入名称");
       return;
     }
-    const t = m.value || null, a = re(t);
+    const t = h.value || null, a = ne(t);
     if (x.value === "folder") {
       a.push({
         id: O("folder"),
         name: e,
         type: "folder",
         children: []
-      }), await w(), _.value = !1, y.push("新增目录", !0);
+      }), await P(), _.value = !1, v.push("新增目录", !0);
       return;
     }
     const r = O("page");
@@ -252,104 +252,108 @@ function Se() {
       name: e,
       type: "page"
     });
-    const n = Q(e);
-    await p.savePage(r, n), await w(), _.value = !1, await P(r), y.push("新增页面", !0);
+    const n = W(e);
+    await g().savePage(r, n), await P(), _.value = !1, await y(r), v.push("新增页面", !0);
   }
-  function se(e) {
-    v.value = e, I.value = e.name, b.value = !0;
+  function oe(e) {
+    m.value = e, I.value = e.name, b.value = !0;
   }
-  async function oe() {
-    if (!v.value) return;
+  async function ce() {
+    if (!m.value) return;
     const e = I.value.trim();
     if (!e) {
       A.warning("请输入名称");
       return;
     }
-    if (v.value.name = e, v.value.type === "page")
-      if (u.value === v.value.id && o.schemas[0])
-        j(o.schemas[0], e), await T();
+    if (m.value.name = e, m.value.type === "page")
+      if (u.value === m.value.id && s.schemas[0])
+        j(s.schemas[0], e), await T();
       else {
-        const t = await p.loadPage(v.value.id);
-        t && (j(t, e), await p.savePage(v.value.id, t));
+        const t = await g().loadPage(m.value.id);
+        t && (j(t, e), await g().savePage(m.value.id, t));
       }
-    await w(), b.value = !1, y.push("修改节点名称", !0);
+    await P(), b.value = !1, v.push("修改节点名称", !0);
   }
-  async function le(e) {
-    var l;
-    const t = C(e.id);
+  async function ue(e) {
+    var c;
+    const t = k(e.id);
     if (!t) return;
-    const a = k(t.node), r = k({
+    const a = C(t.node), r = C({
       id: "root",
       type: "folder",
-      children: s.value
+      children: o.value
     });
     if (a.length && a.length === r.length) {
       A.warning("至少保留一个页面");
       return;
     }
-    const n = ((l = t.parent) == null ? void 0 : l.children) ?? s.value, i = n.findIndex((f) => f.id === e.id);
+    const n = ((c = t.parent) == null ? void 0 : c.children) ?? o.value, i = n.findIndex((f) => f.id === e.id);
     i >= 0 && n.splice(i, 1);
     for (const f of a)
-      await p.deletePage(f);
-    if (await w(), a.includes(u.value)) {
-      const f = G(s.value);
-      f && await P(f, !0);
+      await g().deletePage(f);
+    if (await P(), a.includes(u.value)) {
+      const f = G(o.value);
+      f && await y(f, !0);
     }
-    y.push("删除节点", !0);
+    v.push("删除节点", !0);
   }
-  function ue(e, t, a) {
-    var i, l, f, z;
+  function le(e, t, a) {
+    var i, c, f, q;
     const r = e.data.type, n = t.data.type;
     if (r === "folder") {
       if (a === "inner")
         return n === "folder";
       if (n !== "folder")
         return !1;
-      const fe = ((l = (i = e.parent) == null ? void 0 : i.data) == null ? void 0 : l.id) ?? "__root__", de = ((z = (f = t.parent) == null ? void 0 : f.data) == null ? void 0 : z.id) ?? "__root__";
-      return fe === de;
+      const de = ((c = (i = e.parent) == null ? void 0 : i.data) == null ? void 0 : c.id) ?? "__root__", pe = ((q = (f = t.parent) == null ? void 0 : f.data) == null ? void 0 : q.id) ?? "__root__";
+      return de === pe;
     }
     return a === "inner" ? n === "folder" : !0;
   }
-  async function ce() {
-    await q(), await w(), y.push("树结构拖动", !0);
+  async function fe() {
+    await Q(), await P(), v.push("树结构拖动", !0);
   }
   return B(
-    () => o.schemas,
+    () => s.schemas,
     () => {
-      W();
+      Y();
     },
     { deep: !0 }
   ), B(
-    () => o.script,
+    () => s.script,
     () => {
-      W();
+      Y();
     }
   ), B(u, (e) => {
     N.currentPageId = e;
-  }), te(), {
+  }), ae(), {
     activePageId: S,
     addType: x,
-    allowDrop: ue,
+    allowDrop: le,
     currentPageId: u,
-    editTarget: v,
-    handleAdd: ie,
-    handleDelete: le,
-    handleEdit: oe,
-    handleNodeClick: ae,
-    handleNodeDrop: ce,
+    editTarget: m,
+    handleAdd: se,
+    handleDelete: ue,
+    handleEdit: ce,
+    handleNodeClick: re,
+    handleNodeDrop: fe,
     inputName: I,
-    openAddDialog: ne,
-    openEditDialog: se,
-    selectedNodeId: m,
+    openAddDialog: ie,
+    openEditDialog: oe,
+    selectedNodeId: h,
     showAddDialog: _,
     showEditDialog: b,
-    treeData: s,
-    treeProps: Z,
-    treeRef: X
+    treeData: o,
+    treeProps: ee,
+    treeRef: Z
   };
 }
 function Be() {
-  return L || (L = Se()), L;
+  const p = X(), s = V.get(p);
+  if (s)
+    return s;
+  const v = Se();
+  return V.set(p, v), v;
 }
 export {
   Be as usePageManagerSingleton

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diygw-designer",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "description": "基于vue3的设计器,可视化开发页面表单",
   "private": false,
   "keywords": [