super-page-designer 2.1.41 → 2.1.47

package/dist/es/components/design/views/assemblys/page/page-attr-base.vue.js

@@ -2,14 +2,17 @@ import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx
 import { Search, Close, Setting } from "@element-plus/icons";
 import _sfc_main$1 from "../common/common-select-table.vue.js";
 import _sfc_main$2 from "./variable-dialog.vue.js";
+import _sfc_main$3 from "./create-workflow-dialog.vue.js";
 import { queryTableFields, changeFeieldToMap } from "../../../utils/page-table-util.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
 import { queryWorkflowsRequest, createWorkflowRequest } from "../../../utils/page-design-util.js";
+import { ElMessageBox } from "element-plus";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_3 = { style: { "padding": "8px 0px 0px 0px" } };
-const _hoisted_4 = { style: { "float": "left" } };
-const _hoisted_5 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
+const _hoisted_4 = { key: 0 };
+const _hoisted_5 = { style: { "float": "left" } };
+const _hoisted_6 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "page-attr-base",
   props: {
@@ -31,6 +34,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const workflows = ref([]);
     const linkWorkflowCode = props.configure.props.linkWorkflowCode ? props.configure.props.linkWorkflowCode : null;
     const linkWorkflowCodeInfo = ref(linkWorkflowCode);
+    const isCreateWorkflow = ref(false);
+    const activeWorkflow = ref(props.configure.props.activeWorkflow);
     function selectWorkflow(value) {
       linkWorkflowCodeInfo.value = value;
       if (value && value.indexOf(":") > 0) {
@@ -123,19 +128,47 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     changeWorkflowSource(props.configure.props ? props.configure.props.workflowSource : null);
     function createWorkflow() {
-      createWorkflowRequest(
-        props.configure.tableName,
-        props.configure.label,
-        props.configure.systemCode,
-        props.configure.systemVersion
-      ).then((definition) => {
-        if (definition) {
-          props.configure.props.createWorkflowCode = definition.code;
-          props.configure.props.createWorkflowName = definition.name;
-          props.configure.workflowCode = props.configure.props.createWorkflowCode;
-          props.configure.workflowVersion = definition.definitionVersion;
-        }
-      });
+      isCreateWorkflow.value = true;
+    }
+    function onCloseCreateWorkflowDialog(workflowInfo) {
+      if (workflowInfo) {
+        createWorkflowRequest(
+          props.configure.tableName,
+          props.configure.systemCode,
+          props.configure.systemVersion,
+          workflowInfo.code,
+          workflowInfo.name
+        ).then((definition) => {
+          if (definition) {
+            props.configure.props.createWorkflowCode = definition.code;
+            props.configure.props.createWorkflowName = definition.name;
+            props.configure.workflowCode = props.configure.props.createWorkflowCode;
+            props.configure.workflowVersion = definition.definitionVersion;
+          }
+          isCreateWorkflow.value = false;
+        });
+      } else {
+        isCreateWorkflow.value = false;
+      }
+    }
+    function changeActiveWorkflowState(newVal) {
+      const isActive = activeWorkflow.value;
+      if (isActive) {
+        ElMessageBox.confirm("开启流程后所有字段的必填验证配置会被取消，以流程图设置中的为准，确定开启吗?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          console.log("确定开启!!");
+          props.configure.props.activeWorkflow = true;
+        }).catch((err) => {
+          console.log("取消开启!!");
+          activeWorkflow.value = false;
+          props.configure.props.activeWorkflow = false;
+        });
+      } else {
+        props.configure.props.activeWorkflow = false;
+      }
     }
     return (_ctx, _cache) => {
       const _component_el_text = resolveComponent("el-text");
@@ -392,8 +425,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_switch, {
-                          modelValue: _ctx.configure.props.activeWorkflow,
-                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => _ctx.configure.props.activeWorkflow = $event)
+                          modelValue: activeWorkflow.value,
+                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => activeWorkflow.value = $event),
+                          onChange: changeActiveWorkflowState
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -422,14 +456,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 1
                             }),
-                            createElementVNode("span", null, [
+                            _ctx.configure.props.workflowSource && _ctx.configure.props.workflowSource === "create" ? (openBlock(), createElementBlock("span", _hoisted_4, [
                               createVNode(_component_el_button, { onClick: createWorkflow }, {
                                 default: withCtx(() => [
                                   createTextVNode("新增")
                                 ]),
                                 _: 1
                               })
-                            ])
+                            ])) : createCommentVNode("", true)
                           ]),
                           _: 1
                         }, 8, ["modelValue"])
@@ -455,8 +489,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                 value: item.code
                               }, {
                                 default: withCtx(() => [
-                                  createElementVNode("span", _hoisted_4, toDisplayString(item.name), 1),
-                                  createElementVNode("span", _hoisted_5, toDisplayString(item.code), 1)
+                                  createElementVNode("span", _hoisted_5, toDisplayString(item.name), 1),
+                                  createElementVNode("span", _hoisted_6, toDisplayString(item.code), 1)
                                 ]),
                                 _: 2
                               }, 1032, ["label", "value"]);
@@ -516,7 +550,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ref: refVariableDialog,
             pageDesign: _ctx.configure,
             onClose: onCloseVariableDialog
-          }, null, 8, ["pageDesign"])
+          }, null, 8, ["pageDesign"]),
+          isCreateWorkflow.value ? (openBlock(), createBlock(_sfc_main$3, {
+            key: 0,
+            pageDesign: _ctx.configure,
+            onClose: onCloseCreateWorkflowDialog
+          }, null, 8, ["pageDesign"])) : createCommentVNode("", true)
         ]),
         _: 1
       });

package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.js

@@ -297,7 +297,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           newColumn.props.base.querySettingName = f.querySettingName;
           newColumn.props.base.exportable = f.exportable;
           if (f.align) {
-            newColumn.props.base.alignTittle = f.align;
+            newColumn.props.base.alignTitle = f.align;
           }
           newColumn.props.base.prop = f.fieldName;
           if (f.componentName) {

package/dist/es/style.css

@@ -674,6 +674,10 @@ fieldset.amb-design-item-selected {
 [data-v-511b453b]::-webkit-scrollbar-thumb:hover {
   background-color: grey;
 }
+
+.el-select__wrapper.is-disabled{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -2528,10 +2532,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;
 }
@@ -4387,7 +4387,7 @@ fieldset.amb-design-item-selected {
   font-weight: bold;
 }
 
-.el-select__wrapper.is-disabled{
+.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
 		cursor: default;
 }
 .el-tree-node__content {
@@ -9334,6 +9334,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;
 }
@@ -9952,56 +10002,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-828b46d0] {
-  color: #333;
-}
-.context-menu[data-v-828b46d0] {
-  position: fixed;
-  background: #fff;
-  z-index: 999;
-  padding: 5px;
-  margin: 0;
-  margin-top: 30px;
-}
-.context-menu li[data-v-828b46d0] {
-  min-width: 75px;
-  height: 28px;
-  line-height: 28px;
-  text-align: left;
-  color: #1a1a1a;
-  cursor: pointer;
-}
-.context-menu li[data-v-828b46d0]:hover {
-  background: #5893ef;
-  color: #fff;
-}
-.context-menu[data-v-828b46d0] {
-  border: 1px solid #eee;
-  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
-  border-radius: 5px;
-}
-li[data-v-828b46d0] {
-  list-style-type: none;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -16182,9 +16182,55 @@ 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;
+}
 
-[data-v-d87986ba] .el-form-item__label{
-	padding: 0;
+li[data-v-a74e7ce8] {
+  color: #333;
+}
+.context-menu[data-v-a74e7ce8] {
+  position: fixed;
+  background: #fff;
+  z-index: 999;
+  padding: 5px;
+  margin: 0;
+  margin-top: 30px;
+}
+.context-menu li[data-v-a74e7ce8] {
+  min-width: 75px;
+  height: 28px;
+  line-height: 28px;
+  text-align: left;
+  color: #1a1a1a;
+  cursor: pointer;
+}
+.context-menu li[data-v-a74e7ce8]:hover {
+  background: #5893ef;
+  color: #fff;
+}
+.context-menu[data-v-a74e7ce8] {
+  border: 1px solid #eee;
+  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+}
+li[data-v-a74e7ce8] {
+  list-style-type: none;
 }
 .el-tree-node__content {
   height: 34px !important;
@@ -16804,6 +16850,10 @@ 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;
 }
@@ -17422,56 +17472,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-ad6b7f2d] {
-  color: #333;
-}
-.context-menu[data-v-ad6b7f2d] {
-  position: fixed;
-  background: #fff;
-  z-index: 999;
-  padding: 5px;
-  margin: 0;
-  margin-top: 30px;
-}
-.context-menu li[data-v-ad6b7f2d] {
-  min-width: 75px;
-  height: 28px;
-  line-height: 28px;
-  text-align: left;
-  color: #1a1a1a;
-  cursor: pointer;
-}
-.context-menu li[data-v-ad6b7f2d]:hover {
-  background: #5893ef;
-  color: #fff;
-}
-.context-menu[data-v-ad6b7f2d] {
-  border: 1px solid #eee;
-  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
-  border-radius: 5px;
-}
-li[data-v-ad6b7f2d] {
-  list-style-type: none;
-}
 
 .amb-design-attr-header[data-v-226997f7] {
   position: sticky;
@@ -17499,7 +17499,7 @@ li[data-v-ad6b7f2d] {
   color: #ffffff;
 }
 
-.seleteSort[data-v-1acd1467] {
+.seleteSort[data-v-931f64e3] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
@@ -17528,11 +17528,6 @@ li[data-v-ad6b7f2d] {
   align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
 }
 
-.seleteSort[data-v-27806549] {
-  border-radius: 5px;
-  border: 1px solid rgba(88, 147, 239);
-}
-
 .icon-set-center-body[data-v-181d1ce8]{
 	display: grid;
 	grid-template-columns:repeat(5,1fr);
@@ -17570,12 +17565,22 @@ li[data-v-ad6b7f2d] {
 	margin-bottom: 20px;
 }
 
-.seleteSort[data-v-1dada466] {
-	border-radius: 5px;
-	border: 1px solid rgba(88, 147, 239);
+.seleteSort[data-v-8aacbe0c] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
+}
+
+.seleteSort[data-v-a8c75465] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
+}
+
+.stateBtn[data-v-ae2798fb]{
+	display: flex;
 }
-[data-v-1dada466] .el-select__selection{
-	display: inline-block;
+.stateText[data-v-ae2798fb]{
+	margin-left: 10px;
+	color: #7b7b7b;
 }
 
 li[data-v-74ebe0ac] {
@@ -17615,17 +17620,12 @@ li[data-v-74ebe0ac] {
   list-style-type: none;
 }
 
-.seleteSort[data-v-a8c75465] {
-  border-radius: 5px;
-  border: 1px solid rgba(88, 147, 239);
-}
-
-.stateBtn[data-v-ae2798fb]{
-	display: flex;
+.seleteSort[data-v-1dada466] {
+	border-radius: 5px;
+	border: 1px solid rgba(88, 147, 239);
 }
-.stateText[data-v-ae2798fb]{
-	margin-left: 10px;
-	color: #7b7b7b;
+[data-v-1dada466] .el-select__selection{
+	display: inline-block;
 }
 
 .row-backgroud-header-tittle[data-v-b203475d]{
@@ -17641,7 +17641,7 @@ li[data-v-74ebe0ac] {
 	margin-left: 10px;
 }
 
-.seleteSort[data-v-7143edf0] {
+.seleteSort[data-v-ccdcf268] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-designer",
-  "version": "2.1.41",
+  "version": "2.1.47",
   "description": "AgileBuilder super page designer",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -28,8 +28,7 @@
     "@logicflow/layout": "1.2.0-alpha.16",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vueuse/core": "^10.9.0",
-    "agilebuilder-private-libs": "1.0.26",
-    "agilebuilder-ui": "1.0.76",
+    "agilebuilder-ui": "1.0.83",
     "echarts": "^5.5.0",
     "element-plus": "^2.6.1",
     "font-awesome": "^4.7.0",
@@ -39,8 +38,8 @@
     "pinia": "^2.1.7",
     "qrcode": "^1.5.3",
     "quill": "^2.0.1",
-    "service-flow-designer": "2.1.39",
-    "super-page-runtime": "2.1.40",
+    "service-flow-designer": "2.1.46",
+    "super-page-runtime": "2.1.45",
     "uuid": "^9.0.1",
     "vite": "^5.1.6",
     "vite-plugin-node-stdlib-browser": "^0.2.1",