agilebuilder-ui 1.1.52 → 1.1.53-rc1

package/lib/{tab-content-iframe-index-caa7c13c.js → tab-content-iframe-index-0007a8e7.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-0a1887ad.js";
+import { _ as s } from "./index-05ede327.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-4d0f1626.js → tab-content-index-b9cb98bf.js}

@@ -1,5 +1,5 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-0a1887ad.js";
-import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-05ede327.js";
+import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);
 } }, watch: { $route() {
@@ -8,7 +8,7 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   this.getBreadcrumb();
 }, methods: { getBreadcrumb() {
   const { params: e } = this.$route;
-  console.log("this.$route.matched==", this.$route.matched);
+  this.$route.matched;
   let t = this.$route.matched.filter((a) => {
     if (a.name) {
       var r = _(a.path);
@@ -17,12 +17,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   });
   if (t) {
     let a;
-    const r = x(), o = window.$vueApp.config.globalProperties.systemNameObj;
-    o && (a = o[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
-    const s = P.get("selectMenu"), d = window.$vueApp.config.globalProperties._selectMenu;
-    let n;
-    if (d ? n = d : s && (n = s), n) {
-      const i = n.substring(0, n.indexOf("~~")), c = n.substring(n.indexOf("~~") + 2);
+    const r = x(), n = window.$vueApp.config.globalProperties.systemNameObj;
+    n && (a = n[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
+    const s = P.get("selectMenu"), l = window.$vueApp.config.globalProperties._selectMenu;
+    let o;
+    if (l ? o = l : s && (o = s), o) {
+      const i = o.substring(0, o.indexOf("~~")), c = o.substring(o.indexOf("~~") + 2);
       if (t && t.length > 0) {
         const $ = t[t.length - 1];
         this.isShouldConcatLastMenu(c, i, $) && t.push({ path: i, meta: { title: c } });
@@ -35,9 +35,9 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   return !(!this.isTitleNotEqual(e, a) || !this.isPathNotEqual(t, a));
 }, isTitleNotEqual(e, t) {
   return !(!e || !t.meta || e === t.meta.title || e === this.$t(t.meta.title));
-}, isPathNotEqual: (e, t) => !(!e || !t.path || e === t.path) } }, [["render", function(e, t, a, r, o, s) {
-  const d = u("el-breadcrumb-item"), n = u("el-breadcrumb");
-  return l(), b(n, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [v(L, { name: "breadcrumb", tag: "span" }, { default: g(() => [(l(!0), p(C, null, T(s.levelListWithTitle, (i, c) => (l(), b(d, { key: i.path + "-" + c }, { default: g(() => [m("span", k, w(e.$t(i.meta.title)), 1)]), _: 2 }, 1024))), 128))]), _: 1 })]), _: 1 });
+}, isPathNotEqual: (e, t) => !(!e || !t.path || e === t.path) } }, [["render", function(e, t, a, r, n, s) {
+  const l = u("el-breadcrumb-item"), o = u("el-breadcrumb");
+  return d(), b(o, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [v(L, { name: "breadcrumb", tag: "span" }, { default: g(() => [(d(!0), p(T, null, C(s.levelListWithTitle, (i, c) => (d(), b(l, { key: i.path + "-" + c }, { default: g(() => [m("span", k, w(e.$t(i.meta.title)), 1)]), _: 2 }, 1024))), 128))]), _: 1 })]), _: 1 });
 }], ["__scopeId", "data-v-768a430c"]]), { body: B } = document, E = { watch: { $route(e) {
   this.device === "mobile" && this.sidebar.opened && h.dispatch("closeSidebar", { withoutAnimation: !1 });
 } }, beforeMount() {
@@ -76,8 +76,8 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   if (e.routePath === "/iframe-page/page") {
     let a, r = "";
     if (e.routeQuery)
-      for (const o in e.routeQuery)
-        o === "src" ? a = e.routeQuery[o] : r += o + "=" + e.routeQuery[o] + "&";
+      for (const n in e.routeQuery)
+        n === "src" ? a = e.routeQuery[n] : r += n + "=" + e.routeQuery[n] + "&";
     a && (t = a), r && (t += "?" + r);
   } else if (e.routePath.indexOf("http:") < 0 && e.routePath.indexOf("https:") < 0 && (t = "#"), t = e.routePath.indexOf("?") >= 0 ? t + e.routePath + "&" : t + e.routePath + "?", e.routeQuery)
     for (const a in e.routeQuery)
@@ -87,16 +87,16 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   if (e && typeof e.data == "string" && e.data === "refreshTabContent")
     window.location.reload();
   else if (e && typeof e.data == "string" && e.data.indexOf("loginTimeout") >= 0)
-    console.log("tab-content-接收到登录超时的信息---event.data=", e.data), window.parent.postMessage(e.data, "*");
+    e.data, window.parent.postMessage(e.data, "*");
   else if (e && typeof e.data == "string" && e.data === "return-to-system-list") {
     this.$store.commit("clear_tabs");
     let t = "_IS_APP_LIST";
     const a = window.sessionStorage.getItem(t);
     a !== void 0 && a === "true" ? this.$router.push({ path: "/mms/apps/list" }) : this.$router.push({ path: "/mms/systems/list" });
   }
-} } }, V = ["src"], Q = { key: 1, class: "default-page-tip" }, R = { class: "default-page-tip-msg" }, q = { class: "default-page-tip-item" }, z = { class: "default-page-tip-item" }, j = { class: "main-container" }, W = f({ name: "Layout", components: { Menubar: O, Breadcrumb: A, TabContent: f(N, [["render", function(e, t, a, r, o, s) {
-  const d = u("el-tab-pane"), n = u("el-tabs");
-  return e.openTab && e.openTab.length > 0 ? (l(), b(n, { key: 0, modelValue: s.activeIndex, "onUpdate:modelValue": t[0] || (t[0] = (i) => s.activeIndex = i), class: "nav-tab menu-tab-container", closable: "", onTabRemove: s.closeSelectedTag }, { default: g(() => [(l(!0), p(C, null, T(e.openTab, (i) => (l(), b(d, { key: i.code, label: i.name, name: i.code }, { default: g(() => [m("iframe", { ref_for: !0, ref: "tabMainContent", src: s.getFullPath(i), class: "tab-main-content", name: "tab-main-content", frameborder: "0" }, null, 8, V)]), _: 2 }, 1032, ["label", "name"]))), 128))]), _: 1 }, 8, ["modelValue", "onTabRemove"])) : (l(), p("div", Q, [m("div", R, [m("div", q, w(o.defaultPageTipCn), 1), m("div", z, w(o.defaultPageTipEn), 1)])]));
+} } }, V = ["src"], Q = { key: 1, class: "default-page-tip" }, R = { class: "default-page-tip-msg" }, q = { class: "default-page-tip-item" }, z = { class: "default-page-tip-item" }, j = { class: "main-container" }, W = f({ name: "Layout", components: { Menubar: O, Breadcrumb: A, TabContent: f(N, [["render", function(e, t, a, r, n, s) {
+  const l = u("el-tab-pane"), o = u("el-tabs");
+  return e.openTab && e.openTab.length > 0 ? (d(), b(o, { key: 0, modelValue: s.activeIndex, "onUpdate:modelValue": t[0] || (t[0] = (i) => s.activeIndex = i), class: "nav-tab menu-tab-container", closable: "", onTabRemove: s.closeSelectedTag }, { default: g(() => [(d(!0), p(T, null, C(e.openTab, (i) => (d(), b(l, { key: i.code, label: i.name, name: i.code }, { default: g(() => [m("iframe", { ref_for: !0, ref: "tabMainContent", src: s.getFullPath(i), class: "tab-main-content", name: "tab-main-content", frameborder: "0" }, null, 8, V)]), _: 2 }, 1032, ["label", "name"]))), 128))]), _: 1 }, 8, ["modelValue", "onTabRemove"])) : (d(), p("div", Q, [m("div", R, [m("div", q, w(n.defaultPageTipCn), 1), m("div", z, w(n.defaultPageTipEn), 1)])]));
 }], ["__scopeId", "data-v-a5252a92"]]) }, mixins: [E], data: () => ({ showMenuRoute: I(), systemCode: null }), computed: { sidebar() {
   return this.$store.state.app.sidebar;
 }, device() {
@@ -104,12 +104,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
 }, classObj() {
   return { hideSidebar: !this.sidebar.opened, openSidebar: this.sidebar.opened, withoutAnimation: this.sidebar.withoutAnimation, mobile: this.device === "mobile" };
 } }, created() {
-  this.systemCode = window.$vueApp.config.globalProperties.customSystem, console.log("新菜单组件-----systemCode====", this.systemCode);
+  this.systemCode = window.$vueApp.config.globalProperties.customSystem, this.systemCode;
 }, methods: { handleClickOutside() {
   this.$store.dispatch("closeSidebar", { withoutAnimation: !1 });
-} } }, [["render", function(e, t, a, r, o, s) {
-  const d = u("menubar"), n = u("breadcrumb"), i = u("tab-content");
-  return l(), p("div", { class: S([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (l(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(d, { "system-code": o.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", j, [o.showMenuRoute ? (l(), b(n, { key: 0 })) : y("", !0), v(i)])], 2);
+} } }, [["render", function(e, t, a, r, n, s) {
+  const l = u("menubar"), o = u("breadcrumb"), i = u("tab-content");
+  return d(), p("div", { class: S([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (d(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(l, { "system-code": n.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", j, [n.showMenuRoute ? (d(), b(o, { key: 0 })) : y("", !0), v(i)])], 2);
 }], ["__scopeId", "data-v-5c0a6bf6"]]);
 export {
   W as default

package/lib/{tache-subprocess-history-07140038.js → tache-subprocess-history-7f9f692c.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-0a1887ad.js";
+import { _ as I } from "./index-05ede327.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.52",
+  "version": "1.1.53-rc1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -24,6 +24,14 @@
       @visible-change="visibleChange"
       @remove-tag="removeTag(remote, $event)"
     >
+     <template v-if="isSearch" #header>
+      <el-checkbox
+        v-model="checkEmptyValue"
+        @change="changeEmptyValue"
+      >
+        {{$t('imatrixUIPublicModel.emptyValue')}}
+      </el-checkbox>
+    </template>
       <template v-if="descriptionAttribute">
         <div v-if="optionWidth > 0" :style="{ width: optionWidth + 'px' }">
           <el-option
@@ -172,6 +180,11 @@ export default {
     // 下拉框配置宽度
     optionWidth: {
       default: 0
+    },
+    // 是否是查询时
+    isSearch: {
+      type: Boolean,
+      default: false
     }
   },
   // 是否是页面预览, 从页面管理传递
@@ -211,7 +224,8 @@ export default {
       descriptionAttribute: null,
       queryParam: {}, // 请求参数,
       lastValues, // 最后一次的value值，用于判断是否是增加元素
-      optionItemList: [] // 多选时会多一个saveAll 全选 选项
+      optionItemList: [], // 多选时会多一个saveAll 全选 选项
+      checkEmptyValue: false // 是否查询空值
     }
   },
   watch: {
@@ -719,11 +733,11 @@ export default {
                 if (this.optionItems && this.optionItems.length > 0) {
                   this.optionItems.forEach((selectItem) => {
                     const addValue = selectItem[sourceColumnName]
-                    if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
-                      originalValue = originalValue + ',' + addValue
-                    } else {
-                      originalValue = addValue
-                    }
+                      if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
+                        originalValue = originalValue + ',' + addValue
+                      } else {
+                        originalValue = addValue
+                      }
                   })
                   value = originalValue
                 }
@@ -831,6 +845,13 @@ export default {
         }
         this.markValue = JSON.stringify(muMarkValue)
       }
+    },
+    changeEmptyValue(newVal) {  
+      this.$emit('changeEmptyValue', newVal)
+    },
+    // 清空 空值 勾选，列表查询空值 重置时调用了
+    clearEmptyValue(){
+      this.checkEmptyValue = false
     }
   },
   emits: [
@@ -841,7 +862,8 @@ export default {
     'focus',
     'blur',
     'visible-change',
-    'change'
+    'change',
+    'chnageEmptyValue'
   ]
 }
 </script>

package/packages/fs-preview/src/fs-preview.vue

@@ -84,13 +84,16 @@
 // import { Image } from 'antd';
 import { Paperclip as ElIconPaperclip, View as ElIconView, Download as ElIconDownload } from '@element-plus/icons-vue'
 import * as Vue from 'vue'
-import { isPlateSys, getSystemFrontendUrl, getRelativeBaseUrl, getKkFilePreviewUrl } from '../../../src/utils/common-util'
-import { isImage, getEntityFieldValue } from '../../../src/utils/util'
+import {
+  isPlateSys,
+  getSystemFrontendUrl,
+  getRelativeBaseUrl,
+  getKkFilePreviewUrl
+} from '../../../src/utils/common-util'
+import { isImage, getEntityFieldValue, getI18n } from '../../../src/utils/util'
 import { packageFile } from '../../super-grid/src/utils'
 import { getToken } from '../../../src/utils/auth'
 import { getFileIconByName } from '../../../src/utils/file-util'
-import { Base64 } from 'js-base64'
-import { ElMessage } from 'element-plus'
 export default {
   components: {
     ElIconPaperclip,
@@ -136,7 +139,7 @@ export default {
       default: false
     },
     // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-    watermark:{
+    watermark: {
       type: Object,
       default: () => ({})
     }
@@ -298,13 +301,13 @@ export default {
           const myPreviewUrl = originUrl + '&fullfilename=' + showName
           console.log('myPreviewUrl====', myPreviewUrl)
           // http://127.0.0.1:8012/onlinePreview
-          getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+          getKkFilePreviewUrl(myPreviewUrl).then((url) => {
             window.open(url, showName)
-          })
+          }) /
             // window.$vueApp.config.globalProperties.kkFileViewUrl +
             // '?url=' +
             // encodeURIComponent(Base64.encode(myPreviewUrl))
-          /window.open(previewUrl, showName)
+            window.open(previewUrl, showName)
           console.log('previewUrl====', previewUrl)
         } else {
           previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
@@ -327,7 +330,7 @@ export default {
       const token = getToken()
       const isShowWatermark = this.watermark.isShowWatermark
       let watermarkContent = this.watermark?.content
-      if(!watermarkContent){
+      if (!watermarkContent) {
         watermarkContent = ''
       }
       let url = window.$vueApp.config.globalProperties.baseURL + '/common/super-form/downloads?jwt=' + token
@@ -335,7 +338,16 @@ export default {
         url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/downloads?jwt=' + token
       }
       url = getRelativeBaseUrl(url)
-      const src = url + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath+'&isShowWatermark='+isShowWatermark+'&watermark='+watermarkContent
+      const src =
+        url +
+        '&showName=' +
+        encodeURI(showName) +
+        '&serverPath=' +
+        serverPath +
+        '&isShowWatermark=' +
+        isShowWatermark +
+        '&watermark=' +
+        watermarkContent
       window.open(src)
     },
     analysisFileSetObj(fileSetObj, isSql) {
@@ -402,12 +414,20 @@ export default {
       const fileInfo = this.getFirstFile()
       this.$emit('delete-file', fileInfo)
       this.fileList = this.fileList.filter((item) => item.serverPath !== fileInfo.serverPath)
-      ElMessage.success('文件已删除')
+      this.$message({
+        showClose: true,
+        type: 'success',
+        message: getI18n().t('fsUpload.deleteSuccessful')
+      })
     },
     deleteFile(fileInfo) {
       this.$emit('delete-file', fileInfo)
       this.fileList = this.fileList.filter((item) => item.serverPath !== fileInfo.serverPath)
-      ElMessage.success('文件已删除')
+      this.$message({
+        showClose: true,
+        type: 'success',
+        message: getI18n().t('fsUpload.deleteSuccessful')
+      })
     }
   },
   emits: ['close', 'delete-file']

package/packages/super-grid/src/apis.js

@@ -1125,6 +1125,144 @@ const apis = {
       resolve()
     })
   },
+  getDeleteIndexes(dataArr, deleteRows, rowKey) {
+    const indexes = []
+    dataArr.forEach((row, index) => {
+      if (indexes.length === deleteRows.length) return
+      for (const delRow of deleteRows) {
+        if (row[rowKey] === delRow[rowKey]) {
+          indexes.push(index)
+          break
+        }
+      }
+    })
+    return indexes.sort((a, b) => b - a)
+  },
+  batchDeleteSubTableRowApi(listCode, deleteRows, rowKey) {
+    return new Promise((resolve, reject) => {
+      deleteRows = deleteRows || []
+      if (!deleteRows.length) {
+        window.$vueApp.config.globalProperties.$message({
+          showClose: true,
+          message: getI18n().t('imatrixUIMessage.pleaseSelectDeleteData'),
+          type: 'warning'
+        })
+        resolve()
+        return
+      }
+      listCode = listCode || store.get('_list_code')
+      const gridParams = store.get(listCode)
+      let canDelete = true
+      // 删除行记录前的回调
+      if (isEditOptionFunction('beforeDelete', listCode)) {
+        const isSubTableShowPage = gridParams.isSubTableShowPage
+        // 每页显示多少条
+        const pageSize = gridParams.pagination && gridParams.pagination.pageSize
+        const gridData = isSubTableShowPage ? gridParams.subTableData : gridParams.gridData
+        const isMobile = this.isMobile
+        if (gridParams.pageContext) {
+          canDelete = gridParams.options.lineEditOptions.beforeDelete.call(this, {
+            deleteRows: deleteRows,
+            gridData,
+            isMobile,
+            baseURL: this.baseURL,
+            totalData: isSubTableShowPage ? gridParams.gridData : null,
+            pageSize,
+            additionalParamMap: gridParams.additionalParamMap,
+            pageContext: gridParams.pageContext,
+            configureObj: gridParams.configureObj
+          })
+        } else {
+          canDelete = gridParams.options.lineEditOptions.beforeDelete.call(
+            this,
+            deleteRows,
+            gridData,
+            isMobile,
+            this.baseURL,
+            isSubTableShowPage ? gridParams.gridData : null,
+            pageSize,
+            gridParams.additionalParamMap
+          )
+        }
+      }
+      if (canDelete === undefined || canDelete === true) {
+        const deleteIndexs = []
+        if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
+          // 子表集合添加该新建的行。会触发watch subTableData的监控
+          gridParams.isChangePage = true
+          const indexes = this.getDeleteIndexes(gridParams.subTableData, deleteRows, rowKey)
+          for (const idx of indexes) {
+            gridParams.subTableData.splice(idx, 1)
+          }
+        } else {
+          const indexes = this.getDeleteIndexes(gridParams.gridData, deleteRows, rowKey)
+          for (const idx of indexes) {
+            gridParams.gridData.splice(idx, 1)
+            gridParams.orgGridData.splice(idx, 1)
+          }
+        }
+        // TODO 注释下面的代码，是因为表单子表删除记录时会造成未保存新增的记录的字段被清空的问题，不知道当时为什么要加这个代码
+        // Object.assign(gridParams.gridData, gridParams.orgGridData)
+        gridParams.$lastSaveRowIndex = null
+        gridParams.$rowIndex = null
+        gridParams.isEditRow = false
+        window.$vueApp.config.globalProperties.$message({
+          showClose: true,
+          message: getI18n().t('superGrid.deleteSuccessful'),
+          type: 'success'
+        })
+        if (gridParams.gridData.length === 0) {
+          if (
+            gridParams.options &&
+            gridParams.options.isDefaultShowEdit !== null &&
+            gridParams.options.isDefaultShowEdit !== undefined &&
+            gridParams.options.isDefaultShowEdit === true
+          ) {
+            // 表示没有记录时，需要创建新行
+            this.createRow(listCode)
+          }
+        }
+        if (gridParams.isMulitiSelect) {
+          gridParams.superGrid?.clearSelection?.()
+        }
+        gridParams.isCreateRow = false
+        if (isRestore === undefined || !isRestore) {
+          // 表示是删除操作，执行删除记录后回调
+          if (isEditOptionFunction('afterDelete', listCode)) {
+            const isSubTableShowPage = gridParams.isSubTableShowPage
+            // 每页显示多少条
+            const pageSize = gridParams.pagination && gridParams.pagination.pageSize
+            const isMobile = this.isMobile
+            if (gridParams.pageContext) {
+              gridParams.options.lineEditOptions.afterDelete.call(this, {
+                deleteRows: deleteRows,
+                gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+                isMobile,
+                baseURL: this.baseURL,
+                totalData: isSubTableShowPage ? gridParams.gridData : null,
+                pageSize,
+                additionalParamMap: gridParams.additionalParamMap,
+                pageContext: gridParams.pageContext,
+                configureObj: gridParams.configureObj
+              })
+            } else {
+              gridParams.options.lineEditOptions.afterDelete.call(
+                this,
+                deleteRows,
+                isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+                isMobile,
+                this.baseURL,
+                isSubTableShowPage ? gridParams.gridData : null,
+                pageSize,
+                gridParams.additionalParamMap
+              )
+            }
+          }
+        }
+      }
+      resolve()
+    })
+  },
   // 行编辑时，点击自定义组件时，使当前行获得焦点
   focus(rowIndex, listCode) {
     setCurrentRow(rowIndex, listCode)
@@ -1461,11 +1599,11 @@ const apis = {
   getCustomFunc(funcName) {
     window.$PageUtil.getCustomFunc(this.pageContext, funcName)
   },
-  addRequiredClass(fieldName,listCode, rowIndex, pageNum) {
+  addRequiredClass(fieldName, listCode, rowIndex, pageNum) {
     const gridParams = store.get(listCode)
-    if (this.isFormSubTable && this.isSubTableShowPage){
+    if (this.isFormSubTable && this.isSubTableShowPage) {
       rowIndex = rowIndex - 1
-      if(pageNum !== this.currentPage){
+      if (pageNum !== this.currentPage) {
         this.currentPage = pageNum
         this.changePage(pageNum)
       }
@@ -1477,7 +1615,7 @@ const apis = {
    * @param {Array} searchableColumns 查询字段集合
    * @param {object} searchData 查询值对象。例如：{'DEPT_CODE':'xxx','DEPT_NAME':'xxxx'}
    */
-  handleSearch(searchableColumns, searchData){
+  handleSearch(searchableColumns, searchData) {
     const searchForm = this.packageSearchParamNormalType(searchableColumns, searchData)
     this.doSearch(searchForm)
   }

package/packages/super-grid/src/normal-column-content.vue

@@ -34,7 +34,7 @@
       @change-required="changeRequired"
       @open-page="openPageEvent"
     />
-    <div v-else :class=" (options?.configureObj?.props?.base?.columnEditable ?? false) ? 'column-text-main' : ''">
+    <div v-else :class="options?.configureObj?.props?.base?.columnEditable ?? false ? 'column-text-main' : ''">
       <div
         v-if="
           lineEdit.editable &&
@@ -1274,7 +1274,14 @@ export default {
       }
     }
   },
-  emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']
+  emits: [
+    'refresData',
+    'refresPortData',
+    'refresPortsData',
+    'refresMainTableFields',
+    'prohibitToEdit',
+    'deleteFormSubTableRow'
+  ]
 }
 </script>
 

package/packages/super-grid/src/normal-column.vue

@@ -12,7 +12,7 @@
     :min-width="getColumnWidth()"
   >
     <template v-slot:header>
-      <span v-if="!column.customHeader" :class="{ is_req: isFieldRequired() }">
+      <span v-if="!column.customHeader" :class="{ is_req: isFieldRequired() }" class="normal-column-header">
         <span :title="$escapeHtml(label)" class="cell--span required__label" v-html="$escapeHtml(label)" />
       </span>
       <component
@@ -23,9 +23,18 @@
         :grid-data="gridData"
         :current-page="currentPage"
       />
-      <el-icon v-if="isShowAdd" style="font-size: 20px; color: #409eff" @click="createFormSubTableRow">
-        <CirclePlus />
-      </el-icon>
+      <span style="margin-left: 5px">
+        <el-icon v-if="isShowAdd" class="normal-column-header normal-column-header-icon" @click="createFormSubTableRow">
+          <CirclePlus />
+        </el-icon>
+        <el-icon
+          v-if="isShowDelete"
+          class="normal-column-header normal-column-header-icon"
+          @click="deleteFormSubTableRow"
+        >
+          <Remove />
+        </el-icon>
+      </span>
     </template>
     <template v-slot="scope">
       <!-- :pagination="pagination" -->
@@ -49,8 +58,8 @@
         :row-index="scope.$index"
         :line-edit="lineEdit"
         :custom-format="customFormat"
-        :class="isValidateError(scope.row,scope.$index)?'required_bg required-corner':''"
-        :style="isValidateError(scope.row,scope.$index)?'display:block;':''"
+        :class="isValidateError(scope.row, scope.$index) ? 'required_bg required-corner' : ''"
+        :style="isValidateError(scope.row, scope.$index) ? 'display:block;' : ''"
         @open-page="openPageEvent"
         @refresData="refresData"
         @refresh-list="refreshList"
@@ -63,7 +72,7 @@
   </el-table-column>
 </template>
 <script>
-import { CirclePlus, ZoomIn as ElIconZoomIn } from '@element-plus/icons-vue'
+import { CirclePlus, ZoomIn as ElIconZoomIn, Remove } from '@element-plus/icons-vue'
 import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
 import { getColumnValues, isRequiredEdit, getContentAlign, getHeaderAlign, getHeaderLable } from './utils'
 import DynamicInput from './dynamic-input.vue'
@@ -78,7 +87,7 @@ import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import NormalColumnContent from './normal-column-content.vue'
 import eventBus from './eventBus'
-// border:1px solid red;padding: 10px; 
+// border:1px solid red;padding: 10px;
 export default {
   components: {
     DynamicInput,
@@ -164,7 +173,9 @@ export default {
       headerAlign: 'left', // 表头对齐方式
       isFormSubTable: false, // 是否是表单子表
       subTableCanAdd: true, // 表单子表时是否有新增权限
+      subTableCanDelete: true, // 表单子表时是否有删除权限
       isShowAdd: false, // 是否显示表头的新增按钮
+      isShowDelete: false, // 是否显示表头的删除按钮
       cellWidth: null,
       parentFormData,
       options,
@@ -267,13 +278,13 @@ export default {
     if (gridParams && gridParams.options && gridParams.options.isFormSubTable) {
       this.isFormSubTable = gridParams.options.isFormSubTable
     }
-    if (
-      gridParams &&
-      gridParams.options &&
-      gridParams.options.subTableCanAdd !== undefined &&
-      gridParams.options.subTableCanAdd !== null
-    ) {
-      this.subTableCanAdd = gridParams.options.subTableCanAdd
+    if (gridParams && gridParams.options) {
+      if (gridParams.options.subTableCanAdd !== undefined && gridParams.options.subTableCanAdd !== null) {
+        this.subTableCanAdd = gridParams.options.subTableCanAdd
+      }
+      if (gridParams.options.subTableCanDelete !== undefined && gridParams.options.subTableCanDelete !== null) {
+        this.subTableCanDelete = gridParams.options.subTableCanDelete
+      }
     }
     const align = getContentAlign(this.column, gridParams)
     if (align) {
@@ -294,6 +305,14 @@ export default {
       this.subTableCanAdd &&
       gridParams.options &&
       gridParams.options.showOperationButton
+
+    this.isShowDelete =
+      this.isFormSubTable &&
+      this.column.prop === 'operation' &&
+      this.subTableCanDelete &&
+      gridParams.options &&
+      gridParams.options.showOperationButton &&
+      gridParams.isMulitiSelect
   },
   mounted() {
     if (this.column.prop === 'operation') {
@@ -336,6 +355,10 @@ export default {
       console.log('触发了行新建')
       this.createRow(this.listCode)
     },
+    deleteFormSubTableRow() {
+      console.log('触发了行批量删除')
+      $emit(this, 'batchDeleteSubTableRow')
+    },
     getColumnWidth() {
       if (this.column && this.column.prop === 'operation' && !this.column.width) {
         // 表示操作列，宽度固定
@@ -362,14 +385,30 @@ export default {
       console.log('normalColumn----openPageEvent----', openPageParams)
       this.$emit('open-page', openPageParams)
     },
-    isValidateError(row,rowIndex) {
+    isValidateError(row, rowIndex) {
       // const gridParams = store.get(this.listCode)
-      console.log('row.validateErrorField-----',row)
       return this.isFormSubTable && row && row['validateErrorField'] && row['validateErrorField'] === this.column.prop
     }
   },
-  emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']
+  emits: [
+    'refresData',
+    'refresPortData',
+    'refresPortsData',
+    'refresMainTableFields',
+    'prohibitToEdit',
+    'deleteFormSubTableRow'
+  ]
 }
 </script>
+<style lang="scss" scoped>
+.normal-column-header {
+  display: inline-flex;
+  vertical-align: middle;
+}
 
-<style lang="scss" scoped></style>
+.normal-column-header-icon {
+  font-size: 20px;
+  color: #409eff;
+  cursor: pointer;
+}
+</style>