super-page-designer 2.0.34 → 2.0.37

package/dist/es/components/design/views/design/view/view-design-display.vue.js

@@ -15,21 +15,24 @@ import "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import "@codemirror/search";
-import "../page-event/config.vue.js";
+import "../page-event/config.vue2.js";
 import "../../../utils/assemblys-config.js";
 import "../../../../../stores/page-store.js";
 import "../../../../../stores/event-undo-redo-store.js";
 import "../../../utils/eventBus.js";
-import "../page-event/page-event-content.vue3.js";
 import _sfc_main$3 from "./components/quick-add-dialog.vue.js";
 import { setTableRuntimesFromConfigure } from "../../../utils/page-table-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { class: "amb-design-content-center-header" };
 const _hoisted_2 = { class: "amb-design-tool" };
-const _hoisted_3 = { style: { "float": "right", "margin-right": "10px" } };
-const _hoisted_4 = /* @__PURE__ */ createElementVNode("label", null, "快捷添加", -1);
-const _hoisted_5 = /* @__PURE__ */ createElementVNode("label", null, "保存", -1);
-const _hoisted_6 = /* @__PURE__ */ createElementVNode("label", null, "预览", -1);
+const _hoisted_3 = { class: "amb-design-tool-item" };
+const _hoisted_4 = {
+  class: "amb-design-tool-item",
+  style: { "padding-right": "20px" }
+};
+const _hoisted_5 = /* @__PURE__ */ createElementVNode("label", null, "快捷添加", -1);
+const _hoisted_6 = /* @__PURE__ */ createElementVNode("label", null, "保存", -1);
+const _hoisted_7 = /* @__PURE__ */ createElementVNode("label", null, "预览", -1);
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "view-design-display",
   props: {
@@ -66,6 +69,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const designStyle = ref({});
     const designClass = ref("");
+    const borderMainHeight = ref(null);
     caculateNewStyle();
     const dynamicPageSizeStyle = computed(function() {
       let pageWidth = null;
@@ -80,6 +84,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       for (let field in designStyle.value) {
         styleInfo[field] = designStyle.value[field];
       }
+      if (borderMainHeight.value) {
+        styleInfo["min-height"] = borderMainHeight.value + "px";
+      }
       return styleInfo;
     });
     watch(props.configure.props, () => {
@@ -111,6 +118,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         addComponentRef(props.configure, -1, ambPageDesignContent);
       }
+      if (pageDesignBoardMain.value) {
+        const rect = pageDesignBoardMain.value.getBoundingClientRect();
+        if (rect.y) {
+          borderMainHeight.value = window.innerHeight - rect.y - 20;
+        }
+      }
     });
     function revocation() {
       $emits("revocation");
@@ -279,71 +292,70 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, [
           createElementVNode("div", _hoisted_1, [
             createElementVNode("div", _hoisted_2, [
-              withDirectives(createElementVNode("label", {
-                class: normalizeClass(["amb-page-type", { selected: !_ctx.configure.dimensions || _ctx.configure.dimensions == "pc" }]),
-                onClick: _cache[0] || (_cache[0] = ($event) => _ctx.configure.dimensions = "pc")
-              }, [
-                createVNode(_component_el_icon, { size: 25 }, {
-                  default: withCtx(() => [
-                    createVNode(unref(Monitor))
-                  ]),
-                  _: 1
-                })
-              ], 2), [
-                [vShow, _ctx.selAsselbyType === "assembly"]
-              ]),
-              withDirectives(createElementVNode("label", {
-                class: normalizeClass(["amb-page-type", { selected: _ctx.configure.dimensions == "ipad" }]),
-                onClick: _cache[1] || (_cache[1] = ($event) => _ctx.configure.dimensions = "ipad")
-              }, [
-                createVNode(_component_el_icon, { size: 23 }, {
-                  default: withCtx(() => [
-                    createVNode(unref(Cellphone))
-                  ]),
-                  _: 1
-                })
-              ], 2), [
-                [vShow, _ctx.selAsselbyType === "assembly"]
-              ]),
-              withDirectives(createElementVNode("label", {
-                class: normalizeClass(["amb-page-type", { selected: _ctx.configure.dimensions == "phone" }]),
-                onClick: _cache[2] || (_cache[2] = ($event) => _ctx.configure.dimensions = "phone")
-              }, [
-                createVNode(_component_el_icon, { size: 23 }, {
-                  default: withCtx(() => [
-                    createVNode(unref(Iphone))
-                  ]),
-                  _: 1
-                })
-              ], 2), [
-                [vShow, _ctx.selAsselbyType === "assembly"]
-              ]),
-              withDirectives(createVNode(_component_el_divider, {
-                direction: "vertical",
-                class: "amb-design-tool-split"
-              }, null, 512), [
-                [vShow, _ctx.selAsselbyType === "assembly"]
-              ]),
-              createElementVNode("label", {
-                class: "amb-page-type",
-                style: { "margin-left": "0px" }
-              }, [
-                createElementVNode("span", {
-                  class: "iconfont icon-chexiaozuo",
-                  style: { "font-size": "23px" },
-                  onClick: revocation,
-                  title: "撤销"
-                })
-              ]),
-              createElementVNode("label", { class: "amb-page-type" }, [
-                createElementVNode("span", {
-                  class: "iconfont icon-chexiaoyou",
-                  style: { "font-size": "23px" },
-                  onClick: regain,
-                  title: "恢复"
-                })
-              ]),
               createElementVNode("div", _hoisted_3, [
+                withDirectives(createElementVNode("label", {
+                  class: normalizeClass(["amb-page-type", { selected: !_ctx.configure.dimensions || _ctx.configure.dimensions == "pc" }]),
+                  onClick: _cache[0] || (_cache[0] = ($event) => _ctx.configure.dimensions = "pc")
+                }, [
+                  createVNode(_component_el_icon, { size: 23 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Monitor))
+                    ]),
+                    _: 1
+                  })
+                ], 2), [
+                  [vShow, _ctx.selAsselbyType === "assembly"]
+                ]),
+                withDirectives(createElementVNode("label", {
+                  class: normalizeClass(["amb-page-type", { selected: _ctx.configure.dimensions == "ipad" }]),
+                  onClick: _cache[1] || (_cache[1] = ($event) => _ctx.configure.dimensions = "ipad")
+                }, [
+                  createVNode(_component_el_icon, { size: 23 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Cellphone))
+                    ]),
+                    _: 1
+                  })
+                ], 2), [
+                  [vShow, _ctx.selAsselbyType === "assembly"]
+                ]),
+                withDirectives(createElementVNode("label", {
+                  class: normalizeClass(["amb-page-type", { selected: _ctx.configure.dimensions == "phone" }]),
+                  onClick: _cache[2] || (_cache[2] = ($event) => _ctx.configure.dimensions = "phone")
+                }, [
+                  createVNode(_component_el_icon, { size: 23 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Iphone))
+                    ]),
+                    _: 1
+                  })
+                ], 2), [
+                  [vShow, _ctx.selAsselbyType === "assembly"]
+                ]),
+                withDirectives(createVNode(_component_el_divider, { direction: "vertical" }, null, 512), [
+                  [vShow, _ctx.selAsselbyType === "assembly"]
+                ]),
+                createElementVNode("label", {
+                  class: "amb-page-type",
+                  style: { "margin-left": "0px" }
+                }, [
+                  createElementVNode("span", {
+                    class: "iconfont icon-chexiaozuo",
+                    style: { "font-size": "23px" },
+                    onClick: revocation,
+                    title: "撤销"
+                  })
+                ]),
+                createElementVNode("label", { class: "amb-page-type" }, [
+                  createElementVNode("span", {
+                    class: "iconfont icon-chexiaoyou",
+                    style: { "font-size": "23px" },
+                    onClick: regain,
+                    title: "恢复"
+                  })
+                ])
+              ]),
+              createElementVNode("div", _hoisted_4, [
                 createElementVNode("label", {
                   class: "amb-page-type",
                   onClick: _cache[3] || (_cache[3] = ($event) => quickAdd())
@@ -354,14 +366,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   }),
-                  _hoisted_4
+                  _hoisted_5
                 ]),
-                createVNode(_component_el_divider, {
-                  direction: "vertical",
-                  class: "amb-design-tool-split"
-                }),
+                createVNode(_component_el_divider, { direction: "vertical" }),
                 createElementVNode("label", {
                   class: "amb-page-type",
+                  style: { "margin-left": "0px" },
                   onClick: _cache[4] || (_cache[4] = ($event) => saveForm())
                 }, [
                   createVNode(_component_el_icon, { size: 18 }, {
@@ -370,12 +380,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   }),
-                  _hoisted_5
+                  _hoisted_6
                 ]),
-                createVNode(_component_el_divider, {
-                  direction: "vertical",
-                  class: "amb-design-tool-split"
-                }),
+                createVNode(_component_el_divider, { direction: "vertical" }),
                 createElementVNode("label", {
                   class: "amb-page-type",
                   style: { "margin-left": "0px" },
@@ -387,7 +394,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   }),
-                  _hoisted_6
+                  _hoisted_7
                 ])
               ])
             ])

package/dist/es/components/design/views/design/view/view-design-preview.vue.js

@@ -1,6 +1,7 @@
-import { defineComponent, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, unref } from "vue";
+import { defineComponent, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, unref, normalizeStyle } from "vue";
 import "@element-plus/icons";
 import { SuperPageNew } from "super-page-runtime";
+import { PageDimensions } from "../../../utils/interfaces/page-design-types.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "view-design-preview",
   props: {
@@ -13,6 +14,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return "预览【" + props.pageDesign.label + "】";
     });
     const emits = __emit;
+    const viewStyle = computed(() => {
+      const dimensions = props.pageDesign.dimensions;
+      const styleInfo = {};
+      let pageWidth = null;
+      if (PageDimensions.IPAD === dimensions) {
+        pageWidth = 768;
+      } else if (PageDimensions.PHONE === dimensions) {
+        pageWidth = 414;
+      } else {
+        return styleInfo;
+      }
+      styleInfo.width = pageWidth + "px";
+      styleInfo["border"] = "1px solid #dcdfe6";
+      styleInfo["border-radius"] = "4px";
+      return styleInfo;
+    });
     return (_ctx, _cache) => {
       const _component_el_dialog = resolveComponent("el-dialog");
       return openBlock(), createBlock(_component_el_dialog, {
@@ -23,10 +40,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           createVNode(unref(SuperPageNew), {
+            style: normalizeStyle([{ "margin": "0 auto" }, viewStyle.value]),
             pageDesign: _ctx.pageDesign,
             publishVersion: _ctx.pageDesign.systemVersion,
+            dimensions: _ctx.pageDesign.dimensions,
             isTest: true
-          }, null, 8, ["pageDesign", "publishVersion"])
+          }, null, 8, ["style", "pageDesign", "publishVersion", "dimensions"])
         ]),
         _: 1
       }, 8, ["title"]);

package/dist/es/stores/page-store.js

@@ -20,7 +20,8 @@ const usePageContextStore = defineStore("pageContextUtil", () => {
         pageContextVarOptions.value.dataOptions.push({
           value: element.dbColumnName,
           // element.name
-          label: element.alias
+          label: element.alias,
+          alias: element.alias
         });
       });
       pageContextVarOptions.value.pageVarOptions = setVarOptions(pageObject.variables);