diygw-designer 1.2.0 → 1.3.2

package/dist/core/src/components/builder/hooks/useBuilder.d.ts

@@ -42,6 +42,9 @@ export declare function useBuilder(): {
                 description?: string | undefined;
                 editData?: object | undefined;
                 field?: string | undefined;
+                displayBindField?: string | undefined;
+                displayExpr?: string | undefined;
+                dynamicStyleExpr?: string | undefined;
                 id?: string | undefined;
                 input?: boolean | undefined;
                 isHideToolbar?: boolean | undefined;
@@ -76,6 +79,10 @@ export declare function useBuilder(): {
             }[];
             script?: string | undefined;
         };
+        publishMqttDataSource: (mqttSourceId: string, publishItemId: string) => void;
+        refreshHttpDataSource: (httpSourceId: string) => void;
+        registerHttpDataSourceRefreshHandler: (fn: ((httpSourceId: string) => void) | undefined) => void;
+        registerMqttDataSourcePublishHandler: (fn: ((mqttSourceId: string, publishItemId: string) => void) | undefined) => void;
         removeComponentInstance: (id: string, scopeName?: string) => void;
         setDefaultComponentIds: (schemas: import('../../../../../types/src/index').ComponentSchema[]) => void;
         setDesignMode: (isDesign?: boolean) => void;

package/dist/core/src/components/builder/hooks/usePageDataSources.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("mqtt"),_=require("vue");;/* empty css                                             */;/* empty css                                                         */;/* empty css                                                              */require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");require("../../../../../manager/src/pluginManager.cjs");;/* empty css                                                       */require("vue-draggable-plus");const P=require("../../../../../utils/src/common/data.cjs");require("jsep");const H=require("../../../../../utils/src/mqtt/mqttJs.cjs"),k=H.resolveMqttConnect(R),C=new Map;function J(e){try{return JSON.parse(e)}catch{return e}}function V(e,o){const a=e.split("/"),y=o.split("/");for(let l=0;l<a.length;l++){const q=a[l];if(q==="#")return l===a.length-1;if(y[l]===void 0)return!1;if(q!=="+"&&q!==y[l])return!1}return a.length===y.length}function j(e){var a;if((a=e.subscriptions)!=null&&a.length)return e.subscriptions;const o=e.subscribeTopics??[];return o.length?o.filter(Boolean).map((y,l)=>({id:`${e.id}_sub_${l}`,name:y,qos:e.qos??0,responseVariableKey:`mqtt_${e.id}_${l}`.replace(/[^a-zA-Z0-9_]/g,"_"),topic:y})):[]}function U(e){var l;if((l=e.publishes)!=null&&l.length)return e.publishes;const o=e.publish,a=((o==null?void 0:o.topic)??e.publishTopic??"").trim();return a?(o==null?void 0:o.enabled)===!1?[]:(o&&typeof o.onConnect=="boolean"?o.onConnect:!!e.publishOnMount)?[{id:`${e.id}_pub_legacy`,name:"默认发布",payloadTemplate:(o==null?void 0:o.payloadJson)??e.publishPayloadJson??"{}",qos:e.qos??0,sendOnConnect:!0,topic:a,triggerHint:"onConnect"}]:[]:[]}function x(e){const o=[];function a(){for(e.registerMqttDataSourcePublishHandler(void 0),e.registerHttpDataSourceRefreshHandler(void 0);o.length;){const t=o.pop();try{t==null||t()}catch{}}}function y(t,i){const n=P.applyDataSourceMappingsExtended(t,i,{customFuncs:e.funcs.value,formModel:q()});Object.keys(n).length>0&&e.setFormData(n,"default")}function l(t,i){var d;const n=(d=t.responseVariableKey)==null?void 0:d.trim();if(n){e.setFormData({[n]:i},"default");return}y(i,t.mappings)}function q(){return e.forms.default??{}}async function Q(t){const i={...t.headers??{}};try{if(t.useMock){const r=J(t.mockBody??"{}");l(t,r);return}const n=q(),d=P.buildPageHttpUrlWithQuery(t,n,{customFuncs:e.funcs.value}),v=(t.body??"").trim(),s=t.method&&t.method!=="GET"&&v!==""?t.body:void 0;!i["content-type"]&&!i["Content-Type"]&&s&&(i["content-type"]="application/json");const f=await fetch(d,{body:s,headers:i,method:t.method??"GET"}),p=await f.text(),c=J(p);f.ok&&(t.designCachedResponseText=P.formatJsonTextPreserveUnicode(p)),l(t,c)}catch(n){console.error("[diygw dataSource] HTTP 请求失败",t.id,n)}}function $(t){let i=null,n=!1;async function d(){n||await Q(t)}return d(),t.pollIntervalMs&&t.pollIntervalMs>0&&(i=setInterval(()=>void d(),t.pollIntervalMs)),()=>{n=!0,i&&(clearInterval(i),i=null)}}function I(t){var f,p;const i=((f=t.brokerUrl)==null?void 0:f.trim())||"";if(!i)return console.warn("[diygw dataSource] MQTT 数据源未配置 brokerUrl",t.id),()=>{};const n=j(t).filter(c=>{var r;return(r=c.topic)==null?void 0:r.trim()}),d=U(t),v=d.some(c=>{var r;return c.sendOnConnect&&((r=c.topic)==null?void 0:r.trim())}),s=d.some(c=>{var r;return(r=c.topic)==null?void 0:r.trim()});if(n.length===0&&!v&&!s)return()=>{};try{if(!k)return console.warn("[diygw dataSource] MQTT 运行时未启用（未安装 mqtt 依赖），已跳过连接",t.id),()=>{};const c=t.defaultSubscribeQos??t.qos??0,r=t.defaultPublishQos??t.qos??0,u=k(i,H.buildMqttJsConnectOptions({clean:t.clean,clientId:((p=t.clientId)==null?void 0:p.trim())||`diygw_${Math.random().toString(36).slice(2,12)}`,password:t.password,protocolVersion:t.protocolVersion??4,username:t.username}));return C.set(t.id,u),u.on("message",(S,w)=>{var M;if(typeof S!="string")return;const m=S.trim(),h=H.mqttPayloadToUtf8(w);let T;try{T=JSON.parse(h)}catch{T=h}const b={};for(const O of n){const D=O.topic.trim();if(!D||!V(D,m))continue;const F=(M=O.responseVariableKey)==null?void 0:M.trim();F&&(b[F]=T)}Object.keys(b).length>0&&e.setFormData(b,"default")}),u.on("connect",()=>{var w;for(const m of n){const h=m.topic.trim();if(!h)continue;const T=m.qos??c;u.subscribe(h,{qos:T},b=>{b&&console.error("[diygw dataSource] MQTT 订阅失败",t.id,h,b)})}const S=q();for(const m of d){if(!m.sendOnConnect||!((w=m.topic)!=null&&w.trim()))continue;const h=P.buildPageMqttPublishPayload(m,S,{customFuncs:e.funcs.value});u.publish(m.topic.trim(),h,{qos:m.qos??r})}}),u.on("error",S=>{console.error("[diygw dataSource] MQTT 错误",t.id,S)}),()=>{try{C.delete(t.id),u.end(!0)}catch{}}}catch(c){return console.error("[diygw dataSource] MQTT 连接初始化失败",t.id,c),()=>{}}}_.watch(()=>({design:e.isDesignMode.value,root:e.pageSchema.schemas[0]}),({design:t,root:i})=>{if(a(),t||!i)return;const n=i.dataSources;if(!(n!=null&&n.length))return;const d=n.filter(s=>s.type==="http"&&s.config.enabled!==!1),v=n.filter(s=>s.type==="mqtt"&&s.config.enabled!==!1);for(const{config:s}of d)o.push($(s));for(const{config:s}of v)o.push(I(s));e.registerMqttDataSourcePublishHandler((s,f)=>{var h,T;const p=C.get(s);if(!p){console.warn("[diygw dataSource] MQTT 未连接或已销毁",s);return}const c=e.pageSchema.schemas[0],r=(h=c==null?void 0:c.dataSources)==null?void 0:h.find(b=>b.type==="mqtt"&&b.config.id===s);if(!r||r.type!=="mqtt")return;const u=U(r.config).find(b=>b.id===f);if(!((T=u==null?void 0:u.topic)!=null&&T.trim()))return;const S=r.config.defaultPublishQos??r.config.qos??0,w=q(),m=P.buildPageMqttPublishPayload(u,w,{customFuncs:e.funcs.value});p.publish(u.topic.trim(),m,{qos:u.qos??S})}),e.registerHttpDataSourceRefreshHandler(s=>{var c;const f=e.pageSchema.schemas[0],p=(c=f==null?void 0:f.dataSources)==null?void 0:c.find(r=>{var u;return r.type==="http"&&((u=r.config)==null?void 0:u.id)===s});if(!p||p.type!=="http"){console.warn("[diygw dataSource] HTTP 源未找到",s);return}p.config.enabled!==!1&&Q(p.config)})},{deep:!0,flush:"post",immediate:!0}),_.onUnmounted(a)}exports.usePageDataSources=x;

package/dist/core/src/components/builder/hooks/usePageDataSources.d.ts

@@ -0,0 +1,2 @@
+import { PageManager } from '../../../../../manager/src/index';
+export declare function usePageDataSources(pageManager: PageManager): void;

package/dist/core/src/components/builder/hooks/usePageDataSources.js

@@ -0,0 +1,274 @@
+import $ from "mqtt";
+import { watch as x, onUnmounted as I } from "vue";
+/* empty css                                           */
+/* empty css                                                       */
+/* empty css                                                            */
+import "@vueuse/core";
+import "../../../../../hooks/src/store/index.js";
+import "../../../../../manager/src/pluginManager.js";
+/* empty css                                                     */
+import "vue-draggable-plus";
+import { buildPageMqttPublishPayload as D, buildPageHttpUrlWithQuery as R, formatJsonTextPreserveUnicode as V, applyDataSourceMappingsExtended as B } from "../../../../../utils/src/common/data.js";
+import "jsep";
+import { resolveMqttConnect as E, buildMqttJsConnectOptions as K, mqttPayloadToUtf8 as j } from "../../../../../utils/src/mqtt/mqttJs.js";
+const M = E($), P = /* @__PURE__ */ new Map();
+function _(o) {
+  try {
+    return JSON.parse(o);
+  } catch {
+    return o;
+  }
+}
+function z(o, e) {
+  const a = o.split("/"), y = e.split("/");
+  for (let u = 0; u < a.length; u++) {
+    const q = a[u];
+    if (q === "#")
+      return u === a.length - 1;
+    if (y[u] === void 0) return !1;
+    if (q !== "+" && q !== y[u])
+      return !1;
+  }
+  return a.length === y.length;
+}
+function G(o) {
+  var a;
+  if ((a = o.subscriptions) != null && a.length) return o.subscriptions;
+  const e = o.subscribeTopics ?? [];
+  return e.length ? e.filter(Boolean).map((y, u) => ({
+    id: `${o.id}_sub_${u}`,
+    name: y,
+    qos: o.qos ?? 0,
+    responseVariableKey: `mqtt_${o.id}_${u}`.replace(/[^a-zA-Z0-9_]/g, "_"),
+    topic: y
+  })) : [];
+}
+function k(o) {
+  var u;
+  if ((u = o.publishes) != null && u.length) return o.publishes;
+  const e = o.publish, a = ((e == null ? void 0 : e.topic) ?? o.publishTopic ?? "").trim();
+  return a ? (e == null ? void 0 : e.enabled) === !1 ? [] : (e && typeof e.onConnect == "boolean" ? e.onConnect : !!o.publishOnMount) ? [
+    {
+      id: `${o.id}_pub_legacy`,
+      name: "默认发布",
+      payloadTemplate: (e == null ? void 0 : e.payloadJson) ?? o.publishPayloadJson ?? "{}",
+      qos: o.qos ?? 0,
+      sendOnConnect: !0,
+      topic: a,
+      triggerHint: "onConnect"
+    }
+  ] : [] : [];
+}
+function rt(o) {
+  const e = [];
+  function a() {
+    for (o.registerMqttDataSourcePublishHandler(void 0), o.registerHttpDataSourceRefreshHandler(void 0); e.length; ) {
+      const t = e.pop();
+      try {
+        t == null || t();
+      } catch {
+      }
+    }
+  }
+  function y(t, i) {
+    const n = B(t, i, {
+      customFuncs: o.funcs.value,
+      formModel: q()
+    });
+    Object.keys(n).length > 0 && o.setFormData(n, "default");
+  }
+  function u(t, i) {
+    var d;
+    const n = (d = t.responseVariableKey) == null ? void 0 : d.trim();
+    if (n) {
+      o.setFormData({ [n]: i }, "default");
+      return;
+    }
+    y(i, t.mappings);
+  }
+  function q() {
+    return o.forms.default ?? {};
+  }
+  async function C(t) {
+    const i = {
+      ...t.headers ?? {}
+    };
+    try {
+      if (t.useMock) {
+        const r = _(t.mockBody ?? "{}");
+        u(t, r);
+        return;
+      }
+      const n = q(), d = R(t, n, {
+        customFuncs: o.funcs.value
+      }), v = (t.body ?? "").trim(), s = t.method && t.method !== "GET" && v !== "" ? t.body : void 0;
+      !i["content-type"] && !i["Content-Type"] && s && (i["content-type"] = "application/json");
+      const f = await fetch(d, {
+        body: s,
+        headers: i,
+        method: t.method ?? "GET"
+      }), m = await f.text(), c = _(m);
+      f.ok && (t.designCachedResponseText = V(m)), u(t, c);
+    } catch (n) {
+      console.error("[diygw dataSource] HTTP 请求失败", t.id, n);
+    }
+  }
+  function J(t) {
+    let i = null, n = !1;
+    async function d() {
+      n || await C(t);
+    }
+    return d(), t.pollIntervalMs && t.pollIntervalMs > 0 && (i = setInterval(() => void d(), t.pollIntervalMs)), () => {
+      n = !0, i && (clearInterval(i), i = null);
+    };
+  }
+  function U(t) {
+    var f, m;
+    const i = ((f = t.brokerUrl) == null ? void 0 : f.trim()) || "";
+    if (!i)
+      return console.warn("[diygw dataSource] MQTT 数据源未配置 brokerUrl", t.id), () => {
+      };
+    const n = G(t).filter((c) => {
+      var r;
+      return (r = c.topic) == null ? void 0 : r.trim();
+    }), d = k(t), v = d.some((c) => {
+      var r;
+      return c.sendOnConnect && ((r = c.topic) == null ? void 0 : r.trim());
+    }), s = d.some((c) => {
+      var r;
+      return (r = c.topic) == null ? void 0 : r.trim();
+    });
+    if (n.length === 0 && !v && !s)
+      return () => {
+      };
+    try {
+      if (!M)
+        return console.warn(
+          "[diygw dataSource] MQTT 运行时未启用（未安装 mqtt 依赖），已跳过连接",
+          t.id
+        ), () => {
+        };
+      const c = t.defaultSubscribeQos ?? t.qos ?? 0, r = t.defaultPublishQos ?? t.qos ?? 0, l = M(
+        i,
+        K({
+          clean: t.clean,
+          clientId: ((m = t.clientId) == null ? void 0 : m.trim()) || `diygw_${Math.random().toString(36).slice(2, 12)}`,
+          password: t.password,
+          protocolVersion: t.protocolVersion ?? 4,
+          username: t.username
+        })
+      );
+      return P.set(t.id, l), l.on("message", (S, w) => {
+        var H;
+        if (typeof S != "string") return;
+        const p = S.trim(), h = j(w);
+        let T;
+        try {
+          T = JSON.parse(h);
+        } catch {
+          T = h;
+        }
+        const b = {};
+        for (const Q of n) {
+          const F = Q.topic.trim();
+          if (!F || !z(F, p)) continue;
+          const O = (H = Q.responseVariableKey) == null ? void 0 : H.trim();
+          O && (b[O] = T);
+        }
+        Object.keys(b).length > 0 && o.setFormData(b, "default");
+      }), l.on("connect", () => {
+        var w;
+        for (const p of n) {
+          const h = p.topic.trim();
+          if (!h) continue;
+          const T = p.qos ?? c;
+          l.subscribe(h, { qos: T }, (b) => {
+            b && console.error("[diygw dataSource] MQTT 订阅失败", t.id, h, b);
+          });
+        }
+        const S = q();
+        for (const p of d) {
+          if (!p.sendOnConnect || !((w = p.topic) != null && w.trim())) continue;
+          const h = D(p, S, {
+            customFuncs: o.funcs.value
+          });
+          l.publish(p.topic.trim(), h, { qos: p.qos ?? r });
+        }
+      }), l.on("error", (S) => {
+        console.error("[diygw dataSource] MQTT 错误", t.id, S);
+      }), () => {
+        try {
+          P.delete(t.id), l.end(!0);
+        } catch {
+        }
+      };
+    } catch (c) {
+      return console.error("[diygw dataSource] MQTT 连接初始化失败", t.id, c), () => {
+      };
+    }
+  }
+  x(
+    () => ({
+      design: o.isDesignMode.value,
+      root: o.pageSchema.schemas[0]
+    }),
+    ({ design: t, root: i }) => {
+      if (a(), t || !i) return;
+      const n = i.dataSources;
+      if (!(n != null && n.length)) return;
+      const d = n.filter(
+        (s) => s.type === "http" && s.config.enabled !== !1
+      ), v = n.filter(
+        (s) => s.type === "mqtt" && s.config.enabled !== !1
+      );
+      for (const { config: s } of d)
+        e.push(J(s));
+      for (const { config: s } of v)
+        e.push(U(s));
+      o.registerMqttDataSourcePublishHandler(
+        (s, f) => {
+          var h, T;
+          const m = P.get(s);
+          if (!m) {
+            console.warn(
+              "[diygw dataSource] MQTT 未连接或已销毁",
+              s
+            );
+            return;
+          }
+          const c = o.pageSchema.schemas[0], r = (h = c == null ? void 0 : c.dataSources) == null ? void 0 : h.find(
+            (b) => b.type === "mqtt" && b.config.id === s
+          );
+          if (!r || r.type !== "mqtt") return;
+          const l = k(r.config).find(
+            (b) => b.id === f
+          );
+          if (!((T = l == null ? void 0 : l.topic) != null && T.trim())) return;
+          const S = r.config.defaultPublishQos ?? r.config.qos ?? 0, w = q(), p = D(l, w, {
+            customFuncs: o.funcs.value
+          });
+          m.publish(l.topic.trim(), p, {
+            qos: l.qos ?? S
+          });
+        }
+      ), o.registerHttpDataSourceRefreshHandler((s) => {
+        var c;
+        const f = o.pageSchema.schemas[0], m = (c = f == null ? void 0 : f.dataSources) == null ? void 0 : c.find(
+          (r) => {
+            var l;
+            return r.type === "http" && ((l = r.config) == null ? void 0 : l.id) === s;
+          }
+        );
+        if (!m || m.type !== "http") {
+          console.warn("[diygw dataSource] HTTP 源未找到", s);
+          return;
+        }
+        m.config.enabled !== !1 && C(m.config);
+      });
+    },
+    { deep: !0, flush: "post", immediate: !0 }
+  ), I(a);
+}
+export {
+  rt as usePageDataSources
+};

package/dist/core/src/components/builder/src/builder.vue.cjs

@@ -1 +1 @@
-"use strict";const e=require("vue");;/* empty css                                             */const g=require("../../../../../ui-kit/base-ui/src/asyncLoader/baseLoader.vue.cjs");;/* empty css                                                         */;/* empty css                                                              */const D=require("../../../../../ui-kit/base-ui/src/node/node.vue.cjs");;/* empty css                                                       */const i=require("../../../../../utils/src/common/data.cjs");require("jsep");const N=require("../../../../../hooks/src/common/createEventBus.cjs");require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");const R=require("../../../../../hooks/src/designer/useBuiderDisabled.cjs"),F=require("../../../../../hooks/src/designer/useBuilderContext.cjs"),I=require("../../../../../hooks/src/designer/usePageManager.cjs"),w=require("../../../../../hooks/src/logic/useForm.cjs"),u=require("../../../../../manager/src/pluginManager.cjs");require("vue-draggable-plus");const A=require("../../../../../ui-kit/panel-ui/src/components/index.cjs");;/* empty css                                              */const V=require("../hooks/useBuilder.cjs"),P={key:0,class:"diygw-loading-box"},K={class:"diygw-builder-main ep-scoped"},L={class:"diygw-loading-box"},Y=e.defineComponent({__name:"builder",props:{disabled:{type:Boolean},fieldStates:{},formData:{},pageSchema:{}},emits:["change","ready"],setup(m,{expose:f,emit:_}){const a=m,c=_;A.setupPage(u.pluginManager);const d=u.pluginManager.component.get("epBuilderSlot"),{formInstances:h,getData:v,getFormInstance:y,getForms:q,pageManager:r,ready:s,resetData:B,setData:l,setForms:k,validate:M,validateAll:C}=V.useBuilder(),p=e.ref(0);e.watch(()=>a.pageSchema,t=>{var n;(n=t==null?void 0:t.schemas)!=null&&n.length&&(i.migrateComponentProps(t,!0),i.deepCompareAndModify(r.pageSchema,t),r.mountMonitor.reset(),p.value++,s.value=!1)},{deep:!0,immediate:!0}),e.watch(()=>a.formData,t=>{t&&l(t)},{deep:!0,immediate:!0}),N.createEventBus(),R.provideBuilderDisabled(e.computed(()=>a.disabled)),e.provide(F.BUILDER_KEY,{fieldStateMap:e.computed(()=>{var n;const t={};return(n=a.fieldStates)==null||n.forEach(o=>{t[o.field]=o}),t}),slots:e.useSlots()}),I.providePageManager(r),e.provide(w.FORM_INSTANCES_KEY,h);function E(){const t=e.watch(()=>r.mountMonitor.isAllMounted.value,n=>{n&&(t&&t(),b())})}function b(){s.value=!0,c("ready",r),i.findSchemas(r.pageSchema.schemas,t=>{var n;return(n=t.on)!=null&&n.diygwReady&&r.doActions(t.on.diygwReady),!1})}const S=e.getCurrentInstance();return r.addComponentInstance("builder",S),r.hook.register("formChange",t=>{c("change",t)}),f({getData:v,getFormInstance:y,getForms:q,pageManager:r,ready:s,resetData:B,setData:l,setForms:k,validate:M,validateAll:C}),(t,n)=>!e.unref(u.pluginManager).designer.initialized.value||e.unref(r).pageSchema.schemas.length===0?(e.openBlock(),e.createElementBlock("div",P,[e.createVNode(e.unref(g))])):(e.openBlock(),e.createBlock(e.Suspense,{key:p.value,onResolve:E},{default:e.withCtx(()=>[e.createElementVNode("div",K,[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(r).pageSchema.schemas,(o,x)=>(e.openBlock(),e.createBlock(e.unref(D),{key:x,"component-schema":o},null,8,["component-schema"]))),128)),e.unref(d)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(d)),{key:0})):e.createCommentVNode("",!0)])]),fallback:e.withCtx(()=>[e.createElementVNode("div",L,[e.createVNode(e.unref(g))])]),_:1}))}});module.exports=Y;
+"use strict";const e=require("vue");;/* empty css                                             */const g=require("../../../../../ui-kit/base-ui/src/asyncLoader/baseLoader.vue.cjs");;/* empty css                                                         */;/* empty css                                                              */const x=require("../../../../../ui-kit/base-ui/src/node/node.vue.cjs");;/* empty css                                                       */const s=require("../../../../../utils/src/common/data.cjs");require("jsep");const F=require("../../../../../hooks/src/common/createEventBus.cjs");require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");const I=require("../../../../../hooks/src/designer/resolveFormBindingsInView.cjs"),R=require("../../../../../hooks/src/designer/useBuiderDisabled.cjs"),w=require("../../../../../hooks/src/designer/useBuilderContext.cjs"),N=require("../../../../../hooks/src/designer/usePageManager.cjs"),V=require("../../../../../hooks/src/logic/useForm.cjs"),u=require("../../../../../manager/src/pluginManager.cjs");require("vue-draggable-plus");const P=require("../../../../../ui-kit/panel-ui/src/components/index.cjs");;/* empty css                                              */require("../../../../../ui-kit/panel-ui/src/activitybars/pageManager/storage.cjs");require("../../../../../ui-kit/panel-ui/src/activitybars/pageManager/pageDraftBootstrap.cjs");const A=require("../hooks/useBuilder.cjs"),K=require("../hooks/usePageDataSources.cjs"),L={key:0,class:"diygw-loading-box"},Y={class:"diygw-builder-main ep-scoped"},z={class:"diygw-loading-box"},O=e.defineComponent({__name:"builder",props:{disabled:{type:Boolean},fieldStates:{},formData:{},pageSchema:{}},emits:["change","ready"],setup(m,{expose:f,emit:_}){const a=m,c=_;P.setupPage(u.pluginManager);const d=u.pluginManager.component.get("epBuilderSlot"),{formInstances:v,getData:q,getFormInstance:h,getForms:B,pageManager:t,ready:i,resetData:y,setData:l,setForms:k,validate:M,validateAll:C}=A.useBuilder();K.usePageDataSources(t);const p=e.ref(0);e.watch(()=>a.pageSchema,r=>{var n;(n=r==null?void 0:r.schemas)!=null&&n.length&&(s.migrateComponentProps(r,!0),s.deepCompareAndModify(t.pageSchema,r),t.mountMonitor.reset(),p.value++,i.value=!1)},{deep:!0,immediate:!0}),e.watch(()=>a.formData,r=>{r&&l(r)},{deep:!0,immediate:!0}),F.createEventBus(),I.provideResolveFormBindingsInView(!0),R.provideBuilderDisabled(e.computed(()=>a.disabled)),e.provide(w.BUILDER_KEY,{fieldStateMap:e.computed(()=>{var n;const r={};return(n=a.fieldStates)==null||n.forEach(o=>{r[o.field]=o}),r}),slots:e.useSlots()}),N.providePageManager(t),e.provide(V.FORM_INSTANCES_KEY,v);function E(){const r=e.watch(()=>t.mountMonitor.isAllMounted.value,n=>{n&&(r&&r(),S())})}function S(){i.value=!0,c("ready",t),s.findSchemas(t.pageSchema.schemas,r=>{var n;return(n=r.on)!=null&&n.diygwReady&&t.doActions(r.on.diygwReady),!1})}const b=e.getCurrentInstance();return t.addComponentInstance("builder",b),t.hook.register("formChange",r=>{c("change",r)}),f({getData:q,getFormInstance:h,getForms:B,pageManager:t,ready:i,resetData:y,setData:l,setForms:k,validate:M,validateAll:C}),(r,n)=>!e.unref(u.pluginManager).designer.initialized.value||e.unref(t).pageSchema.schemas.length===0?(e.openBlock(),e.createElementBlock("div",L,[e.createVNode(e.unref(g))])):(e.openBlock(),e.createBlock(e.Suspense,{key:p.value,onResolve:E},{default:e.withCtx(()=>[e.createElementVNode("div",Y,[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(t).pageSchema.schemas,(o,D)=>(e.openBlock(),e.createBlock(e.unref(x),{key:D,"component-schema":o},null,8,["component-schema"]))),128)),e.unref(d)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(d)),{key:0})):e.createCommentVNode("",!0)])]),fallback:e.withCtx(()=>[e.createElementVNode("div",z,[e.createVNode(e.unref(g))])]),_:1}))}});module.exports=O;

package/dist/core/src/components/builder/src/builder.vue.d.ts

@@ -49,6 +49,9 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
                 description?: string | undefined;
                 editData?: object | undefined;
                 field?: string | undefined;
+                displayBindField?: string | undefined;
+                displayExpr?: string | undefined;
+                dynamicStyleExpr?: string | undefined;
                 id?: string | undefined;
                 input?: boolean | undefined;
                 isHideToolbar?: boolean | undefined;
@@ -83,6 +86,10 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             }[];
             script?: string | undefined;
         };
+        publishMqttDataSource: (mqttSourceId: string, publishItemId: string) => void;
+        refreshHttpDataSource: (httpSourceId: string) => void;
+        registerHttpDataSourceRefreshHandler: (fn: ((httpSourceId: string) => void) | undefined) => void;
+        registerMqttDataSourcePublishHandler: (fn: ((mqttSourceId: string, publishItemId: string) => void) | undefined) => void;
         removeComponentInstance: (id: string, scopeName?: string) => void;
         setDefaultComponentIds: (schemas: import('../../../../../types/src/index').ComponentSchema[]) => void;
         setDesignMode: (isDesign?: boolean) => void;
@@ -140,6 +147,9 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
                 description?: string | undefined;
                 editData?: object | undefined;
                 field?: string | undefined;
+                displayBindField?: string | undefined;
+                displayExpr?: string | undefined;
+                dynamicStyleExpr?: string | undefined;
                 id?: string | undefined;
                 input?: boolean | undefined;
                 isHideToolbar?: boolean | undefined;
@@ -174,6 +184,10 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             }[];
             script?: string | undefined;
         };
+        publishMqttDataSource: (mqttSourceId: string, publishItemId: string) => void;
+        refreshHttpDataSource: (httpSourceId: string) => void;
+        registerHttpDataSourceRefreshHandler: (fn: ((httpSourceId: string) => void) | undefined) => void;
+        registerMqttDataSourcePublishHandler: (fn: ((mqttSourceId: string, publishItemId: string) => void) | undefined) => void;
         removeComponentInstance: (id: string, scopeName?: string) => void;
         setDefaultComponentIds: (schemas: import('../../../../../types/src/index').ComponentSchema[]) => void;
         setDesignMode: (isDesign?: boolean) => void;
@@ -225,6 +239,9 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
                 description?: string | undefined;
                 editData?: object | undefined;
                 field?: string | undefined;
+                displayBindField?: string | undefined;
+                displayExpr?: string | undefined;
+                dynamicStyleExpr?: string | undefined;
                 id?: string | undefined;
                 input?: boolean | undefined;
                 isHideToolbar?: boolean | undefined;
@@ -259,6 +276,10 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             }[];
             script?: string | undefined;
         };
+        publishMqttDataSource: (mqttSourceId: string, publishItemId: string) => void;
+        refreshHttpDataSource: (httpSourceId: string) => void;
+        registerHttpDataSourceRefreshHandler: (fn: ((httpSourceId: string) => void) | undefined) => void;
+        registerMqttDataSourcePublishHandler: (fn: ((mqttSourceId: string, publishItemId: string) => void) | undefined) => void;
         removeComponentInstance: (id: string, scopeName?: string) => void;
         setDefaultComponentIds: (schemas: import('../../../../../types/src/index').ComponentSchema[]) => void;
         setDesignMode: (isDesign?: boolean) => void;

package/dist/core/src/components/builder/src/builder.vue.js

@@ -1,6 +1,6 @@
-import { defineComponent as w, ref as L, watch as m, computed as g, provide as h, useSlots as Y, getCurrentInstance as $, createElementBlock as y, createBlock as d, unref as r, openBlock as a, createVNode as _, Suspense as z, withCtx as v, createElementVNode as B, createCommentVNode as O, Fragment as T, renderList as U, resolveDynamicComponent as j } from "vue";
+import { defineComponent as K, ref as L, watch as m, computed as g, provide as h, useSlots as Y, getCurrentInstance as $, createElementBlock as y, createBlock as p, unref as r, openBlock as a, createVNode as _, Suspense as z, withCtx as v, createElementVNode as B, createCommentVNode as O, Fragment as T, renderList as U, resolveDynamicComponent as j } from "vue";
 /* empty css                                           */
-import C from "../../../../../ui-kit/base-ui/src/asyncLoader/baseLoader.vue.js";
+import S from "../../../../../ui-kit/base-ui/src/asyncLoader/baseLoader.vue.js";
 /* empty css                                                       */
 /* empty css                                                            */
 import q from "../../../../../ui-kit/base-ui/src/node/node.vue.js";
@@ -10,19 +10,23 @@ import "jsep";
 import { createEventBus as Q } from "../../../../../hooks/src/common/createEventBus.js";
 import "@vueuse/core";
 import "../../../../../hooks/src/store/index.js";
-import { provideBuilderDisabled as W } from "../../../../../hooks/src/designer/useBuiderDisabled.js";
-import { BUILDER_KEY as X } from "../../../../../hooks/src/designer/useBuilderContext.js";
-import { providePageManager as Z } from "../../../../../hooks/src/designer/usePageManager.js";
-import { FORM_INSTANCES_KEY as ee } from "../../../../../hooks/src/logic/useForm.js";
-import { pluginManager as p } from "../../../../../manager/src/pluginManager.js";
+import { provideResolveFormBindingsInView as W } from "../../../../../hooks/src/designer/resolveFormBindingsInView.js";
+import { provideBuilderDisabled as X } from "../../../../../hooks/src/designer/useBuiderDisabled.js";
+import { BUILDER_KEY as Z } from "../../../../../hooks/src/designer/useBuilderContext.js";
+import { providePageManager as ee } from "../../../../../hooks/src/designer/usePageManager.js";
+import { FORM_INSTANCES_KEY as te } from "../../../../../hooks/src/logic/useForm.js";
+import { pluginManager as d } from "../../../../../manager/src/pluginManager.js";
 import "vue-draggable-plus";
-import { setupPage as te } from "../../../../../ui-kit/panel-ui/src/components/index.js";
+import { setupPage as oe } from "../../../../../ui-kit/panel-ui/src/components/index.js";
 /* empty css                                            */
-import { useBuilder as oe } from "../hooks/useBuilder.js";
-const re = {
+import "../../../../../ui-kit/panel-ui/src/activitybars/pageManager/storage.js";
+import "../../../../../ui-kit/panel-ui/src/activitybars/pageManager/pageDraftBootstrap.js";
+import { useBuilder as re } from "../hooks/useBuilder.js";
+import { usePageDataSources as ae } from "../hooks/usePageDataSources.js";
+const ie = {
   key: 0,
   class: "diygw-loading-box"
-}, ae = { class: "diygw-builder-main ep-scoped" }, ie = { class: "diygw-loading-box" }, De = /* @__PURE__ */ w({
+}, ne = { class: "diygw-builder-main ep-scoped" }, se = { class: "diygw-loading-box" }, Ne = /* @__PURE__ */ K({
   __name: "builder",
   props: {
     disabled: { type: Boolean },
@@ -31,22 +35,24 @@ const re = {
     pageSchema: {}
   },
   emits: ["change", "ready"],
-  setup(M, { expose: S, emit: b }) {
-    const i = M, l = b;
-    te(p);
-    const c = p.component.get("epBuilderSlot"), {
+  setup(C, { expose: M, emit: b }) {
+    const i = C, l = b;
+    oe(d);
+    const c = d.component.get("epBuilderSlot"), {
       formInstances: k,
-      getData: E,
-      getFormInstance: D,
+      getData: D,
+      getFormInstance: E,
       getForms: R,
       pageManager: t,
       ready: s,
-      resetData: x,
+      resetData: I,
       setData: u,
-      setForms: I,
-      validate: A,
-      validateAll: F
-    } = oe(), f = L(0);
+      setForms: x,
+      validate: F,
+      validateAll: A
+    } = re();
+    ae(t);
+    const f = L(0);
     m(
       () => i.pageSchema,
       (e) => {
@@ -66,7 +72,7 @@ const re = {
         deep: !0,
         immediate: !0
       }
-    ), Q(), W(g(() => i.disabled)), h(X, {
+    ), Q(), W(!0), X(g(() => i.disabled)), h(Z, {
       fieldStateMap: g(() => {
         var o;
         const e = {};
@@ -75,53 +81,53 @@ const re = {
         }), e;
       }),
       slots: Y()
-    }), Z(t), h(ee, k);
+    }), ee(t), h(te, k);
     function N() {
       const e = m(
         () => t.mountMonitor.isAllMounted.value,
         (o) => {
-          o && (e && e(), K());
+          o && (e && e(), P());
         }
       );
     }
-    function K() {
+    function P() {
       s.value = !0, l("ready", t), J(t.pageSchema.schemas, (e) => {
         var o;
         return (o = e.on) != null && o.diygwReady && t.doActions(e.on.diygwReady), !1;
       });
     }
-    const P = $();
-    return t.addComponentInstance("builder", P), t.hook.register("formChange", (e) => {
+    const V = $();
+    return t.addComponentInstance("builder", V), t.hook.register("formChange", (e) => {
       l("change", e);
-    }), S({
-      getData: E,
-      getFormInstance: D,
+    }), M({
+      getData: D,
+      getFormInstance: E,
       getForms: R,
       pageManager: t,
       ready: s,
-      resetData: x,
+      resetData: I,
       setData: u,
-      setForms: I,
-      validate: A,
-      validateAll: F
-    }), (e, o) => !r(p).designer.initialized.value || r(t).pageSchema.schemas.length === 0 ? (a(), y("div", re, [
-      _(r(C))
-    ])) : (a(), d(z, {
+      setForms: x,
+      validate: F,
+      validateAll: A
+    }), (e, o) => !r(d).designer.initialized.value || r(t).pageSchema.schemas.length === 0 ? (a(), y("div", ie, [
+      _(r(S))
+    ])) : (a(), p(z, {
       key: f.value,
       onResolve: N
     }, {
       default: v(() => [
-        B("div", ae, [
-          (a(!0), y(T, null, U(r(t).pageSchema.schemas, (n, V) => (a(), d(r(q), {
-            key: V,
+        B("div", ne, [
+          (a(!0), y(T, null, U(r(t).pageSchema.schemas, (n, w) => (a(), p(r(q), {
+            key: w,
             "component-schema": n
           }, null, 8, ["component-schema"]))), 128)),
-          r(c) ? (a(), d(j(r(c)), { key: 0 })) : O("", !0)
+          r(c) ? (a(), p(j(r(c)), { key: 0 })) : O("", !0)
         ])
       ]),
       fallback: v(() => [
-        B("div", ie, [
-          _(r(C))
+        B("div", se, [
+          _(r(S))
         ])
       ]),
       _: 1
@@ -129,5 +135,5 @@ const re = {
   }
 });
 export {
-  De as default
+  Ne as default
 };

package/dist/core/src/components/designer/hooks/useDesigner.cjs

@@ -1,10 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("vue"),I=require("../../../../../hooks/src/common/clipboard.cjs");require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");;/* empty css                                             */;/* empty css                                                         */;/* empty css                                                              */const D=require("../../../../../manager/src/pageManager.cjs"),g=require("../../../../../manager/src/pluginManager.cjs"),C=require("../../../../../manager/src/revoke.cjs");;/* empty css                                                       */require("vue-draggable-plus");const a=require("../../../../../utils/src/common/data.cjs");require("jsep");let d={schemas:[{id:"root",label:"页面",props:{style:{padding:"16px"}},type:"page",children:[]}],script:`const { defineExpose, find } = diygw;
-
-function test (){
-    console.log('test')
-}
-
-// 通过defineExpose暴露的函数或者属性
-defineExpose({
- test
-})`};function w(s,h){const M=m.ref(!1),c=D.createPageManager(),t=c.pageSchema,i=m.reactive({disabledHover:!1,hoverNode:null,matched:[],selectedNode:null}),f=C.useRevoke(t,i,l),{duplicate:v}=I.useClipboard(t,l,e=>f.push(e)),b={desktop:{},mobile:{mode:"mobile",width:"390px"},tablet:{mode:"tablet",width:"780px"}};m.watchEffect(()=>{s.defaultSchema?d=s.defaultSchema:s.formMode&&(d.schemas=g.pluginManager.designer.formSchema,g.pluginManager.component.hide("form")),s.formMode||g.pluginManager.component.show("form");const e=s.canvasMode??"desktop";t.canvas={mode:e,...b[e],...d.canvas},q(),c.setDefaultComponentIds(d.schemas)}),c.setDesignMode();function q(){if(!s.formMode||!s.tableJson)return;const e=s.tableJson.find(o=>o.tableType==="parent");if(!e)return;const n=a.findSchemas(t.schemas,o=>o.type==="form");n.length===1&&(n[0].props.name=e.tableName)}function y(){var e;return v((e=i.selectedNode)==null?void 0:e.id)}function N(){var u;if(!((u=i.selectedNode)!=null&&u.id)||i.selectedNode.id===t.schemas[0].id)return;const e=a.findSchemaInfoById(t.schemas,i.selectedNode.id);if(!e)return!1;let{index:n,list:o}=e;o.splice(n,1),n===o.length&&n--,l(o[n]),f.push("删除组件")}function l(e){if(e||(e=t.schemas[0]),p(e)){const o=a.getMatchedById(c.pageSchema.schemas,(e==null?void 0:e.id)||""),u=o.length-2;for(let r=u;r>=0;r--)if(!p(o[r])){e=o[r];break}}const n=a.findSchemaById(t.schemas,(e==null?void 0:e.id)||"");i.matched=a.getMatchedById(t.schemas,(n==null?void 0:n.id)||""),i.selectedNode=n}function p(e){var n;return((n=e.status)==null?void 0:n.lock)||g.pluginManager.component.getLocked(e.type)}function S(e=null){var n;if(!e||i.disabledHover)return i.hoverNode=null,!1;if(p(e)){const o=a.getMatchedById(c.pageSchema.schemas,(e==null?void 0:e.id)||""),u=o.length-2;for(let r=u;r>=0;r--)if(!p(o[r])){e=o[r];break}}if((e==null?void 0:e.id)===((n=i.hoverNode)==null?void 0:n.id))return!1;i.hoverNode=e}function k(){a.deepEqual(t.schemas,d.schemas)&&t.script===d.script||(a.deepCompareAndModify(t.schemas,d.schemas),t.script=d.script,l(t.schemas[0]),f.push("重置操作"),h("reset",t))}function x(){t.schemas=a.deepClone(d.schemas),l(t.schemas[0]),f.push("初始化")}return x(),{handleDelete:N,handleDuplicate:y,pageManager:c,pageSchema:t,ready:M,reset:k,revoke:f,setHoverNode:S,setSelectedNode:l,state:i}}exports.useDesigner=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("vue"),C=require("../../../../../hooks/src/common/clipboard.cjs");require("@vueuse/core");require("../../../../../hooks/src/store/index.cjs");;/* empty css                                             */;/* empty css                                                         */;/* empty css                                                              */const D=require("../../../../../manager/src/pageManager.cjs"),p=require("../../../../../manager/src/pluginManager.cjs"),x=require("../../../../../manager/src/revoke.cjs");;/* empty css                                                       */require("vue-draggable-plus");const i=require("../../../../../utils/src/common/data.cjs");require("jsep");const B=require("../../../../../hooks/src/plugin/usePageSchema.cjs");let d={schemas:[{id:"root",label:"页面",props:{style:{padding:"16px"}},type:"page",children:[]}],script:B.INITIAL_PAGE_SCRIPT};function P(s,h){const M=m.ref(!1),c=D.createPageManager(),t=c.pageSchema,r=m.reactive({disabledHover:!1,hoverNode:null,matched:[],selectedNode:null}),f=x.useRevoke(t,r,l),{duplicate:v}=C.useClipboard(t,l,e=>f.push(e)),b={desktop:{},mobile:{mode:"mobile",width:"390px"},tablet:{mode:"tablet",width:"780px"}};m.watchEffect(()=>{s.defaultSchema?d=s.defaultSchema:s.formMode&&(d.schemas=p.pluginManager.designer.formSchema,p.pluginManager.component.hide("form")),s.formMode||p.pluginManager.component.show("form");const e=s.canvasMode??"desktop";t.canvas={mode:e,...b[e],...d.canvas},q(),c.setDefaultComponentIds(d.schemas)}),c.setDesignMode();function q(){if(!s.formMode||!s.tableJson)return;const e=s.tableJson.find(o=>o.tableType==="parent");if(!e)return;const n=i.findSchemas(t.schemas,o=>o.type==="form");n.length===1&&(n[0].props.name=e.tableName)}function S(){var e;return v((e=r.selectedNode)==null?void 0:e.id)}function N(){var u;if(!((u=r.selectedNode)!=null&&u.id)||r.selectedNode.id===t.schemas[0].id)return;const e=i.findSchemaInfoById(t.schemas,r.selectedNode.id);if(!e)return!1;let{index:n,list:o}=e;o.splice(n,1),n===o.length&&n--,l(o[n]),f.push("删除组件")}function l(e){if(e||(e=t.schemas[0]),g(e)){const o=i.getMatchedById(c.pageSchema.schemas,(e==null?void 0:e.id)||""),u=o.length-2;for(let a=u;a>=0;a--)if(!g(o[a])){e=o[a];break}}const n=i.findSchemaById(t.schemas,(e==null?void 0:e.id)||"");r.matched=i.getMatchedById(t.schemas,(n==null?void 0:n.id)||""),r.selectedNode=n}function g(e){var n;return((n=e.status)==null?void 0:n.lock)||p.pluginManager.component.getLocked(e.type)}function y(e=null){var n;if(!e||r.disabledHover)return r.hoverNode=null,!1;if(g(e)){const o=i.getMatchedById(c.pageSchema.schemas,(e==null?void 0:e.id)||""),u=o.length-2;for(let a=u;a>=0;a--)if(!g(o[a])){e=o[a];break}}if((e==null?void 0:e.id)===((n=r.hoverNode)==null?void 0:n.id))return!1;r.hoverNode=e}function I(){i.deepEqual(t.schemas,d.schemas)&&t.script===d.script||(i.deepCompareAndModify(t.schemas,d.schemas),t.script=d.script,l(t.schemas[0]),f.push("重置操作"),h("reset",t))}function k(){t.schemas=i.deepClone(d.schemas),l(t.schemas[0]),f.push("初始化")}return k(),{handleDelete:N,handleDuplicate:S,pageManager:c,pageSchema:t,ready:M,reset:I,revoke:f,setHoverNode:y,setSelectedNode:l,state:r}}exports.useDesigner=P;