@fangzhongya/page 0.0.27 → 0.0.29

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

@@ -39,7 +39,8 @@ function getComponString(name, attarObj, obj = {}, compons = {}) {
   if (shared.isHTMLTag(tcom) || shared.isSVGTag(tcom)) {
     return vue.h(tcom, attarObj, getSlots(obj.slots)?.default?.());
   }
-  return vue.h(vue.resolveComponent(name), attarObj, getSlots(obj.slots));
+  const vh = vue.resolveComponent(name);
+  return vue.h(vh, attarObj, getSlots(obj.slots));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {
@@ -262,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;
@@ -314,6 +315,7 @@ exports.getData = getData;
 exports.getRender = getRender;
 exports.getSlots = getSlots;
 exports.getSlotsArray = getSlotsArray;
+exports.getSlotsDom = getSlotsDom;
 exports.getTempsArr = getTempsArr;
 exports.isEmpty = isEmpty;
 exports.useGetCompon = useGetCompon;

package/dist/render/common.d.ts

@@ -8,6 +8,15 @@ 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;
+/**
+ * 生成插槽代码
+ * @param obj
+ * @param is
+ * @returns
+ */
+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[];
 export declare function getData(obj: ControlRender, params: ObjAny | undefined, temps: Array<TempsObject>, config?: ObjAny): void;
 /**

package/dist/render/common.js

@@ -37,7 +37,8 @@ function getComponString(name, attarObj, obj = {}, compons = {}) {
   if (isHTMLTag(tcom) || isSVGTag(tcom)) {
     return h(tcom, attarObj, getSlots(obj.slots)?.default?.());
   }
-  return h(resolveComponent(name), attarObj, getSlots(obj.slots));
+  const vh = resolveComponent(name);
+  return h(vh, attarObj, getSlots(obj.slots));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {
@@ -260,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;
@@ -313,6 +314,7 @@ export {
   getRender,
   getSlots,
   getSlotsArray,
+  getSlotsDom,
   getTempsArr,
   isEmpty,
   useGetCompon

package/dist/render/render.cjs

@@ -57,7 +57,6 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
         }
       });
       vue.onUnmounted(() => {
-        render.unStyle(name);
         if (obj.config?.unmounted) {
           config.runCodeBlock(obj.config.unmounted, params);
         }
@@ -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,7 +1,7 @@
 import { h, Fragment, defineComponent, provide, reactive, onMounted, onActivated, onDeactivated, onUnmounted, defineAsyncComponent, resolveComponent } from "vue";
 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 getRenders(params = {}, arrs, temps) {
   if (arrs) {
@@ -55,7 +55,6 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
         }
       });
       onUnmounted(() => {
-        unStyle(name);
         if (obj.config?.unmounted) {
           runCodeBlock(obj.config.unmounted, params);
         }
@@ -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;
+}>;

package/dist/viewer/design.js

@@ -0,0 +1,76 @@
+import { h } from "vue";
+import { getSlotsDom, getTempsArr, useGetCompon, assemblyGetRender } from "../render/common.js";
+import { getDraggableDiv } from "./draggable.js";
+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 getSlotsDom(obj, (slots, key, scope) => {
+      const ts = getTempsArr(temps, [scope]);
+      return 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 useGetCompon(name, config, {
+      slots
+    });
+  };
+}
+function setDesign(obj, params = {}, temps, cons = {}) {
+  if (!obj.design?.hide) {
+    obj.temps = [...temps];
+    return assemblyGetRender(
+      obj,
+      params,
+      temps,
+      getSlotsViewerDom(obj, params, temps, cons),
+      setCompon(cons)
+    );
+  } else {
+    return "";
+  }
+}
+function setDesignDag(arr, props, params = {}, temps) {
+  return 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 h("div", params.attrs, params.slots);
+  }
+}
+export {
+  getRender,
+  setDesign
+};

package/dist/viewer/draggable.cjs

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const vue = require("vue");
+const util = require("../components/operate/util.cjs");
+require("../config/util.cjs");
+const index = require("../utils/index.cjs");
+require("@fangzhongya/utils/name/humpToLine");
+const cs = index.getClass("viewer-drag");
+function getDraggableDiv(slots, assembly, params, callback, key) {
+  const right = vue.inject("right");
+  const rkey = vue.inject("rkey");
+  const replication = vue.inject("replication");
+  const operateRightKey = vue.inject("operateRightKey");
+  const onClick = (element) => {
+    right.value = element;
+  };
+  const showRightKey = (event, obj, list, index2) => {
+    operateRightKey.value = obj;
+    operateRightKey.options = util.getOptions(
+      obj,
+      replication.value,
+      list,
+      index2
+    );
+    operateRightKey.position = {
+      x: event.x,
+      y: event.y
+    };
+    operateRightKey.onClickRight = (key2) => {
+      util.operateClickKey(key2 + "", obj, list, index2, {
+        right,
+        rkey,
+        replication
+      });
+    };
+    operateRightKey.box = true;
+  };
+  return vue.h(
+    "div",
+    {
+      class: [cs()]
+    },
+    slots.map((v, index2) => {
+      return callback(v, params, {
+        class: [cs("item"), v === right.value ? "__page_on" : ""],
+        index: index2,
+        list: slots,
+        right,
+        rkey,
+        replication,
+        onClick: (e) => {
+          e.stopPropagation();
+          onClick(v);
+        },
+        onContextmenu: (event) => {
+          const target = event.target;
+          if (!target) {
+            return;
+          }
+          event.preventDefault();
+          event.stopPropagation();
+          showRightKey(
+            {
+              x: event.clientX,
+              y: event.clientY
+            },
+            v,
+            slots,
+            index2
+          );
+        },
+        onSet: (event) => {
+          showRightKey(
+            {
+              x: event.clientX,
+              y: event.clientY
+            },
+            v,
+            slots,
+            index2
+          );
+        }
+      });
+    })
+  );
+}
+exports.getDraggableDiv = getDraggableDiv;

package/dist/viewer/draggable.d.ts

@@ -0,0 +1,3 @@
+export declare function getDraggableDiv(slots: Array<ControlDesign>, assembly: ControlDesign, params: ObjAny, callback: Function, key?: string): globalThis.VNode<import('vue').RendererNode, import('vue').RendererElement, {
+    [key: string]: any;
+}>;

package/dist/viewer/draggable.js

@@ -0,0 +1,87 @@
+import { inject, h } from "vue";
+import { getOptions, operateClickKey } from "../components/operate/util.js";
+import "../config/util.js";
+import { getClass } from "../utils/index.js";
+import "@fangzhongya/utils/name/humpToLine";
+const cs = getClass("viewer-drag");
+function getDraggableDiv(slots, assembly, params, callback, key) {
+  const right = inject("right");
+  const rkey = inject("rkey");
+  const replication = inject("replication");
+  const operateRightKey = inject("operateRightKey");
+  const onClick = (element) => {
+    right.value = element;
+  };
+  const showRightKey = (event, obj, list, index) => {
+    operateRightKey.value = obj;
+    operateRightKey.options = getOptions(
+      obj,
+      replication.value,
+      list,
+      index
+    );
+    operateRightKey.position = {
+      x: event.x,
+      y: event.y
+    };
+    operateRightKey.onClickRight = (key2) => {
+      operateClickKey(key2 + "", obj, list, index, {
+        right,
+        rkey,
+        replication
+      });
+    };
+    operateRightKey.box = true;
+  };
+  return h(
+    "div",
+    {
+      class: [cs()]
+    },
+    slots.map((v, index) => {
+      return callback(v, params, {
+        class: [cs("item"), v === right.value ? "__page_on" : ""],
+        index,
+        list: slots,
+        right,
+        rkey,
+        replication,
+        onClick: (e) => {
+          e.stopPropagation();
+          onClick(v);
+        },
+        onContextmenu: (event) => {
+          const target = event.target;
+          if (!target) {
+            return;
+          }
+          event.preventDefault();
+          event.stopPropagation();
+          showRightKey(
+            {
+              x: event.clientX,
+              y: event.clientY
+            },
+            v,
+            slots,
+            index
+          );
+        },
+        onSet: (event) => {
+          showRightKey(
+            {
+              x: event.clientX,
+              y: event.clientY
+            },
+            v,
+            slots,
+            index
+          );
+        }
+      });
+    })
+  );
+}
+export {
+  getDraggableDiv
+};

package/dist/viewer/index.cjs

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const index_vue_vue_type_script_setup_true_lang = require("./index2.cjs");
+exports.default = index_vue_vue_type_script_setup_true_lang.default;

package/dist/viewer/index.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./index2.js";
+export {
+  _sfc_main as default
+};

package/dist/viewer/index2.cjs

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const vue = require("vue");
+const viewer = require("./viewer.cjs");
+const util = require("../design/util.cjs");
+const index = require("../utils/index.cjs");
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  __name: "index",
+  props: {
+    // 对应判断数据
+    value: {
+      type: Object,
+      default() {
+        return {};
+      }
+    }
+  },
+  setup(__props) {
+    const cs = index.getClass("viewer");
+    const props = __props;
+    const right = vue.inject("right");
+    const config = vue.inject("config");
+    const onClick = () => {
+      right.value = void 0;
+    };
+    const ViewerAssembly = viewer.createViewer(
+      util.getDesignCompon(props.value),
+      config?.value.imports
+    );
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", {
+        class: vue.normalizeClass(vue.unref(cs)()),
+        onClick: vue.withModifiers(onClick, ["stop"])
+      }, [
+        vue.createVNode(vue.unref(ViewerAssembly))
+      ], 2);
+    };
+  }
+});
+exports.default = _sfc_main;

package/dist/viewer/index2.js

@@ -0,0 +1,40 @@
+import { defineComponent, inject, openBlock, createElementBlock, withModifiers, normalizeClass, unref, createVNode } from "vue";
+import { createViewer } from "./viewer.js";
+import { getDesignCompon } from "../design/util.js";
+import { getClass } from "../utils/index.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "index",
+  props: {
+    // 对应判断数据
+    value: {
+      type: Object,
+      default() {
+        return {};
+      }
+    }
+  },
+  setup(__props) {
+    const cs = getClass("viewer");
+    const props = __props;
+    const right = inject("right");
+    const config = inject("config");
+    const onClick = () => {
+      right.value = void 0;
+    };
+    const ViewerAssembly = createViewer(
+      getDesignCompon(props.value),
+      config?.value.imports
+    );
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(unref(cs)()),
+        onClick: withModifiers(onClick, ["stop"])
+      }, [
+        createVNode(unref(ViewerAssembly))
+      ], 2);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};