super-page-designer 2.1.49 → 2.1.55

package/dist/es/components/design/views/design/page-event/config.vue3.js

@@ -1,13 +1,14 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createElementVNode, createTextVNode, createVNode, withCtx, unref, normalizeStyle, pushScopeId, popScopeId } from "vue";
 import { useLocalStorage } from "@vueuse/core";
-import { Search } from "@element-plus/icons-vue";
+import { Search, MagicStick } from "@element-plus/icons-vue";
 import { EditorView, basicSetup } from "codemirror";
 import { javascriptLanguage, javascript } from "@codemirror/lang-javascript";
 import { EditorState } from "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import { openSearchPanel } from "@codemirror/search";
-const _withScopeId = (n) => (pushScopeId("data-v-26f79956"), n = n(), popScopeId(), n);
+import beautify from "js-beautify";
+const _withScopeId = (n) => (pushScopeId("data-v-39d5d5cf"), n = n(), popScopeId(), n);
 const _hoisted_1 = {
   style: { "padding": "8px 16px", "margin": "10px 0px", "background-color": "#f4f4f5" },
   class: "pppp"
@@ -102,13 +103,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return EditorView.theme({});
     }
     function updateJsContent(newEvent) {
+      var _a;
       const hisValue = props.eventForm.jsContent ? props.eventForm.jsContent : "";
       if (newEvent && props.eventForm) {
         if (!newEvent.jsContent) {
           newEvent.jsContent = "";
         }
         Object.assign(props.eventForm, newEvent);
-        editor.value.dispatch({
+        (_a = editor.value) == null ? void 0 : _a.dispatch({
           changes: { from: 0, to: hisValue.length, insert: props.eventForm.jsContent }
         });
       }
@@ -117,15 +119,50 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const state = getEditorState();
       editor.value = new EditorView({
         state,
-        parent: document.getElementById("cf-codemirror")
+        parent: document.getElementById("cf-codemirror") || void 0
       });
     }
     function myCompletions(context) {
-      let word = context.matchBefore(/\w*|logicContext\./);
+      let word = context.matchBefore(/\w*|window\.\$PageUtil\.|window\.|logicContext\./);
       if (word) {
-        if (word.from == word.to && !context.explicit)
-          return null;
-        if ((word == null ? void 0 : word.text) === "logicContext.") {
+        if ((word == null ? void 0 : word.text) === "window.") {
+          return {
+            from: word.from,
+            options: [
+              { label: "window.$PageUtil()", type: "property", info: "页面工具方法" },
+              { label: "window.$message()", type: "property", info: "提示信息" },
+              { label: "window.$http()", type: "property", info: "接口调用" }
+            ]
+          };
+        } else if ((word == null ? void 0 : word.text) === "window.$PageUtil.") {
+          return {
+            from: word.from,
+            options: [
+              { label: "window.$PageUtil.standardEvents", type: "function", info: "显示方法" },
+              { label: "window.$PageUtil.showElement()", type: "function", info: "显示页面中的某个组件元素" },
+              { label: "window.$PageUtil.hideElement()", type: "function", info: "隐藏页面中的某个组件元素" },
+              { label: "window.$PageUtil.enableElement()", type: "function", info: "设置组件元素可用状态" },
+              { label: "window.$PageUtil.disableElement()", type: "function", info: "禁用页面中的某个组件元素" },
+              { label: "window.$PageUtil.setEntityDataValue()", type: "function", info: "设置Data值" },
+              { label: "window.$PageUtil.setEntityPageValue()", type: "function", info: "设置页面变量值" },
+              { label: "window.$PageUtil.setEntityValueByType()", type: "function", info: "根据类型设置值" },
+              { label: "window.$PageUtil.dsiabledAllFields()", type: "function", info: "禁用所有字段" },
+              { label: "window.$PageUtil.dynamicControlFormEdit()", type: "function", info: "表单编辑权限动态控制" },
+              { label: "window.$PageUtil.dynamicControlTableEdit()", type: "function", info: "控制表格编辑权限" },
+              { label: "window.$PageUtil.openPage()", type: "function", info: "打开页面" },
+              { label: "window.$PageUtil.refreshPage()", type: "function", info: "刷新页面" },
+              { label: "window.$PageUtil.refreshSubTableHandle()", type: "function", info: "刷新表单中子表内容" },
+              { label: "window.$PageUtil.refreshChildData()", type: "function", info: "对外开放的api方法更新子表集合" },
+              {
+                label: "window.$PageUtil.getServerConfigValue()",
+                type: "function",
+                info: "根据key获得serverConfig中配置的信息"
+              },
+              { label: "window.$PageUtil.getBackendUrl()", type: "function", info: "获得当前系统的后端访问路径" },
+              { label: "window.$PageUtil.getPlateBackendUrl()", type: "function", info: "获得平台后端访问路径" }
+            ]
+          };
+        } else if ((word == null ? void 0 : word.text) === "logicContext.") {
           return {
             from: word.from,
             options: [
@@ -137,25 +174,55 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               { label: "logicContext.data", type: "property", info: "数据模型变量" }
             ]
           };
-        } else {
-          return {
-            from: word.from,
-            options: [{ label: "logicContext", type: "property" }]
-          };
         }
-      } else {
-        return null;
       }
+      return null;
     }
     function openSearch() {
       if (editor.value) {
         editor.value.focus();
         let newState = openSearchPanel(editor.value);
         if (newState) {
-          editor.value.update([transaction]);
+          editor.value.update([]);
         }
       }
     }
+    function formatCode() {
+      if (editor.value) {
+        const code = beautify.js(props.eventForm.jsContent, {
+          indent_level: 0,
+          indent_size: 2,
+          // 每级缩进的空格数
+          space_in_empty_paren: false,
+          // 是否在空括号内加空格
+          max_preserve_newlines: 2,
+          // 最多保留的换行数
+          preserve_newlines: true,
+          // 是否保留原有的换行
+          jslint_happy: false,
+          // 是否遵循 JSLint 的风格
+          keep_array_indentation: false,
+          // 是否保持数组的缩进
+          keep_function_indentation: false,
+          // 是否保持函数的缩进
+          space_before_conditional: true,
+          // 在条件语句前是否加空格
+          break_chained_methods: false,
+          // 是否断开链式调用
+          eval_code: false,
+          // 是否格式化 eval 代码
+          unescape_strings: false,
+          // 是否取消转义字符串中的特殊字符
+          wrap_line_length: 0,
+          // 每行的最大长度
+          end_with_newline: false
+          // 是否以新行结束
+        });
+        editor.value.dispatch({
+          changes: { from: 0, to: props.eventForm.jsContent.length, insert: code }
+        });
+      }
+    }
     __expose({ resize, updateJsContent });
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
@@ -318,6 +385,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               })
             ]),
             _: 1
+          }),
+          createVNode(_component_el_tooltip, {
+            class: "box-item",
+            effect: "dark",
+            content: "格式化代码",
+            placement: "top"
+          }, {
+            default: withCtx(() => [
+              createVNode(_component_el_icon, {
+                class: "editorOption",
+                onClick: formatCode
+              }, {
+                default: withCtx(() => [
+                  createVNode(unref(MagicStick))
+                ]),
+                _: 1
+              })
+            ]),
+            _: 1
           })
         ]),
         createElementVNode("div", {

package/dist/es/components/design/views/design/page-event/page-event-content.vue.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, onMounted, onUnmounted, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, withDirectives, vShow, unref, createTextVNode, toDisplayString, Fragment, renderList, createBlock } from "vue";
 import { ElMessageBox, ElMessage } from "element-plus";
-import config from "./config.vue.js";
+import config from "./config.vue2.js";
 import { standardButtonOperations } from "../../../utils/assemblys-config.js";
 import { findDesignItemByUuid, getUuidv4, deepCopy } from "../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";

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

@@ -15,7 +15,8 @@ import "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import "@codemirror/search";
-import "../page-event/config.vue2.js";
+import "js-beautify";
+import "../page-event/config.vue.js";
 import "../../../utils/assemblys-config.js";
 import "../../../../../stores/page-store.js";
 import "../../../../../stores/event-undo-redo-store.js";
@@ -163,16 +164,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function saveForm() {
       const configureCopy = JSON.parse(JSON.stringify(props.configure));
       configureCopy.tableRuntimes = {};
-      if (configureCopy.tableUuids) {
-        configureCopy.tableUuids = configureCopy.tableUuids.filter((tableUuid) => {
-          const table = findDesignItemByUuid(configureCopy, tableUuid);
-          if (table) {
-            setTableRuntimesFromConfigure(table, configureCopy);
-            return true;
-          }
-          return false;
-        });
-      }
+      beforeSaveForm(configureCopy);
       http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/save", {
         id: props.configure.id,
         designJson: JSON.stringify(configureCopy)
@@ -268,6 +260,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       (_a = i18nSettingRef.value) == null ? void 0 : _a.show();
     }
+    function beforeSaveForm(configureCopy) {
+      if (configureCopy.tableUuids) {
+        configureCopy.tableUuids = configureCopy.tableUuids.filter((tableUuid) => {
+          const table = findDesignItemByUuid(configureCopy, tableUuid);
+          if (table) {
+            setTableRuntimesFromConfigure(table, configureCopy);
+            return true;
+          }
+          return false;
+        });
+      }
+    }
     __expose({ onSelectEvent, addEvent, changeEvent });
     return (_ctx, _cache) => {
       const _component_el_icon = resolveComponent("el-icon");

package/dist/es/stores/statistics-table-store.js

@@ -8,7 +8,8 @@ const statisticsTable = defineStore("statisticsTable", () => {
       arr.push({
         value: item.props.base.prop,
         label: item.props.base.name,
-        alias: item.props.base.name
+        alias: item.props.base.name,
+        dataType: item.props.base.dataType
       });
     });
     columnList.value = arr;

package/dist/es/style.css

@@ -1292,10 +1292,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-.el-select__wrapper.is-disabled{
-		cursor: default;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -3768,6 +3764,10 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+.el-select__wrapper.is-disabled{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -4386,10 +4386,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
-		cursor: default;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -5008,6 +5004,10 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -9334,56 +9334,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-/*不显示列样式*/
-.hiddenBorder {
-  border-right: solid 1px #ebebeb !important;
-  border-left: solid 1px #ebebeb !important;
-  background-color: #ebebeb !important;
-}
-/*选中列样式*/
-.addBorder {
-  border-right: solid 1px #5893ef !important;
-  border-left: solid 1px #5893ef !important;
-  background-color: #5893ef !important;
-  color: #ffffff;
-}
-.ghost {
-  opacity: 0.5;
-  background: #c8ebfb;
-}
-
-li[data-v-5581ec9f] {
-  color: #333;
-}
-.context-menu[data-v-5581ec9f] {
-  position: fixed;
-  background: #fff;
-  z-index: 999;
-  padding: 5px;
-  margin: 0;
-  margin-top: 30px;
-}
-.context-menu li[data-v-5581ec9f] {
-  min-width: 75px;
-  height: 28px;
-  line-height: 28px;
-  text-align: left;
-  color: #1a1a1a;
-  cursor: pointer;
-}
-.context-menu li[data-v-5581ec9f]:hover {
-  background: #5893ef;
-  color: #fff;
-}
-.context-menu[data-v-5581ec9f] {
-  border: 1px solid #eee;
-  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
-  border-radius: 5px;
-}
-li[data-v-5581ec9f] {
-  list-style-type: none;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -10002,6 +9952,56 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+/*不显示列样式*/
+.hiddenBorder {
+  border-right: solid 1px #ebebeb !important;
+  border-left: solid 1px #ebebeb !important;
+  background-color: #ebebeb !important;
+}
+/*选中列样式*/
+.addBorder {
+  border-right: solid 1px #5893ef !important;
+  border-left: solid 1px #5893ef !important;
+  background-color: #5893ef !important;
+  color: #ffffff;
+}
+.ghost {
+  opacity: 0.5;
+  background: #c8ebfb;
+}
+
+li[data-v-5581ec9f] {
+  color: #333;
+}
+.context-menu[data-v-5581ec9f] {
+  position: fixed;
+  background: #fff;
+  z-index: 999;
+  padding: 5px;
+  margin: 0;
+  margin-top: 30px;
+}
+.context-menu li[data-v-5581ec9f] {
+  min-width: 75px;
+  height: 28px;
+  line-height: 28px;
+  text-align: left;
+  color: #1a1a1a;
+  cursor: pointer;
+}
+.context-menu li[data-v-5581ec9f]:hover {
+  background: #5893ef;
+  color: #fff;
+}
+.context-menu[data-v-5581ec9f] {
+  border: 1px solid #eee;
+  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+}
+li[data-v-5581ec9f] {
+  list-style-type: none;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -16182,10 +16182,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-[data-v-bab42532] .el-form-item__label {
-  padding: 0;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -17441,10 +17437,10 @@ fieldset.amb-design-item-selected {
   background: #c8ebfb;
 }
 
-li[data-v-a74e7ce8] {
+li[data-v-a555cba7] {
   color: #333;
 }
-.context-menu[data-v-a74e7ce8] {
+.context-menu[data-v-a555cba7] {
   position: fixed;
   background: #fff;
   z-index: 999;
@@ -17452,7 +17448,7 @@ li[data-v-a74e7ce8] {
   margin: 0;
   margin-top: 30px;
 }
-.context-menu li[data-v-a74e7ce8] {
+.context-menu li[data-v-a555cba7] {
   min-width: 75px;
   height: 28px;
   line-height: 28px;
@@ -17460,19 +17456,23 @@ li[data-v-a74e7ce8] {
   color: #1a1a1a;
   cursor: pointer;
 }
-.context-menu li[data-v-a74e7ce8]:hover {
+.context-menu li[data-v-a555cba7]:hover {
   background: #5893ef;
   color: #fff;
 }
-.context-menu[data-v-a74e7ce8] {
+.context-menu[data-v-a555cba7] {
   border: 1px solid #eee;
   box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
   border-radius: 5px;
 }
-li[data-v-a74e7ce8] {
+li[data-v-a555cba7] {
   list-style-type: none;
 }
 
+[data-v-bab42532] .el-form-item__label {
+  padding: 0;
+}
+
 .amb-design-attr-header[data-v-226997f7] {
   position: sticky;
   position: -webkit-sticky;
@@ -17499,7 +17499,7 @@ li[data-v-a74e7ce8] {
   color: #ffffff;
 }
 
-.seleteSort[data-v-931f64e3] {
+.seleteSort[data-v-727aa6f0] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
@@ -17511,6 +17511,28 @@ li[data-v-a74e7ce8] {
   padding-bottom: 5px;
 }
 
+.seleteSort[data-v-8aacbe0c] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
+}
+
+[data-v-3528c938] .el-cascader-menu {
+  min-width: 120px !important;
+}
+
+.editorTool[data-v-39d5d5cf] {
+  margin-left: auto;
+}
+.editorOption[data-v-39d5d5cf] {
+  margin-right: 10px;
+  cursor: pointer;
+}
+.pppp[data-v-39d5d5cf] {
+  display: flex; /* 使用Flex布局 */
+  justify-content: flex-start;
+  align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
+}
+
 .icon-set-center-body[data-v-181d1ce8]{
 	display: grid;
 	grid-template-columns:repeat(5,1fr);
@@ -17548,28 +17570,6 @@ li[data-v-a74e7ce8] {
 	margin-bottom: 20px;
 }
 
-[data-v-8d11abea] .el-cascader-menu {
-  min-width: 120px !important;
-}
-
-.editorTool[data-v-26f79956] {
-  margin-left: auto;
-}
-.editorOption[data-v-26f79956] {
-  margin-right: 10px;
-  cursor: pointer;
-}
-.pppp[data-v-26f79956] {
-  display: flex; /* 使用Flex布局 */
-  justify-content: flex-start;
-  align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
-}
-
-.seleteSort[data-v-8aacbe0c] {
-  border-radius: 5px;
-  border: 1px solid rgba(88, 147, 239);
-}
-
 .seleteSort[data-v-1dada466] {
 	border-radius: 5px;
 	border: 1px solid rgba(88, 147, 239);
@@ -17578,18 +17578,15 @@ li[data-v-a74e7ce8] {
 	display: inline-block;
 }
 
-.stateBtn[data-v-ae2798fb]{
-	display: flex;
-}
-.stateText[data-v-ae2798fb]{
-	margin-left: 10px;
-	color: #7b7b7b;
+.seleteSort[data-v-3336d6c5] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
 }
 
-li[data-v-74ebe0ac] {
+li[data-v-4fd4369c] {
   color: #333;
 }
-.context-menu[data-v-74ebe0ac] {
+.context-menu[data-v-4fd4369c] {
   position: fixed;
   background: #fff;
   z-index: 999;
@@ -17597,7 +17594,7 @@ li[data-v-74ebe0ac] {
   margin: 0;
   margin-top: 30px;
 }
-.context-menu li[data-v-74ebe0ac] {
+.context-menu li[data-v-4fd4369c] {
   min-width: 75px;
   height: 28px;
   line-height: 28px;
@@ -17610,44 +17607,47 @@ li[data-v-74ebe0ac] {
 /*  background: #5893ef;*/
 /*  color: #fff;*/
 /*}*/
-.context-menuLi[data-v-74ebe0ac]:hover {
+.context-menuLi[data-v-4fd4369c]:hover {
   background: #5893ef;
   color: #fff;
 }
-.context-menu[data-v-74ebe0ac] {
+.context-menu[data-v-4fd4369c] {
   border: 1px solid #eee;
   box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
   border-radius: 5px;
 }
-li[data-v-74ebe0ac] {
+li[data-v-4fd4369c] {
   list-style-type: none;
 }
 
-.row-backgroud-header-tittle[data-v-b203475d]{
-	display: flex;
-	justify-content: space-between;
-	text-align: center
+.stateBtn[data-v-ae2798fb]{
+	display: flex;
 }
-.row-backgroud-header-tittle > div[data-v-b203475d]{
-	width: 100%
+.stateText[data-v-ae2798fb]{
+	margin-left: 10px;
+	color: #7b7b7b;
 }
 
 .el-tag[data-v-665d3bf4]{
 	margin-left: 10px;
 }
 
-.seleteSort[data-v-a8c75465] {
-  border-radius: 5px;
-  border: 1px solid rgba(88, 147, 239);
+[data-v-1aa6f1ab] .centered-input .el-input__inner {
+  text-align: center;
 }
 
-.seleteSort[data-v-ccdcf268] {
+.seleteSort[data-v-a62867e0] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
 
-[data-v-1aa6f1ab] .centered-input .el-input__inner {
-  text-align: center;
+.row-backgroud-header-tittle[data-v-b203475d]{
+	display: flex;
+	justify-content: space-between;
+	text-align: center
+}
+.row-backgroud-header-tittle > div[data-v-b203475d]{
+	width: 100%
 }
 
 .input-with-select .el-input-group__append {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-designer",
-  "version": "2.1.49",
+  "version": "2.1.55",
   "description": "AgileBuilder super page designer",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -28,18 +28,19 @@
     "@logicflow/layout": "1.2.0-alpha.16",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vueuse/core": "^10.9.0",
-    "agilebuilder-ui": "1.0.83",
+    "agilebuilder-ui": "1.0.87",
     "echarts": "^5.5.0",
     "element-plus": "^2.6.1",
     "font-awesome": "^4.7.0",
+    "js-beautify": "^1.15.1",
     "jsbarcode": "^3.11.6",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
     "pinia": "^2.1.7",
     "qrcode": "^1.5.3",
     "quill": "^2.0.1",
-    "service-flow-designer": "2.1.46",
-    "super-page-runtime": "2.1.48",
+    "service-flow-designer": "2.1.53",
+    "super-page-runtime": "2.1.54",
     "uuid": "^9.0.1",
     "vite": "^5.1.6",
     "vite-plugin-node-stdlib-browser": "^0.2.1",
@@ -50,7 +51,7 @@
     "vue-echarts": "^6.6.9",
     "vue-router": "^4.3.0",
     "vuex": "^4.1.0",
-    "workflow-editor": "0.0.44-up"
+    "workflow-editor": "0.0.45-up"
   },
   "devDependencies": {
     "@codemirror/autocomplete": "^6.16.0",