@fangzhongya/page 0.0.26 → 0.0.28

package/dist/index.cjs

@@ -5,6 +5,7 @@ require("./components/index.cjs");
 const index$1 = require("./components/output/vue/index.cjs");
 const util = require("./render/util.cjs");
 const index = require("./assemblys/index.cjs");
+const util$1 = require("./design/util.cjs");
 require("./page.cjs");
 const index_vue_vue_type_script_setup_true_lang = require("./components/index2.cjs");
 const render = require("./render/render.cjs");
@@ -22,6 +23,7 @@ exports.generVue = index$1.generVue;
 exports.getDesignMinStr = util.getDesignMinStr;
 exports.getStrValue = util.getStrValue;
 exports.assemblys = index.default;
+exports.getUuidControl = util$1.getUuidControl;
 exports.createRender = render.createRender;
 exports.getComponentNames = render$1.getComponentNames;
 exports.FangPageSet = FangPageSet;

package/dist/index.d.ts

@@ -2,8 +2,9 @@ import { Plugin } from 'vue';
 import { generVue } from './components/output/vue/index';
 import { getDesignMinStr } from './render/util';
 import { default as assemblys } from './assemblys/index';
+import { getUuidControl } from './design/util';
 export * from './page';
 declare const FangPageSet: any;
 export declare const install: Plugin;
-export { FangPageSet, assemblys, generVue, getDesignMinStr };
+export { FangPageSet, assemblys, getUuidControl, generVue, getDesignMinStr };
 export default FangPageSet;

package/dist/index.js

@@ -3,6 +3,7 @@ import "./components/index.js";
 import { generVue } from "./components/output/vue/index.js";
 import { getDesignMinStr, getStrValue } from "./render/util.js";
 import assemblys from "./assemblys/index.js";
+import { getUuidControl } from "./design/util.js";
 import "./page.js";
 import _sfc_main from "./components/index2.js";
 import { createRender } from "./render/render.js";
@@ -25,5 +26,6 @@ export {
   getComponentNames,
   getDesignMinStr,
   getStrValue,
+  getUuidControl,
   install
 };

package/dist/render/common.cjs

@@ -7,17 +7,16 @@ const humpToLine = require("@fangzhongya/utils/name/humpToLine");
 const isObject = require("@fangzhongya/utils/basic/object/isObject");
 const render = require("../utils/render.cjs");
 const config = require("./config.cjs");
-function setSlots(obj) {
-  const slots = obj.slots;
+function getSlots(slots) {
   if (vue.isVNode(slots)) {
     return {
-      default: () => slots
+      default: () => [slots]
     };
   } else if (typeof slots === "function") {
     return {
       default: slots
     };
-  } else if (isObject.isObject(slots)) {
+  } else if (slots && isObject.isObject(slots) && !Array.isArray(slots)) {
     return slots;
   } else if (!isEmpty(slots)) {
     return {
@@ -25,32 +24,33 @@ function setSlots(obj) {
     };
   }
 }
-function setComponString(name, attarObj, obj = {}, compons = {}) {
+function getComponString(name, attarObj, obj = {}, compons = {}) {
   if (name === "Template") {
-    return vue.h(vue.Fragment, null, setSlots(obj).default?.());
+    return vue.h(vue.Fragment, null, getSlots(obj.slots)?.default?.());
   }
   compons = vue.inject("components", compons);
   const tcom = humpToLine.humpToLine(name);
   const cms = Object.keys(compons);
   if (cms.includes(name)) {
-    return vue.h(compons[name], attarObj, setSlots(obj));
+    return vue.h(compons[name], attarObj, getSlots(obj.slots));
   } else if (cms.includes(tcom)) {
-    return vue.h(compons[tcom], attarObj, setSlots(obj));
+    return vue.h(compons[tcom], attarObj, getSlots(obj.slots));
   }
   if (shared.isHTMLTag(tcom) || shared.isSVGTag(tcom)) {
-    return vue.h(tcom, attarObj, setSlots(obj).default?.());
+    return vue.h(tcom, attarObj, getSlots(obj.slots)?.default?.());
   }
-  return vue.h(vue.resolveComponent(name), attarObj, setSlots(obj));
+  const vh = vue.resolveComponent(name);
+  return vue.h(vh, attarObj, getSlots(obj.slots));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {
-    return setComponString(name, attarObj, obj, compons);
+    return getComponString(name, attarObj, obj, compons);
   } else if (typeof name == "function") {
-    return name(attarObj, setSlots(obj));
+    return name(attarObj, getSlots(obj.slots));
   } else if (vue.isVNode(name)) {
     return name;
   } else {
-    return vue.h(name, attarObj, setSlots(obj));
+    return vue.h(name, attarObj, getSlots(obj.slots));
   }
 }
 function getSlotsArray(obj, key = "default") {
@@ -62,7 +62,7 @@ function isEmpty(v) {
     return true;
   }
 }
-function getSlots(obj, callback) {
+function getSlotsDom(obj, callback) {
   const slots = obj.slots || {};
   const cs = obj.config?.scope;
   if (Array.isArray(slots)) {
@@ -87,7 +87,7 @@ function getSlots(obj, callback) {
         });
       } else {
         if (!isEmpty(slot)) {
-          objs[key] = setSlots({ slots: slot }).default;
+          objs[key] = getSlots(slot)?.default;
         }
       }
     }
@@ -139,7 +139,7 @@ function getCompon(obj, config$1, params, temps) {
     if (slots) {
       return vue.h(vue.Fragment, slots(config$1));
     } else {
-      return setRender(
+      return getRender(
         {
           name: "Template",
           slots: obj.slots
@@ -149,7 +149,7 @@ function getCompon(obj, config$1, params, temps) {
       );
     }
   } else if (name === "Component") {
-    return setRender(
+    return getRender(
       {
         name: config$1.is,
         slots: obj.slots,
@@ -188,7 +188,7 @@ function getCompon(obj, config$1, params, temps) {
                 }
               ];
               const ts = getTempsArr(temps, vfors, "forin");
-              return setRender(
+              return getRender(
                 {
                   name: "Template",
                   slots: obj.slots
@@ -213,7 +213,7 @@ function getCompon(obj, config$1, params, temps) {
               }
             ];
             const ts = getTempsArr(temps, vfors, "forof");
-            return setRender(
+            return getRender(
               {
                 name: "Template",
                 slots: obj.slots
@@ -250,7 +250,7 @@ function getCompon(obj, config$1, params, temps) {
     const slots = [];
     if (vc) {
       getSlotsArray(vc).forEach((v) => {
-        slots.push(setRender(v, params, temps));
+        slots.push(getRender(v, params, temps));
       });
     }
     return vue.h(vue.Fragment, null, slots);
@@ -263,12 +263,12 @@ function getData(obj, params = {}, temps, config$1 = {}) {
   config.getAttrs(obj, config$1);
   config.getProps(obj, config$1, params, temps);
   config.getEmits(obj, config$1, params, temps);
-  config$1[render.getClassId(params.name)] = "";
 }
 function assemblyGetRender(obj, params = {}, temps, getSlots2, setCompon) {
   if (obj) {
     const config2 = {};
     getData(obj, params, temps, config2);
+    config2[render.getClassId(params.name)] = "";
     const rc = getCompon(obj, config2, params, temps);
     if (rc !== void 0) {
       return rc;
@@ -279,13 +279,13 @@ function assemblyGetRender(obj, params = {}, temps, getSlots2, setCompon) {
     return "";
   }
 }
-function setRender(obj, params = {}, temps) {
+function getRender(obj, params = {}, temps) {
   return assemblyGetRender(
     obj,
     params,
     temps,
     (config2) => {
-      return getSlots(
+      return getSlotsDom(
         obj,
         (slots, key, scope) => {
           const ts = getTempsArr(temps, [scope]);
@@ -293,7 +293,7 @@ function setRender(obj, params = {}, temps) {
             vue.Fragment,
             null,
             slots.map((v) => {
-              return setRender(v, params, ts);
+              return getRender(v, params, ts);
             })
           );
         }
@@ -312,10 +312,10 @@ function setRender(obj, params = {}, temps) {
 }
 exports.assemblyGetRender = assemblyGetRender;
 exports.getData = getData;
+exports.getRender = getRender;
 exports.getSlots = getSlots;
 exports.getSlotsArray = getSlotsArray;
+exports.getSlotsDom = getSlotsDom;
 exports.getTempsArr = getTempsArr;
 exports.isEmpty = isEmpty;
-exports.setRender = setRender;
-exports.setSlots = setSlots;
 exports.useGetCompon = useGetCompon;

package/dist/render/common.d.ts

@@ -1,11 +1,11 @@
-import { VNode } from 'vue';
+import { VNode, Slots } from 'vue';
 /**
  * 设置插槽配置
  * @param obj - 包含slots属性的ListObj对象
  * @returns 返回标准化的插槽配置对象
  */
-export declare function setSlots(obj: ObjAny): any;
-export declare function useGetCompon(name: any, attarObj: ObjAny, obj?: ObjAny, compons?: ObjAny): any;
+export declare function getSlots(slots: any): Slots | undefined;
+export declare function useGetCompon(name: any, attarObj: ObjAny, obj?: ObjAny, compons?: ObjAny): VNode | string;
 export declare function getSlotsArray(obj: ControlRender, key?: string): ControlRender[];
 export declare function isEmpty(v: any): true | undefined;
 /**
@@ -14,7 +14,7 @@ export declare function isEmpty(v: any): true | undefined;
  * @param is
  * @returns
  */
-export declare function getSlots(obj: ControlRender, callback: (slots: ControlRender[], key: string, obj: TempsObjectKey) => void): {
+export declare function getSlotsDom(obj: ControlRender, callback: (slots: ControlRender[], key: string, obj: TempsObjectKey) => void): {
     [key: string]: any;
 };
 export declare function getTempsArr(temps: Array<TempsObject>, value: TempsObjectKey[], type?: string): TempsObject[];
@@ -30,4 +30,4 @@ export declare function assemblyGetRender(obj: ControlRender, params: ObjAny | u
  * @param obj 数据对象
  * @returns
  */
-export declare function setRender(obj: ControlRender, params: ObjAny | undefined, temps: Array<TempsObject>): VNode | string;
+export declare function getRender(obj: ControlRender, params: ObjAny | undefined, temps: Array<TempsObject>): VNode | string;

package/dist/render/common.js

@@ -5,17 +5,16 @@ import { humpToLine } from "@fangzhongya/utils/name/humpToLine";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { getRenderSlots, getClassId } from "../utils/render.js";
 import { getScopeObject, getForObject, getPropsValue, getConfig, getRefDom, getDirectives, getAttrs, getProps, getEmits } from "./config.js";
-function setSlots(obj) {
-  const slots = obj.slots;
+function getSlots(slots) {
   if (isVNode(slots)) {
     return {
-      default: () => slots
+      default: () => [slots]
     };
   } else if (typeof slots === "function") {
     return {
       default: slots
     };
-  } else if (isObject(slots)) {
+  } else if (slots && isObject(slots) && !Array.isArray(slots)) {
     return slots;
   } else if (!isEmpty(slots)) {
     return {
@@ -23,32 +22,33 @@ function setSlots(obj) {
     };
   }
 }
-function setComponString(name, attarObj, obj = {}, compons = {}) {
+function getComponString(name, attarObj, obj = {}, compons = {}) {
   if (name === "Template") {
-    return h(Fragment, null, setSlots(obj).default?.());
+    return h(Fragment, null, getSlots(obj.slots)?.default?.());
   }
   compons = inject("components", compons);
   const tcom = humpToLine(name);
   const cms = Object.keys(compons);
   if (cms.includes(name)) {
-    return h(compons[name], attarObj, setSlots(obj));
+    return h(compons[name], attarObj, getSlots(obj.slots));
   } else if (cms.includes(tcom)) {
-    return h(compons[tcom], attarObj, setSlots(obj));
+    return h(compons[tcom], attarObj, getSlots(obj.slots));
   }
   if (isHTMLTag(tcom) || isSVGTag(tcom)) {
-    return h(tcom, attarObj, setSlots(obj).default?.());
+    return h(tcom, attarObj, getSlots(obj.slots)?.default?.());
   }
-  return h(resolveComponent(name), attarObj, setSlots(obj));
+  const vh = resolveComponent(name);
+  return h(vh, attarObj, getSlots(obj.slots));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {
-    return setComponString(name, attarObj, obj, compons);
+    return getComponString(name, attarObj, obj, compons);
   } else if (typeof name == "function") {
-    return name(attarObj, setSlots(obj));
+    return name(attarObj, getSlots(obj.slots));
   } else if (isVNode(name)) {
     return name;
   } else {
-    return h(name, attarObj, setSlots(obj));
+    return h(name, attarObj, getSlots(obj.slots));
   }
 }
 function getSlotsArray(obj, key = "default") {
@@ -60,7 +60,7 @@ function isEmpty(v) {
     return true;
   }
 }
-function getSlots(obj, callback) {
+function getSlotsDom(obj, callback) {
   const slots = obj.slots || {};
   const cs = obj.config?.scope;
   if (Array.isArray(slots)) {
@@ -85,7 +85,7 @@ function getSlots(obj, callback) {
         });
       } else {
         if (!isEmpty(slot)) {
-          objs[key] = setSlots({ slots: slot }).default;
+          objs[key] = getSlots(slot)?.default;
         }
       }
     }
@@ -137,7 +137,7 @@ function getCompon(obj, config, params, temps) {
     if (slots) {
       return h(Fragment, slots(config));
     } else {
-      return setRender(
+      return getRender(
         {
           name: "Template",
           slots: obj.slots
@@ -147,7 +147,7 @@ function getCompon(obj, config, params, temps) {
       );
     }
   } else if (name === "Component") {
-    return setRender(
+    return getRender(
       {
         name: config.is,
         slots: obj.slots,
@@ -186,7 +186,7 @@ function getCompon(obj, config, params, temps) {
                 }
               ];
               const ts = getTempsArr(temps, vfors, "forin");
-              return setRender(
+              return getRender(
                 {
                   name: "Template",
                   slots: obj.slots
@@ -211,7 +211,7 @@ function getCompon(obj, config, params, temps) {
               }
             ];
             const ts = getTempsArr(temps, vfors, "forof");
-            return setRender(
+            return getRender(
               {
                 name: "Template",
                 slots: obj.slots
@@ -248,7 +248,7 @@ function getCompon(obj, config, params, temps) {
     const slots = [];
     if (vc) {
       getSlotsArray(vc).forEach((v) => {
-        slots.push(setRender(v, params, temps));
+        slots.push(getRender(v, params, temps));
       });
     }
     return h(Fragment, null, slots);
@@ -261,12 +261,12 @@ function getData(obj, params = {}, temps, config = {}) {
   getAttrs(obj, config);
   getProps(obj, config, params, temps);
   getEmits(obj, config, params, temps);
-  config[getClassId(params.name)] = "";
 }
 function assemblyGetRender(obj, params = {}, temps, getSlots2, setCompon) {
   if (obj) {
     const config = {};
     getData(obj, params, temps, config);
+    config[getClassId(params.name)] = "";
     const rc = getCompon(obj, config, params, temps);
     if (rc !== void 0) {
       return rc;
@@ -277,13 +277,13 @@ function assemblyGetRender(obj, params = {}, temps, getSlots2, setCompon) {
     return "";
   }
 }
-function setRender(obj, params = {}, temps) {
+function getRender(obj, params = {}, temps) {
   return assemblyGetRender(
     obj,
     params,
     temps,
     (config) => {
-      return getSlots(
+      return getSlotsDom(
         obj,
         (slots, key, scope) => {
           const ts = getTempsArr(temps, [scope]);
@@ -291,7 +291,7 @@ function setRender(obj, params = {}, temps) {
             Fragment,
             null,
             slots.map((v) => {
-              return setRender(v, params, ts);
+              return getRender(v, params, ts);
             })
           );
         }
@@ -311,11 +311,11 @@ function setRender(obj, params = {}, temps) {
 export {
   assemblyGetRender,
   getData,
+  getRender,
   getSlots,
   getSlotsArray,
+  getSlotsDom,
   getTempsArr,
   isEmpty,
-  setRender,
-  setSlots,
   useGetCompon
 };

package/dist/render/render.cjs

@@ -5,11 +5,11 @@ const common = require("./common.cjs");
 const config = require("./config.cjs");
 const render = require("../utils/render.cjs");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
-function getRender(params = {}, arrs, temps) {
+function getRenders(params = {}, arrs, temps) {
   if (arrs) {
     return vue.h(vue.Fragment, null, [
       arrs.map((v) => {
-        return common.setRender(v, params, temps);
+        return common.getRender(v, params, temps);
       })
     ]);
   } else {
@@ -57,12 +57,11 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
         }
       });
       vue.onUnmounted(() => {
-        render.unStyle(name);
         if (obj.config?.unmounted) {
           config.runCodeBlock(obj.config.unmounted, params);
         }
       });
-      return () => getRender(params, obj.list, temps);
+      return () => getRenders(params, obj.list, temps);
     }
   });
 }
@@ -95,6 +94,11 @@ function getComponents(obj, callback, components = {}) {
   const names = render.getComponentNames(obj);
   for (const key of names) {
     if (!rcs[key]) {
+      const globalComponent = vue.resolveComponent(key);
+      if (typeof globalComponent !== "string" && globalComponent) {
+        rcs[key] = globalComponent;
+        continue;
+      }
       rcs[key] = getAsyncComponent(async () => {
         const value = await Promise.resolve(callback(key));
         if (typeof value === "string") {

package/dist/render/render.js

@@ -1,13 +1,13 @@
 import { h, Fragment, defineComponent, provide, reactive, onMounted, onActivated, onDeactivated, onUnmounted, defineAsyncComponent, resolveComponent } from "vue";
-import { setRender } from "./common.js";
+import { getRender } from "./common.js";
 import { getObjProps, setCodes, runCodeBlock } from "./config.js";
-import { setStyle, unStyle, getComponentNames, isRenderCompon } from "../utils/render.js";
+import { setStyle, getComponentNames, isRenderCompon } from "../utils/render.js";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
-function getRender(params = {}, arrs, temps) {
+function getRenders(params = {}, arrs, temps) {
   if (arrs) {
     return h(Fragment, null, [
       arrs.map((v) => {
-        return setRender(v, params, temps);
+        return getRender(v, params, temps);
       })
     ]);
   } else {
@@ -55,12 +55,11 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
         }
       });
       onUnmounted(() => {
-        unStyle(name);
         if (obj.config?.unmounted) {
           runCodeBlock(obj.config.unmounted, params);
         }
       });
-      return () => getRender(params, obj.list, temps);
+      return () => getRenders(params, obj.list, temps);
     }
   });
 }
@@ -93,6 +92,11 @@ function getComponents(obj, callback, components = {}) {
   const names = getComponentNames(obj);
   for (const key of names) {
     if (!rcs[key]) {
+      const globalComponent = resolveComponent(key);
+      if (typeof globalComponent !== "string" && globalComponent) {
+        rcs[key] = globalComponent;
+        continue;
+      }
       rcs[key] = getAsyncComponent(async () => {
         const value = await Promise.resolve(callback(key));
         if (typeof value === "string") {

package/dist/utils/index.cjs

@@ -79,12 +79,7 @@ function extractCssClass(formCssCode) {
   }
   return [...new Set(cssNameArray)];
 }
-let r = 1;
-function getRandom() {
-  return r++;
-}
 exports.extractCssClass = extractCssClass;
 exports.getClass = getClass;
 exports.getClassName = getClassName;
-exports.getRandom = getRandom;
 exports.setCssSize = setCssSize;

package/dist/utils/index.d.ts

@@ -17,4 +17,3 @@ export declare function getClassName(name: string, obj: RenderCompon): string;
  * @returns
  */
 export declare function extractCssClass(formCssCode: string): string[];
-export declare function getRandom(): number;

package/dist/utils/index.js

@@ -77,14 +77,9 @@ function extractCssClass(formCssCode) {
   }
   return [...new Set(cssNameArray)];
 }
-let r = 1;
-function getRandom() {
-  return r++;
-}
 export {
   extractCssClass,
   getClass,
   getClassName,
-  getRandom,
   setCssSize
 };

package/dist/viewer/design.cjs

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const vue = require("vue");
+const common = require("../render/common.cjs");
+const draggable = require("./draggable.cjs");
+function setCons(config, drag, obj) {
+  let c = config.class || "";
+  if (Array.isArray(c)) {
+    c = c.join(" ");
+  }
+  config.class = c + " " + drag.class?.join(" ");
+  config.onClick = drag.onClick;
+  config.onContextmenu = drag.onContextmenu;
+}
+function getSlotsViewerDom(obj, params = {}, temps, cons = {}) {
+  return (config) => {
+    setCons(config, cons, obj);
+    return common.getSlotsDom(obj, (slots, key, scope) => {
+      const ts = common.getTempsArr(temps, [scope]);
+      return draggable.getDraggableDiv(
+        slots,
+        obj,
+        params,
+        (v, p, c) => {
+          return setDesign(v, p, ts, c);
+        },
+        key
+      );
+    });
+  };
+}
+function setCompon(cons) {
+  return (obj, config, slots) => {
+    setCons(config, cons, obj);
+    let name = obj.name;
+    if (name === "PageHtml") {
+      name = obj.config?.type || "div";
+    }
+    return common.useGetCompon(name, config, {
+      slots
+    });
+  };
+}
+function setDesign(obj, params = {}, temps, cons = {}) {
+  if (!obj.design?.hide) {
+    obj.temps = [...temps];
+    return common.assemblyGetRender(
+      obj,
+      params,
+      temps,
+      getSlotsViewerDom(obj, params, temps, cons),
+      setCompon(cons)
+    );
+  } else {
+    return "";
+  }
+}
+function setDesignDag(arr, props, params = {}, temps) {
+  return draggable.getDraggableDiv(
+    arr,
+    props,
+    params,
+    (v, p, c) => {
+      return setDesign(v, params, temps, c);
+    }
+  );
+}
+function getRender(params = {}, lists, temps) {
+  if (lists) {
+    return setDesignDag(lists, {}, params, temps);
+  } else {
+    return vue.h("div", params.attrs, params.slots);
+  }
+}
+exports.getRender = getRender;
+exports.setDesign = setDesign;

package/dist/viewer/design.d.ts

@@ -0,0 +1,5 @@
+import { VNode } from 'vue';
+export declare function setDesign(obj: ControlDesign, params: ObjAny | undefined, temps: Array<TempsObject>, cons?: ObjAny): VNode | string;
+export declare function getRender(params: ObjAny | undefined, lists: Array<ControlDesign> | undefined, temps: Array<TempsObject>): string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
+    [key: string]: any;
+}>;