super-page-designer 2.0.26 → 2.0.31

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

@@ -15,7 +15,7 @@ import "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import "@codemirror/search";
-import "../page-event/config.vue2.js";
+import "../page-event/config.vue.js";
 import "../../../utils/assemblys-config.js";
 import "../../../../../stores/page-store.js";
 import "../../../../../stores/event-undo-redo-store.js";
@@ -24,11 +24,12 @@ 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-tool" };
-const _hoisted_2 = { style: { "float": "right", "margin-right": "10px" } };
-const _hoisted_3 = /* @__PURE__ */ createElementVNode("label", null, "快捷添加", -1);
-const _hoisted_4 = /* @__PURE__ */ createElementVNode("label", null, "保存", -1);
-const _hoisted_5 = /* @__PURE__ */ createElementVNode("label", null, "预览", -1);
+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 _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "view-design-display",
   props: {
@@ -277,115 +278,117 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           style: normalizeStyle(contentHeightStyle.value)
         }, [
           createElementVNode("div", _hoisted_1, [
-            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_2, [
-              createElementVNode("label", {
-                class: "amb-page-type",
-                onClick: _cache[3] || (_cache[3] = ($event) => quickAdd())
+              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: 18 }, {
+                createVNode(_component_el_icon, { size: 25 }, {
                   default: withCtx(() => [
-                    createVNode(unref(Plus))
+                    createVNode(unref(Monitor))
                   ]),
                   _: 1
-                }),
-                _hoisted_3
+                })
+              ], 2), [
+                [vShow, _ctx.selAsselbyType === "assembly"]
               ]),
-              createVNode(_component_el_divider, {
-                direction: "vertical",
-                class: "amb-design-tool-split"
-              }),
-              createElementVNode("label", {
-                class: "amb-page-type",
-                onClick: _cache[4] || (_cache[4] = ($event) => saveForm())
+              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: 18 }, {
+                createVNode(_component_el_icon, { size: 23 }, {
                   default: withCtx(() => [
-                    createVNode(unref(Check))
+                    createVNode(unref(Cellphone))
                   ]),
                   _: 1
-                }),
-                _hoisted_4
+                })
+              ], 2), [
+                [vShow, _ctx.selAsselbyType === "assembly"]
               ]),
-              createVNode(_component_el_divider, {
+              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" },
-                onClick: _cache[5] || (_cache[5] = ($event) => preview())
+                style: { "margin-left": "0px" }
               }, [
-                createVNode(_component_el_icon, { size: 18 }, {
-                  default: withCtx(() => [
-                    createVNode(unref(View))
-                  ]),
-                  _: 1
+                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, [
+                createElementVNode("label", {
+                  class: "amb-page-type",
+                  onClick: _cache[3] || (_cache[3] = ($event) => quickAdd())
+                }, [
+                  createVNode(_component_el_icon, { size: 18 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Plus))
+                    ]),
+                    _: 1
+                  }),
+                  _hoisted_4
+                ]),
+                createVNode(_component_el_divider, {
+                  direction: "vertical",
+                  class: "amb-design-tool-split"
+                }),
+                createElementVNode("label", {
+                  class: "amb-page-type",
+                  onClick: _cache[4] || (_cache[4] = ($event) => saveForm())
+                }, [
+                  createVNode(_component_el_icon, { size: 18 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Check))
+                    ]),
+                    _: 1
+                  }),
+                  _hoisted_5
+                ]),
+                createVNode(_component_el_divider, {
+                  direction: "vertical",
+                  class: "amb-design-tool-split"
                 }),
-                _hoisted_5
+                createElementVNode("label", {
+                  class: "amb-page-type",
+                  style: { "margin-left": "0px" },
+                  onClick: _cache[5] || (_cache[5] = ($event) => preview())
+                }, [
+                  createVNode(_component_el_icon, { size: 18 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(View))
+                    ]),
+                    _: 1
+                  }),
+                  _hoisted_6
+                ])
               ])
             ])
           ]),

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

@@ -1,7 +1,6 @@
 import { defineComponent, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, unref } from "vue";
 import "@element-plus/icons";
 import { SuperPageNew } from "super-page-runtime";
-import { getPublishVersion } from "../../../utils/system.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "view-design-preview",
   props: {
@@ -25,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(unref(SuperPageNew), {
             pageDesign: _ctx.pageDesign,
-            publishVersion: unref(getPublishVersion),
+            publishVersion: _ctx.pageDesign.systemVersion,
             isTest: true
           }, null, 8, ["pageDesign", "publishVersion"])
         ]),

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

@@ -18,7 +18,8 @@ const usePageContextStore = defineStore("pageContextUtil", () => {
       pageContextVarOptions.value.dataOptions = [];
       pageObject.modelFields.forEach((element) => {
         pageContextVarOptions.value.dataOptions.push({
-          value: element.name,
+          value: element.dbColumnName,
+          // element.name
           label: element.alias
         });
       });