super-page-designer 2.0.79 → 2.0.83

package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js

@@ -64,16 +64,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       operationArr.value.push([]);
     }
     function afterBindDefaultValue(modelValue, row) {
-      row.defaultValue = modelValue;
+      row.propValue = modelValue;
     }
-    function changeFieldName(index, propName) {
+    function changeFieldName(index, row, propDbName) {
       console.log("%c描述-164035", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.fieldMap);
-      const item = props.fieldMap[propName];
+      const item = props.fieldMap[propDbName];
       if (item.type === "date") {
         tableData.value[index].isData = true;
       } else {
         tableData.value[index].isData = false;
       }
+      row.propName = item.name;
+      row.dataType = item.dataType;
       operationArr.value[index] = getOperators(item);
     }
     function savebuttonSetting() {
@@ -231,11 +233,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx((scope) => [
                   createVNode(_component_el_select, {
-                    modelValue: scope.row.propName,
-                    "onUpdate:modelValue": ($event) => scope.row.propName = $event,
+                    modelValue: scope.row.propDbName,
+                    "onUpdate:modelValue": ($event) => scope.row.propDbName = $event,
                     clearable: "",
                     size: "default",
-                    onChange: ($event) => changeFieldName(scope.$index, scope.row.propName)
+                    onChange: ($event) => changeFieldName(scope.$index, scope.row, scope.row.propDbName)
                   }, {
                     default: withCtx(() => [
                       (openBlock(true), createElementBlock(Fragment, null, renderList(__props.fieldNameList, (item, index) => {
@@ -285,7 +287,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 default: withCtx((scope) => [
                   createVNode(BindVariable, {
                     size: "default",
-                    modelValue: scope.row.defaultValue,
+                    modelValue: scope.row.propValue,
                     "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
                   }, null, 8, ["modelValue", "onUpdate:modelValue"])
                 ]),

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

@@ -88,6 +88,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const systemVersion = pageDesign2.tableSysVersion ? pageDesign2.tableSysVersion : pageDesign2.systemVersion;
         queryTableFields(systemCode, systemVersion, pageDesign2.tableName).then((tableFields) => {
           pageDesign2.modelFields = tableFields;
+          pageDesign2.modelFieldsMap = {};
+          tableFields.forEach((item) => {
+            pageDesign2.modelFieldsMap[item.dbColumnName] = item;
+          });
           pageDesignUtil.setPageContext(pageDesign2);
         });
       }

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

@@ -2,7 +2,7 @@ import { defineComponent, ref, onMounted, onUnmounted, watch, resolveComponent,
 import { ElMessageBox, ElMessage } from "element-plus";
 import config from "./config.vue2.js";
 import { standardButtonOperations } from "../../../utils/assemblys-config.js";
-import { getUuidv4, deepCopy } from "../../../utils/common-util.js";
+import { findDesignItemByUuid, getUuidv4, deepCopy } from "../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
 import { undoRedo } from "../../../../../stores/event-undo-redo-store.js";
 import eventBus from "../../../utils/eventBus.js";
@@ -151,21 +151,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const tempObj = tempEvent.value;
       let hisEvent = null;
-      for (let e of pageDesign.customEvents) {
-        if (tempObj.name == "customFunc") {
+      let currentEventIndex = -1;
+      for (let index = 0; index < pageDesign.customEvents.length; index++) {
+        const e = pageDesign.customEvents[index];
+        if (tempObj.name === "customFunc") {
           if (e.uuid == tempObj.uuid) {
             hisEvent = e;
+            currentEventIndex = index;
             break;
           }
         } else {
           if (e.componentUuid == tempObj.componentUuid && e.name == tempObj.name) {
             hisEvent = e;
+            currentEventIndex = index;
             break;
           }
         }
       }
       if (hisEvent) {
         Object.assign(hisEvent, tempObj);
+        pageDesign.customEvents[currentEventIndex] = hisEvent;
+        if (hisEvent.name !== "customFunc" && hisEvent.componentUuid) {
+          const itemConfig = findDesignItemByUuid(pageDesign, hisEvent.componentUuid);
+          if (itemConfig && itemConfig.events) {
+            const eventIndex = itemConfig.events.findIndex(
+              (e) => e.name == hisEvent.name && e.componentUuid == hisEvent.componentUuid
+            );
+            if (eventIndex > -1) {
+              itemConfig.events[eventIndex] = hisEvent;
+            }
+          }
+        }
       } else {
         Object.assign(editEvent.value, tempObj);
         pageDesign.customEvents.push(editEvent.value);
@@ -280,12 +296,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               event2.remark = "";
               event2.standardValues = [];
               pageDesign.customEvents.splice(i, 1);
+              deleteComponentEvent(tempObj);
               break;
             }
           }
         }
       }
     }
+    function deleteComponentEvent(event) {
+      const pageDesign = pageDesignUtil.pageContext;
+      const itemConfig = findDesignItemByUuid(pageDesign, event.componentUuid);
+      if (itemConfig && itemConfig.events) {
+        const eventIndex = itemConfig.events.findIndex(
+          (e) => e.name == event.name && e.componentUuid == event.componentUuid
+        );
+        if (eventIndex > -1) {
+          itemConfig.events.splice(eventIndex, 1);
+        }
+      }
+    }
     function validateBeforeSave() {
       const tempObj = tempEvent.value;
       if (!tempObj.isStandard) {

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

@@ -35,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cacheComponent = {};
     function changeAssembly(configure) {
       console.log("%c描述-103213", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", configure);
-      if (!configure || !configure.name || configure.name == "page") {
+      if (!configure || !configure.name || configure.name === "page") {
         dynamicConfigure.value = props.pageInfo;
         dynamicComponent.value = _sfc_main$1;
       } else {

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

@@ -1,7 +1,7 @@
 import _sfc_main from "./page-switch.vue2.js";
 /* empty css                 */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const PageSwitch = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a7c905da"]]);
+const PageSwitch = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-56a8e877"]]);
 export {
   PageSwitch as default
 };

package/dist/es/components/design/views/design/view/page-switch.vue2.js

@@ -111,10 +111,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           reference: withCtx(() => [
             createVNode(_component_el_button, {
-              color: "#eee",
               icon: unref(Operation),
-              style: { "width": "150px", "font-size": "14px", "font-weight": "600" },
-              type: "primary"
+              style: { "width": "150px", "font-size": "14px", "font-weight": "600" }
             }, {
               default: withCtx(() => [
                 createTextVNode(toDisplayString(__props.pageDesign.label + "(" + __props.pageDesign.version + ")") + " ", 1),

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

@@ -6,7 +6,7 @@ import { deepCopy, getUuidv4, findDesignItemByUuid } from "../../../utils/common
 import { addComponentRef } from "../../../utils/page-helper-util.js";
 import { caculatePageStyle } from "../../../utils/container-design-util.js";
 import _sfc_main$2 from "./view-design-preview.vue.js";
-import { ElMessageBox, ElMessage } from "element-plus";
+import { ElMessage } from "element-plus";
 import "@vueuse/core";
 import "@element-plus/icons-vue";
 import "codemirror";
@@ -23,6 +23,7 @@ import "../../../utils/eventBus.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";
+import { deleteDesignItem } from "../../../utils/page-design-util.js";
 const _hoisted_1 = { class: "amb-design-content-center-header" };
 const _hoisted_2 = { class: "amb-design-tool" };
 const _hoisted_3 = { class: "amb-design-tool-item" };
@@ -141,25 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageItems.splice(index, 0, copyObj);
     }
     function deleteItem(sourceItem) {
-      if (sourceItem.items && sourceItem.items.length > 0) {
-        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          _deleteItem(sourceItem);
-        }).catch((err) => {
-          console.log(err);
-        });
-      } else {
-        _deleteItem(sourceItem);
-      }
-    }
-    function _deleteItem(sourceItem) {
-      const index = pageItems.indexOf(sourceItem);
-      if (index > -1) {
-        pageItems.splice(index, 1);
-      }
+      deleteDesignItem(pageItems, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     const pageDesignBoardMain = ref(null);
     useDraggable(pageDesignBoardMain, pageItems, {

package/dist/es/style.css

@@ -672,7 +672,7 @@ fieldset.amb-design-item-selected {
   align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
 }
 
-[data-v-e29e733a] .el-cascader-menu {
+[data-v-468275d2] .el-cascader-menu {
   min-width: 120px !important;
 }
 
@@ -684,19 +684,19 @@ fieldset.amb-design-item-selected {
 }
 
 /* 定义滚动条的轨道 */
-[data-v-a7c905da]::-webkit-scrollbar {
+[data-v-56a8e877]::-webkit-scrollbar {
   height: 6px;
   width: 6px; /* 宽度 */
 }
 
 /* 定义滑块 */
-[data-v-a7c905da]::-webkit-scrollbar-thumb {
+[data-v-56a8e877]::-webkit-scrollbar-thumb {
   background-color: darkgrey; /* 滑块颜色 */
   border-radius: 5px; /* 圆角 */
 }
 
 /* 当滑块hover时改变颜色 */
-[data-v-a7c905da]::-webkit-scrollbar-thumb:hover {
+[data-v-56a8e877]::-webkit-scrollbar-thumb:hover {
   background-color: grey;
 }
 
@@ -1349,7 +1349,7 @@ fieldset.amb-design-item-selected {
 		cursor: default;
 }
 
-.seleteSort[data-v-f1c21952] {
+.seleteSort[data-v-e6c84ad9] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
@@ -9460,10 +9460,10 @@ fieldset.amb-design-item-selected {
   background: #c8ebfb;
 }
 
-li[data-v-fdf0b268] {
+li[data-v-f6500856] {
   color: #333;
 }
-.context-menu[data-v-fdf0b268] {
+.context-menu[data-v-f6500856] {
   position: fixed;
   background: #fff;
   z-index: 999;
@@ -9471,7 +9471,7 @@ li[data-v-fdf0b268] {
   margin: 0;
   margin-top: 30px;
 }
-.context-menu li[data-v-fdf0b268] {
+.context-menu li[data-v-f6500856] {
   min-width: 75px;
   height: 28px;
   line-height: 28px;
@@ -9479,16 +9479,16 @@ li[data-v-fdf0b268] {
   color: #1a1a1a;
   cursor: pointer;
 }
-.context-menu li[data-v-fdf0b268]:hover {
+.context-menu li[data-v-f6500856]:hover {
   background: #5893ef;
   color: #fff;
 }
-.context-menu[data-v-fdf0b268] {
+.context-menu[data-v-f6500856] {
   border: 1px solid #eee;
   box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
   border-radius: 5px;
 }
-li[data-v-fdf0b268] {
+li[data-v-f6500856] {
   list-style-type: none;
 }
 
@@ -9500,7 +9500,7 @@ li[data-v-fdf0b268] {
 	color: #7b7b7b;
 }
 
-.seleteSort[data-v-0f08e3d1] {
+.seleteSort[data-v-9388107f] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
@@ -9550,6 +9550,11 @@ li[data-v-b436905c] {
 .row-backgroud-header-tittle > div[data-v-b203475d]{
 	width: 100%
 }
+
+.seleteSort[data-v-3560b979] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
+}
 .el-tree-node__content {
   height: 34px !important;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-designer",
-  "version": "2.0.79",
+  "version": "2.0.83",
   "description": "AgileBuilder super page designer",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -28,7 +28,7 @@
     "@logicflow/layout": "1.2.0-alpha.16",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vueuse/core": "^10.9.0",
-    "agilebuilder-ui": "1.0.55",
+    "agilebuilder-ui": "1.0.57",
     "echarts": "^5.5.0",
     "element-plus": "^2.6.1",
     "font-awesome": "^4.7.0",
@@ -38,8 +38,8 @@
     "pinia": "^2.1.7",
     "qrcode": "^1.5.3",
     "quill": "^2.0.1",
-    "service-flow-designer": "2.0.77",
-    "super-page-runtime": "2.0.76",
+    "service-flow-designer": "2.0.81",
+    "super-page-runtime": "2.0.81",
     "uuid": "^9.0.1",
     "vite": "^5.1.6",
     "vite-plugin-node-stdlib-browser": "^0.2.1",