super-page-designer 2.0.78 → 2.0.82

package/dist/es/components/design/utils/assemblys-config.js

@@ -1,5 +1,5 @@
 import { defineAsyncComponent } from "vue";
-import { getUuidv4, deepCopy } from "./common-util.js";
+import { deepCopy, getUuidv4 } from "./common-util.js";
 import groupContainer from "../../../assets/images/group-container.png.js";
 import containerForm from "../../../assets/images/container/container-form.png.js";
 import containerFLex from "../../../assets/images/container/container-flex.png.js";
@@ -46,7 +46,7 @@ import formCustom from "../../../assets/images/form/form-custom.png.js";
 import barcode from "../../../assets/images/data/barcode.png.js";
 import workflowHistoryImg from "../../../assets/images/workflow/workflow-history-img.png.js";
 const tableOperateColumnConf = {
-  uuid: getUuidv4(),
+  uuid: "",
   name: "",
   props: {
     base: {
@@ -104,7 +104,7 @@ const tableOperateColumnConf = {
   }
 };
 const tableIndexColumnConf = {
-  uuid: getUuidv4(),
+  uuid: "",
   name: "",
   props: {
     base: {
@@ -161,7 +161,7 @@ const tableIndexColumnConf = {
   }
 };
 const tableSelectionColumnConf = {
-  uuid: getUuidv4(),
+  uuid: "",
   name: "",
   props: {
     base: {
@@ -216,9 +216,14 @@ const tableSelectionColumnConf = {
     tittleClass: ""
   }
 };
+function getCopyColumn(columnConf) {
+  let copyColumn = deepCopy(columnConf);
+  copyColumn.uuid = getUuidv4();
+  return copyColumn;
+}
 function getTableColumnConf(fieldInfo) {
-  return {
-    uuid: getUuidv4(),
+  const columnConf = {
+    uuid: "",
     isTable: true,
     // 是否是表格组件
     name: "",
@@ -274,6 +279,7 @@ function getTableColumnConf(fieldInfo) {
       tittleClass: ""
     }
   };
+  return getCopyColumn(columnConf);
 }
 const assemblyGroups = [{
   name: "container",
@@ -1236,9 +1242,9 @@ const assemblyGroups = [{
       }
     ],
     items: [
-      tableSelectionColumnConf,
-      tableIndexColumnConf,
-      tableOperateColumnConf
+      getTableSelectionConf(),
+      getTableIndexConf(),
+      getTableOperateConf()
     ],
     modelFields: [],
     props: {
@@ -2479,19 +2485,13 @@ function getPageConf() {
   return tempConf;
 }
 function getTableOperateConf() {
-  const conf = deepCopy(tableOperateColumnConf);
-  conf.uuid = getUuidv4();
-  return conf;
+  return getCopyColumn(tableOperateColumnConf);
 }
 function getTableIndexConf() {
-  const conf = deepCopy(tableIndexColumnConf);
-  conf.uuid = getUuidv4();
-  return conf;
+  return getCopyColumn(tableIndexColumnConf);
 }
 function getTableSelectionConf() {
-  const conf = deepCopy(tableSelectionColumnConf);
-  conf.uuid = getUuidv4();
-  return conf;
+  return getCopyColumn(tableSelectionColumnConf);
 }
 const standardButtonOperations = [
   {
@@ -2678,9 +2678,9 @@ function getInitialInformationByName(name) {
     for (let j = 0; j < items.length; j++) {
       let item = items[j];
       if (item.name == name) {
-        initUse.props = item.props;
-        initUse.style = item.style;
-        initUse.events = item.events;
+        initUse.props = deepCopy(item.props);
+        initUse.style = deepCopy(item.style);
+        initUse.events = deepCopy(item.events);
         initUse.label = item.label;
         return initUse;
       }
@@ -2695,8 +2695,8 @@ function getDesignEvents(name) {
     let items = assemblyGroups[i].items;
     for (let j = 0; j < items.length; j++) {
       let item = items[j];
-      if (item.name == name) {
-        return item.events;
+      if (item.name == name && item.events) {
+        return deepCopy(item.events);
       }
     }
   }

package/dist/es/components/design/utils/form-design-util.d.ts

@@ -182,4 +182,5 @@ export declare function deleteRule(pageDesign: any, configure: any): void;
  * @param {*}
  * @return {*}
  */
-export declare function resetConfigIndo(configure: object, val: string): void;
+export declare function resetConfigIndo(configure: any, val: string): boolean;
+export declare function componentNameChange(configure: Component, componentName: any, emit: any): void;

package/dist/es/components/design/utils/form-design-util.js

@@ -1,6 +1,9 @@
 import { usePageContextStore } from "../../../stores/page-store.js";
 import { getComponentOptionConfigs } from "super-page-runtime";
 import { getInitialInformationByName } from "./assemblys-config.js";
+import { deepCopy } from "./common-util.js";
+import { ElMessage } from "element-plus";
+import { tableResetConfigIndo } from "./page-table-util.js";
 function caculateDetailComponentStyle(configure, designStyle, designClass, designHeaderStyle) {
   const tempStyle = {};
   const tempHeaderStyle = {};
@@ -464,16 +467,85 @@ function packageStringRuleByDataType(fieldInfo, type, rule) {
 }
 function resetConfigIndo(configure, val) {
   let moduleInfo = getInitialInformationByName(val);
-  configure.props = moduleInfo.props;
-  configure.style = moduleInfo.style;
-  configure.events = moduleInfo.events;
-  configure.label = moduleInfo.label;
+  if (moduleInfo) {
+    const eventMap = changeEventToMap(moduleInfo.events);
+    let newEvents = {};
+    let isCanRest = true;
+    const bindEvents = configure.events.filter((event) => {
+      return !event.isStandard && event.jsContent || event.isStandard && event.eventName;
+    });
+    if (bindEvents) {
+      for (let i = 0; i < bindEvents.length; i++) {
+        const item = bindEvents[i];
+        const event = eventMap[item.name];
+        if (event) {
+          newEvents[item.name] = deepCopy(item);
+        } else {
+          isCanRest = false;
+          ElMessage({
+            showClose: true,
+            message: "事件:[" + item.name + "]已绑定事件，请先备份事件内容，并清除绑定的事件，再切换组件类型",
+            type: "warning",
+            duration: 5e3
+          });
+          break;
+        }
+      }
+    }
+    if (isCanRest) {
+      let newEventsArr = [];
+      moduleInfo.events.forEach((item) => {
+        const eventName = item.name;
+        if (newEvents[eventName]) {
+          newEvents[eventName].componentUuid = configure.uuid;
+          newEvents[eventName].componentLabel = val;
+          newEvents[eventName].title = configure.props.base.title;
+          newEventsArr.push(newEvents[item.name]);
+        } else {
+          newEventsArr.push(item);
+        }
+      });
+      configure.name = val;
+      configure.events = newEventsArr;
+      Object.assign(moduleInfo.props, deepCopy(configure.props));
+      configure.props = moduleInfo.props;
+      Object.assign(moduleInfo.style, deepCopy(configure.style));
+      configure.style = moduleInfo.style;
+      configure.label = moduleInfo.label;
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+}
+function changeEventToMap(events) {
+  let eventMap = {};
+  if (events) {
+    events.forEach((item) => {
+      eventMap[item.name] = item;
+    });
+  }
+  return eventMap;
+}
+function componentNameChange(configure, componentName, emit) {
+  let isCanReset = true;
+  if (configure.isTable) {
+    tableResetConfigIndo(configure, componentName);
+  } else {
+    isCanReset = resetConfigIndo(configure, componentName);
+  }
+  if (isCanReset) {
+    emit("changeAssembly", configure);
+  }
 }
 export {
   caculateComponentProps,
   caculateDetailComponentStyle,
   columnCustomTittleClass,
   columnTittleStyle,
+  componentNameChange,
   removComponentOptionConfigs,
   resetConfigIndo,
   watchMaxOrMinValidate,

package/dist/es/components/design/utils/interfaces/page-design-types.d.ts

@@ -97,6 +97,7 @@ export interface ComponentEvent extends Object {
     name: string;
     label: string;
     params?: ComponentEventParam[];
+    componentUuid?: string;
 }
 /**
  * 事件对象

package/dist/es/components/design/utils/page-design-util.d.ts

@@ -2,3 +2,4 @@ export declare function queryWorkflowsRequest(tableName: any, systemCode: any, p
 export declare function createWorkflowRequest(tableName: any, pageName: any, systemCode: any, publishVersion: any): any;
 export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any, publishVersion: any): any;
 export declare function getPublishVersionsByCode(systemCode: any): any;
+export declare function deleteDesignItem(items: any, sourceItem: any, isShowChildrenTip: any, isDeleteSourceItem: boolean): void;

package/dist/es/components/design/utils/page-design-util.js

@@ -1,4 +1,6 @@
 import http from "agilebuilder-ui/src/utils/request";
+import { ElMessageBox } from "element-plus";
+import eventBus from "./eventBus.js";
 function queryWorkflowsRequest(tableName, systemCode, publishVersion) {
   const params = {
     appCode: systemCode,
@@ -32,8 +34,33 @@ function getHighestVersionDefinition(wfDefinitionCode, defVersion, publishVersio
     params
   );
 }
+function deleteDesignItem(items, sourceItem, isShowChildrenTip, isDeleteSourceItem) {
+  if (isShowChildrenTip) {
+    ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
+      confirmButtonText: "确认",
+      cancelButtonText: "取消",
+      type: "warning"
+    }).then(() => {
+      _deleteItem(items, sourceItem);
+    }).catch((err) => {
+      console.log(err);
+    });
+  } else if (isDeleteSourceItem) {
+    _deleteItem(items, sourceItem);
+  }
+}
+function _deleteItem(items, sourceItem) {
+  if (sourceItem && sourceItem.name === "table") {
+    eventBus.$off("reloadTable-" + sourceItem.uuid);
+  }
+  const index = items.indexOf(sourceItem);
+  if (index > -1) {
+    items.splice(index, 1);
+  }
+}
 export {
   createWorkflowRequest,
+  deleteDesignItem,
   getHighestVersionDefinition,
   queryWorkflowsRequest
 };

package/dist/es/components/design/utils/page-table-util.js

@@ -35,10 +35,8 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
   }
   pageDesign.tableRuntimes[configureCopy.uuid] = getListView(configureCopy, pageDesign, tableConfigureStr);
   delete tableConfigure.btnList;
-  delete tableConfigure.events;
   delete tableConfigure.items;
   delete tableConfigure.modelFields;
-  delete tableConfigure.props;
   delete tableConfigure.runtime;
 }
 function getListView(configureCopy, pageDesign, tableConfigureStr) {
@@ -158,7 +156,7 @@ function getListColumns(configure, pageDesign) {
       // 控件属性配置
       controlConfig: getControlConfig(item),
       //事件类型,json格式，格式为：{input:funName1,blur:funName2,focus:funName3,...}，funName1、funName2等方法名，通过列表的options.eventCallBack传入
-      // eventType: string
+      eventType: getListColumnEvent(item),
       /**
        * 显示顺序，多层级关系，可能值有重复
        * 如有第一层级的顺序1，有第二层级的顺序1
@@ -429,6 +427,23 @@ function getNameFromProp(prop) {
 function formatDynamicColumnData(item, temp) {
   temp.dynamicColumnJson = JSON.stringify(item.props.dataOrigin.dynamicColumnJson);
 }
+function getListColumnEvent(item, pageDesign) {
+  let result = null;
+  if (item.events) {
+    item.events.forEach((event) => {
+      if (event.jsContent && event.jsContent.trim()) {
+        if (!result) {
+          result = {};
+        }
+        result[event.name] = event.componentUuid;
+      }
+    });
+    if (result) {
+      return JSON.stringify(result);
+    }
+  }
+  return result;
+}
 function tableResetConfigIndo(configure, moduleValue) {
   let newColumnInfo = {
     uuid: configure.uuid,
@@ -450,6 +465,7 @@ function tableResetConfigIndo(configure, moduleValue) {
   configure.props.verification = newColumnInfo.verification;
   configure.props.definition = newColumnInfo.definition;
   configure.events = getDesignEvents(moduleValue);
+  configure.name = "table";
 }
 export {
   querySublist,

package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-design.vue2.js

@@ -2,7 +2,8 @@ import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock,
 import _sfc_main$1 from "../../object-design.vue.js";
 import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
 import { useDraggable } from "vue-draggable-plus";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "buttongroup-design",
   props: {
@@ -68,23 +69,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       items.splice(index, 0, copyObj);
     }
     function deleteItem(sourceItem) {
-      let items = btnItems;
-      ElMessageBox.confirm(
-        "还有子元素，确定要删除吗?",
-        "删除",
-        {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }
-      ).then(() => {
-        const index = items.indexOf(sourceItem);
-        if (index > -1) {
-          items.splice(index, 1);
-        }
-      }).catch((err) => {
-        console.log(err);
-      });
+      deleteDesignItem(btnItems, sourceItem, true, false);
     }
     return (_ctx, _cache) => {
       const _component_el_button_group = resolveComponent("el-button-group");

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

@@ -38,8 +38,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       if (props.conditionList) {
         tableData.value = JSON.parse(props.conditionList);
-      }
-      if (props.list) {
+      } else if (props.list) {
         tableData.value = props.list;
       }
     });
@@ -60,10 +59,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       operationArr.value.push([]);
     }
     function afterBindDefaultValue(modelValue, row) {
-      row.defaultValue = modelValue;
+      row.propValue = modelValue;
     }
-    function changeFieldName(index, propName) {
-      const item = props.fieldMap[propName];
+    function changeFieldName(index, row, propDbName) {
+      const item = props.fieldMap[propDbName];
+      row["dataType"] = item.dataType;
+      row["propName"] = item.name;
       operationArr.value[index] = getOperators(item);
     }
     function savebuttonSetting() {
@@ -180,11 +181,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) => {
@@ -212,7 +213,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     size: "default"
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(operationArr.value[scope.$index], (option) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getOperators)(scope.row), (option) => {
                         return openBlock(), createBlock(_component_el_option, {
                           key: option.name,
                           label: option.label,

package/dist/es/components/design/views/assemblys/button/component/set-dialog.vue.js

@@ -47,7 +47,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = true;
     }
     function afterBindDefaultValue(modelValue, row) {
-      row.defaultValue = modelValue;
+      row.autoValue = modelValue;
     }
     function selectRow(row) {
       tableRef.value.setCurrentRow(row);
@@ -61,6 +61,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function add() {
       tableData.value.push({});
     }
+    function changeField(row, propDbName) {
+      console.log("changeField----props.pageDesign.modelFieldsMap=", props.pageDesign.modelFieldsMap, "propDbName=", propDbName);
+      const item = props.pageDesign.modelFieldsMap[propDbName];
+      row.field = item.name;
+      row.dataType = item.dataType;
+    }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       const _component_el_row = resolveComponent("el-row");
@@ -197,11 +203,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   }, {
                     default: withCtx((scope) => [
                       createVNode(_component_el_select, {
-                        modelValue: scope.row.field,
-                        "onUpdate:modelValue": ($event) => scope.row.field = $event,
+                        modelValue: scope.row.propDbName,
+                        "onUpdate:modelValue": ($event) => scope.row.propDbName = $event,
                         clearable: "",
                         size: "default",
-                        onFocus: ($event) => selectRow(scope.row)
+                        onFocus: ($event) => selectRow(scope.row),
+                        onChange: ($event) => changeField(scope.row, scope.row.propDbName)
                       }, {
                         default: withCtx(() => [
                           (openBlock(true), createElementBlock(Fragment, null, renderList(__props.pageDesign.modelFields, (item) => {
@@ -213,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           }), 128))
                         ]),
                         _: 2
-                      }, 1032, ["modelValue", "onUpdate:modelValue", "onFocus"])
+                      }, 1032, ["modelValue", "onUpdate:modelValue", "onFocus", "onChange"])
                     ]),
                     _: 1
                   }),
@@ -225,7 +232,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     default: withCtx((scope) => [
                       createVNode(BindVariable, {
                         onFocus: ($event) => selectRow(scope.row),
-                        modelValue: scope.row.defaultValue,
+                        modelValue: scope.row.autoValue,
                         "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
                       }, null, 8, ["onFocus", "modelValue", "onUpdate:modelValue"])
                     ]),

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-design.vue2.js

@@ -11,6 +11,8 @@ import { LineChart, BarChart } from "echarts/charts";
 import { GridComponent, LegendComponent, TitleComponent, TooltipComponent, ToolboxComponent, DataZoomComponent } from "echarts/components";
 import VChart from "vue-echarts";
 import "element-plus";
+import "agilebuilder-ui/src/utils/request";
+import "../../../../utils/eventBus.js";
 const _hoisted_1 = { style: { "position": "absolute", "top": "0px", "right": "60px", "text-align": "center" } };
 const _hoisted_2 = ["onClick"];
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/dist/es/components/design/views/assemblys/common/common-variable-bind-option.js

@@ -31,6 +31,10 @@ const typeOptions = [
     value: "fixed",
     label: "固定值"
   },
+  {
+    value: "obj",
+    label: "对象属性"
+  },
   {
     value: "row",
     label: "行记录"

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.d.ts

@@ -89,10 +89,10 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     size: string;
     modelValue: string;
+    isTable: boolean;
     paramTypes: string[];
     showLabel: boolean;
     needParams: boolean;
     isRange: boolean;
-    isTable: boolean;
 }, {}>;
 export default _default;

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./common-variable-bind.vue2.js";
 import "./common-variable-bind.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cfaaf957"]]);
+const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-468275d2"]]);
 export {
   BindVariable as default
 };

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js

@@ -5,7 +5,7 @@ import { deepCopy, getUuidv4 } from "../../../utils/common-util.js";
 import { getTypeOptions, taskVarOptions, contextVarOptions } from "./common-variable-bind-option.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
 import { tableField } from "../../../../../stores/table-store.js";
-const _withScopeId = (n) => (pushScopeId("data-v-cfaaf957"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-468275d2"), n = n(), popScopeId(), n);
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { style: { "margin-top": "10px", "font-size": "10px", "display": "flex", "align-items": "center", "justify-self": "center" } };
 const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "margin-left": "5px" } }, "输入变量名后点击加号按钮添加", -1));
@@ -74,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const selectOptions = ref({});
     const searchValue = ref("");
     const popoverRef = ref(null);
-    const selectInputType = ["context", "system", "task", "data", "page"];
+    const selectInputType = ["context", "system", "task", "data", "page", "obj"];
     const tableFieldStore = tableField();
     onMounted(() => {
       window.addEventListener("click", handleClickOutside);
@@ -308,6 +308,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         valueOptions.value = taskVarOptions;
       } else if (value === "data") {
         valueOptions.value = selectOptions.value.dataModelOptions || [];
+      } else if (value === "obj") {
+        valueOptions.value = selectOptions.value.dataModelOptions || [];
+        console.log("%c描述-172007", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", valueOptions.value);
       } else if (value === "params") {
         valueOptions.value = selectOptions.value.paramsVarOptions || [];
       } else if (value === "page") {
@@ -335,7 +338,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           paramValue.value = row.value;
         }
       } else {
-        paramValue.value = row.dbColumnName;
+        paramValue.value = row.value;
       }
       defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
       emits("update:modelValue", defalutValue.value, row.alias);
@@ -671,10 +674,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               _: 2
                             }, 1032, ["modelValue", "onUpdate:modelValue"])
                           ])) : createCommentVNode("", true),
-                          paramType.value == "data" ? (openBlock(), createElementBlock("span", {
+                          paramType.value == "data" || paramType.value == "obj" ? (openBlock(), createElementBlock("span", {
                             key: 1,
-                            title: scope.row.label + " " + scope.row.dbColumnName
-                          }, toDisplayString(scope.row.label + " " + scope.row.dbColumnName), 9, _hoisted_8)) : (openBlock(), createElementBlock("span", {
+                            title: scope.row.label + " " + scope.row.value
+                          }, toDisplayString(scope.row.label + " " + scope.row.value), 9, _hoisted_8)) : (openBlock(), createElementBlock("span", {
                             key: 2,
                             title: scope.row.label
                           }, toDisplayString(scope.row.label), 9, _hoisted_9))

package/dist/es/components/design/views/assemblys/container/card/card-design.vue2.js

@@ -1,9 +1,10 @@
 import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, unref, normalizeClass, normalizeStyle, createSlots, withCtx, createElementVNode, createElementBlock, Fragment, renderList, createCommentVNode, createTextVNode, toDisplayString, reactive } from "vue";
-import { ElCard, ElMessageBox } from "element-plus";
+import { ElCard } from "element-plus";
 import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "card-design",
   props: {
@@ -85,26 +86,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     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) {
       let items = props.configure.items;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
-      }
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       const _component_SuperIcon = resolveComponent("SuperIcon");

package/dist/es/components/design/views/assemblys/container/collapse/collapse-design.vue2.js

@@ -4,7 +4,8 @@ import _sfc_main$1 from "../../object-design.vue.js";
 import { SuperIcon } from "agilebuilder-ui";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "collapse-design",
   props: {
@@ -73,26 +74,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function deleteItem(parentItem, sourceItem) {
-      if (sourceItem.items && sourceItem.items.length > 0) {
-        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          _deleteItem(parentItem, sourceItem);
-        }).catch((err) => {
-          console.log(err);
-        });
-      } else {
-        _deleteItem(parentItem, sourceItem);
-      }
-    }
-    function _deleteItem(parentItem, sourceItem) {
       let items = parentItem.items;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
-      }
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       const _component_el_collapse_item = resolveComponent("el-collapse-item");