agilebuilder-ui 1.1.27 → 1.1.29

package/lib/{tab-content-iframe-index-55b69efd.js → tab-content-iframe-index-86707264.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-ce3ae297.js";
+import { _ as s } from "./index-d3663821.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-f8882314.js → tab-content-index-c7251161.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-ce3ae297.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 T, renderList as C, 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-d3663821.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,23 +8,24 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   this.getBreadcrumb();
 }, methods: { getBreadcrumb() {
   const { params: e } = this.$route;
+  this.$route.matched;
   let t = this.$route.matched.filter((a) => {
     if (a.name) {
-      var r = $(a.path);
+      var r = _(a.path);
       return a.path = r(e), !0;
     }
   });
   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 } });
+        const $ = t[t.length - 1];
+        this.isShouldConcatLastMenu(c, i, $) && t.push({ path: i, meta: { title: c } });
       } else
         t.push({ path: i, meta: { title: c } });
     }
@@ -34,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(T, null, C(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() {
@@ -75,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)
@@ -86,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)
-    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(T, null, C(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() {
@@ -103,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;
+  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-a2d815d2.js → tache-subprocess-history-6de071c9.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-ce3ae297.js";
+import { _ as I } from "./index-d3663821.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.27",
+  "version": "1.1.29",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -262,7 +262,11 @@ export default {
                   initWatchValue = this.entity[attr]
                 }
                 this.$watch('entity.' + attr, function (newValue, oldValue) {
-                  this.watchAttrValueChange(newValue)
+                  if (newValue) {
+                    this.watchAttrValueChange(newValue)
+                  } else {
+                    this.watchAttrValueChange('')
+                  }
                   // this.inputValue('')
                   const items = this.optionItems.filter((item) => item[this.valueAttribute] === newValue)
                   if (!items) {

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

@@ -1,11 +1,25 @@
 <template>
   <div v-if="label">
-    <div class="list-file" @click="previewMuti()" @dblclick="dblclickEvent">
+    <div class="list-file" @dblclick="dblclickEvent">
       <el-icon><el-icon-paperclip /></el-icon>
       {{ label }}
-      <el-icon class="annex-cell"><el-icon-view /></el-icon>
+      <el-tooltip :content="$t('imatrixUIPublicModel.preview')">
+        <el-icon style="cursor: pointer; color: #409eff; padding-right: 5px" @click="previewMuti()"
+          ><el-icon-view
+        /></el-icon>
+      </el-tooltip>
+      <el-tooltip :content="$t('imatrixUIPublicModel.download')">
+        <el-icon style="cursor: pointer; color: #409eff" @click="donwloadViewFile()">
+          <el-icon-download />
+        </el-icon>
+      </el-tooltip>
     </div>
-    <el-image-viewer v-if="showPreviewSingleImage" teleported :url-list="[previewImageInfo.src]" @close="showPreviewSingleImage = false" />
+    <el-image-viewer
+      v-if="showPreviewSingleImage"
+      teleported
+      :url-list="[previewImageInfo.src]"
+      @close="showPreviewSingleImage = false"
+    />
     <el-dialog
       layout-mobile="bottom"
       :append-to-body="true"
@@ -26,7 +40,7 @@
         <el-table-column prop="showName" show-overflow-tooltip />
         <el-table-column width="80" align="center">
           <template v-slot="scope">
-            <div style="margin: -10px 0;">
+            <div style="margin: -10px 0">
               <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
                 <el-button type="text" @click="previewSingle(scope.row)">
                   <el-icon style="cursor: pointer"><el-icon-view /></el-icon>
@@ -95,36 +109,15 @@ export default {
       showPreviewMulti: false,
       previewImageInfo: {},
       fileList: [],
-      downloadable: true
+      downloadable: true,
+      keyValueParam: {}
     }
   },
   created() {
+    this.keyValueParam = this.analysisFileSetObj(this.fileSetObj, this.isSql)
     if (this.fileSetObj && this.fileSetObj.downloadable !== undefined && this.fileSetObj.downloadable !== null) {
       this.downloadable = this.fileSetObj.downloadable
     }
-    // let fileList = []
-    // if (this.column.fileSet && this.column.fileSet !== '' && (this.column.componentType === 'annex' || this.column.componentType === 'multipartUpload')) {
-    //   const fileSetObj = JSON.parse(this.column.fileSet)
-    //   const keyValueParam = this.analysisFileSetObj(fileSetObj, this.isSql)
-    //   if (fileSetObj && fileSetObj.multiple) {
-    //     if (fileSetObj.childAnnexDataTableCode) {
-    //     // const lowerStr = fileSetObj.childAnnexDataTableCode.toLowerCase()
-    //       const fileArr = this.entity[this.column.prop]
-    //       // 子表
-    //       fileList = otherFilesToStandard(fileSetObj, keyValueParam, fileArr, null)
-    //     } else {
-    //       const filesStringData = {
-    //         'showName': getEntityFieldValue(this.entity, keyValueParam.showName),
-    //         'serverPath': getEntityFieldValue(this.entity, keyValueParam.serverPath)
-    //       }
-    //       fileList = otherFilesToStandard(fileSetObj, keyValueParam, null, filesStringData)
-    //     }
-    //   } else {
-    //     const showName = getEntityFieldValue(this.entity, keyValueParam.showName)
-    //     const serverPath = getEntityFieldValue(this.entity, keyValueParam.serverPath)
-    //     fileList.push(packageFile(showName, serverPath))
-    //   }
-    // }
   },
   methods: {
     dblclickEvent() {
@@ -132,7 +125,6 @@ export default {
     },
     previewSingle(fileInfo) {
       fileInfo = packageFile(fileInfo.showName, fileInfo.serverPath)
-      debugger
       if (isImage(fileInfo.showName)) {
         this.previewImageInfo = fileInfo
         this.showPreviewSingleImage = true
@@ -140,29 +132,57 @@ export default {
         this.previewDoc(fileInfo)
       }
     },
-    previewMuti() {
-      const keyValueParam = this.analysisFileSetObj(this.fileSetObj, this.isSql)
+    donwloadViewFile() {
+      const { showName, serverPath } = this.getShowNameAndUuidKey()
+      if (serverPath) {
+        const uuids = serverPath.split(',')
+        if (uuids.length > 1) {
+          this.previewMuti()
+        } else {
+          // 单个文件
+          this.download(showName, serverPath)
+        }
+      }
+    },
+    getShowNameAndUuidKey() {
+      let showName = null
       let serverPath = null
       if (this.fileInfo.showName && this.fileInfo.serverPath) {
         serverPath = this.fileInfo.serverPath
+        showName = this.fileInfo.showName
       } else if (this.entity) {
-        serverPath = getEntityFieldValue(this.entity, keyValueParam.serverPath)
+        serverPath = getEntityFieldValue(this.entity, this.keyValueParam.serverPath)
+        showName = getEntityFieldValue(this.entity, this.keyValueParam.showName)
       }
+      return {
+        showName: showName,
+        serverPath: serverPath
+      }
+    },
+    previewMuti() {
+      const { showName, serverPath } = this.getShowNameAndUuidKey()
       if (serverPath) {
         const uuids = serverPath.split(',')
-        const baseURL = window.$vueApp.config.globalProperties.baseURL
-        const baseAPI = window.$vueApp.config.globalProperties.baseAPI
-        let tempAction = baseURL + '/common/fs-upload/search-file-names'
-        if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-          tempAction = baseAPI + '/api/search-file-names'
-        }
-        this.$http.post(tempAction, uuids).then((result) => {
-          this.fileList = []
-          uuids.forEach((uuid) => {
-            this.fileList.push({ showName: result[uuid], serverPath: uuid })
+        if (uuids.length > 1) {
+          const baseURL = window.$vueApp.config.globalProperties.baseURL
+          const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+          let tempAction = baseURL + '/common/fs-upload/search-file-names'
+          if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+            tempAction = baseAPI + '/api/search-file-names'
+          }
+          this.$http.post(tempAction, uuids).then((result) => {
+            this.fileList = []
+            uuids.forEach((uuid) => {
+              this.fileList.push({ showName: result[uuid], serverPath: uuid })
+            })
+            this.showPreviewMulti = true
           })
-          this.showPreviewMulti = true
-        })
+        } else {
+          this.previewSingle({
+            showName: showName,
+            serverPath: serverPath
+          })
+        }
       }
 
       // var that = this
@@ -214,19 +234,22 @@ export default {
       }
     },
     donwloadFile(index, fileList) {
-      const token = getToken()
       const showName = this.formatFileName(this.fileList[index].showName)
       if (!this.fileList[index].src) {
-        let url = window.$vueApp.config.globalProperties.baseURL + '/common/super-form/downloads?jwt=' + token
-        if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-          url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/downloads?jwt=' + token
-        }
-        const src = url + '&showName=' + encodeURI(showName) + '&serverPath=' + this.fileList[index].serverPath
-        window.open(src)
+        this.download(showName, this.fileList[index].serverPath)
       } else {
         window.open(this.fileList[index].src)
       }
     },
+    download(showName, serverPath) {
+      const token = getToken()
+      let url = window.$vueApp.config.globalProperties.baseURL + '/common/super-form/downloads?jwt=' + token
+      if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+        url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/downloads?jwt=' + token
+      }
+      const src = url + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
+      window.open(src)
+    },
     analysisFileSetObj(fileSetObj, isSql) {
       let showName = ''
       let serverPath = ''
@@ -267,5 +290,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

package/packages/organization-input/src/organization-input.vue

@@ -581,6 +581,6 @@ export default {
 </script>
 <style lang="css">
 .organization-input .el-input-group__append {
-  padding: 0 10px;
+  padding: 0 10px 0 0;
 }
 </style>

package/packages/row-form/operation.vue

@@ -4,6 +4,7 @@
       v-for="(operation, operationIndex) in column.operations"
       :key="operationIndex"
       :class="isShowForm ? '' : 'cell--span'"
+      class="buttons-row-operation-span"
     >
       <el-dropdown
         v-if="operation.isGroup"

package/packages/super-grid/src/components/mobile-table-card.jsx

@@ -1,11 +1,12 @@
 /** @jsxImportSource vue */
-import { defineComponent, ref, computed, watch, defineEmits } from 'vue';
+import { defineComponent, ref, computed, watch, defineEmits, onUnmounted } from 'vue';
 import { ElCard, ElDrawer, ElTag,ElDescriptions, ElDescriptionsItem, ElButton, ElIcon, ElCheckbox, ElCheckboxGroup, ElBreadcrumb, ElLink, ElEmpty, ElDivider } from 'element-plus';
 import NormalColumnContent from '../normal-column-content.vue';
 import CardView from '../../../../src/components/Card';
 import Scrollbar from '../../../../src/components/Scrollbar';
 import store from '../store';
 import { apisMixin } from '../apis'
+import eventBus from '../eventBus'
 
 import { ArrowLeft, Bottom, CirclePlus, Loading, Tickets } from '@element-plus/icons-vue';
 // import { $emit, $off, $on } from '@/utils/gogocodeTransfer'
@@ -84,6 +85,9 @@ export default defineComponent({
         // 子表打开历史数据
         const childrenBreadcrumbData = ref([]);
 
+        // 是否自定义 开启 Add
+        const customizeAddColumnBtn = ref(undefined)
+
         const setPaginationList = (data) => {
             if (props.isStackingPaginatedData) {
                 paginationList.value[(props.currentPage ?? 1) - 1] = data
@@ -101,9 +105,11 @@ export default defineComponent({
             const isFormSubTable = gridParams?.options?.isFormSubTable ?? false
             const subTableCanAdd = gridParams?.options?.subTableCanAdd ?? false
             const isOperation = componentDatas.value?.some(({ prop }) => ['operation'].includes(prop))
-            return showOperationButton && isFormSubTable && subTableCanAdd && isOperation
+            return customizeAddColumnBtn ?? (showOperationButton && isFormSubTable && subTableCanAdd && isOperation)
         })
 
+        eventBus.$on('change-add-state',(is)=> customizeAddColumnBtn.value = is)
+
         // 列表数据
         const dataList = computed(() => {
             if (props.isStackingPaginatedData) {
@@ -327,6 +333,10 @@ export default defineComponent({
             }
         }
 
+        onUnmounted(() => {
+            eventBus.$off('change-add-state')
+        })
+
         const getAddBtn = (Fun) => addColumnBtn.value && <ElButton type="primary" plain icon={<CirclePlus />} onClick={() => Fun?.(attrs.listCode)}>Add</ElButton>
 
         return {

package/packages/super-grid/src/custom-formatter.js

@@ -306,21 +306,24 @@ const customFormatter = {
     ).then((openPageParams) => {
       console.log('doClickHyperLink----openPageParams2222----', openPageParams)
       if (openPageParams) {
+        let openPageParamsResult = {}
         // 点击列表组件中某元素弹出的页面
         if (jumpPageSetting && typeof jumpPageSetting === 'string' && jumpPageSetting !== '') {
           jumpPageSetting = JSON.parse(jumpPageSetting)
         }
-        Object.assign(openPageParams, jumpPageSetting)
+        Object.assign(openPageParamsResult, jumpPageSetting)
+        // 解析结果中的值的优先级高于 跳转配置中的值
+        Object.assign(openPageParamsResult, openPageParams)
         // console.log('clickHyperLink--openPageParams22===', openPageParams, '----jumpPageSetting===', jumpPageSetting)
-        openPageParams._position = 'list'
-        openPageParams._listCode = listCode
-        openPageParams._rowIndex = rowIndex
+        openPageParamsResult._position = 'list'
+        openPageParamsResult._listCode = listCode
+        openPageParamsResult._rowIndex = rowIndex
         // 行编辑的记录
-        openPageParams.row = row
+        openPageParamsResult.row = row
         // 列点击时列属性名
-        openPageParams._columnProp = column.prop
+        openPageParamsResult._columnProp = column.prop
         // 通知父页面弹出页面
-        this.$emit('open-page', openPageParams)
+        this.$emit('open-page', openPageParamsResult)
       }
     })
   },

package/packages/super-grid/src/dynamic-input.vue

@@ -93,7 +93,7 @@
       @input="cellEvent('input', $event)"
     />
     <el-time-picker
-      v-else-if="type === 'timePicker'"
+      v-else-if="type === 'timePicker' || (type === 'input' && column.dataType === 'TIME')"
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
@@ -108,7 +108,7 @@
     />
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
-      v-else-if="type === 'time' || column.dataType === 'TIME'"
+      v-else-if="type === 'time'"
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
@@ -132,6 +132,7 @@
       :disabled="disabled"
       :placeholder="$t('imatrixUIMessage.pleaseEnterContent')"
       :title="innerValue"
+      :type="column.dataType === 'INTEGER' || column.dataType === 'LONG' ? 'number' : 'text'"
       clearable
       @blur="cellEvent('blur', $event)"
       @change="cellEvent('change', $event)"
@@ -926,14 +927,14 @@ export default {
         let selectTittle = ''
         if (typeof val === 'string') {
           // 单选
-          this.options.forEach((item) => {
+          this.options?.forEach((item) => {
             if (item.value === val) {
               selectTittle = item.label
             }
           })
         } else {
           // 多选
-          this.options.forEach((item) => {
+          this.options?.forEach((item) => {
             val.forEach((Vtem) => {
               if (item.value === Vtem) {
                 selectTittle = selectTittle + item.label + ','
@@ -1743,7 +1744,7 @@ export default {
             if (!this.innerValue || this.innerValue.indexOf(saveAll) >= 0) {
               this.innerValue = []
             }
-            this.options.forEach((item) => {
+            this.options?.forEach((item) => {
               if (this.innerValue.indexOf(item.value) === -1) {
                 this.innerValue.push(item.value)
               }
@@ -1832,8 +1833,8 @@ export default {
     },
     // 时间格式判断是否是字符串类型，显示格式
     isFormat() {
-      if (this.type === 'time' && this.column.dataType === 'TIME') {
-        return 'YYYY-MM-DD HH:mm:ss'
+      if (this.type === 'time' || this.column.dataType === 'TIME') {
+        return 'HH:mm:ss'
       } else if (this.type === 'dateTimePicker') {
         return 'YYYY-MM-DD HH:mm:ss'
       } else if (this.type === 'date' && this.column.dataType === 'DATE') {

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

@@ -1,16 +1,17 @@
 <template>
   <el-table-column
-    align="center"
+    header-align="center"
+    show-overflow-tooltip
+    :align="align"
     :fixed="fixed"
-    :width="70"
+    :width="width"
+    :min-width="minWidth"
   >
     <template v-slot:header>
       <span class="cell--span">{{ $t('superGrid.index') }}</span>
     </template>
     <template v-slot="scope">
-      <span class="cell--span">
-        {{ scope.$index + startIndex }}
-      </span>
+      {{ scope.$index + startIndex }}
     </template>
   </el-table-column>
 </template>
@@ -43,19 +44,27 @@ export default {
       type: Object,
       default: null,
     },
+    isDataChildren: {
+      type: Boolean,
+      default: false,
+    }
   },
   computed: {
+    align() {
+      if (this.isDataChildren) return 'left'
+      return 'center'
+    },
+    width() {
+      if (this.isDataChildren) return undefined
+      return 70
+    },
+    minWidth() {
+      if (this.isDataChildren) return 100
+      return undefined
+    },
     fixed() {
-      if (
-        this.column.fixed &&
-        (this.column.fixed === 'false' || this.column.fixed === '')
-      ) {
-        return false
-      }
-      // 序号只支持左固定
-      if (this.column.fixed && this.column.fixed === 'right') {
-        return 'left'
-      }
+      if (!this.column.fixed) return false
+      if (['null', 'false', 'undefined'].includes(this.column.fixed)) return false
       return this.column.fixed
     },
     startIndex() {

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

@@ -35,15 +35,16 @@
       @open-page="openPageEvent"
     />
     <div v-else class="column-text-main">
-      <div v-if="lineEdit.editable && isEditable && !isHideEdit && !isContentViewText" class="column-text-edit-main" @click="onEditing">
+      <div v-if="lineEdit.editable && (options?.configureObj?.props?.base?.columnEditable ?? true) && isEditable && !isHideEdit && !isContentViewText" class="column-text-edit-main" @click="onEditing">
         <el-icon :size="14" color="#409eff"><Edit /></el-icon>
-        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>请点击输入</span>
+        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>{{ $t('superGrid.editablePlaceholder') }}</span>
       </div>
       <span v-if="column.operations" class="grid-operation-buttons">
         <span
           v-for="(operation, operationIndex) in column.operations"
           :key="operationIndex"
           :class="isShowForm ? '' : 'cell--span'"
+          class="buttons-row-content-span"
         >
           <el-dropdown
             v-if="operation.isGroup"
@@ -100,6 +101,7 @@
             :row-index="rowIndex"
             :list-code="listCode"
             :parent-form-data="parentFormData"
+            is-table-btn-link
           />
         </span>
       </span>
@@ -358,6 +360,7 @@ import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
 import {
   ArrowKeyAction,
   getColumnValues,
+  isDisableEdit,
   getFileList,
   isDynamicDataSourceSource,
   isHasEditOption,
@@ -617,6 +620,7 @@ export default {
     if (gridParams && gridParams.options && gridParams.options.isFormSubTable) {
       this.isFormSubTable = gridParams.options.isFormSubTable
     }
+    this.disabled = isDisableEdit(this.column.prop, this.listCode, this.row)
     if (
       gridParams &&
       gridParams.options &&
@@ -671,6 +675,10 @@ export default {
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
+    // 监听取消自定义编辑事件
+    eventBus.$on('clearTableAllStartEditing', () => {
+      this.clearAllEditing()
+    })
     // 监听保存时点击按钮事件线触发
     $on(eventBus, 'un-edit', (param) => {
       // 处理多选选项组问题保存问题
@@ -759,6 +767,7 @@ export default {
     if (this.$parent.$parent && this.$parent.$parent.$options._componentTag === 'GroupColumn') {
       eventBus.$off('prohibitToEdit')
     }
+    eventBus.$off('clearTableAllStartEditing')
   },
   methods: {
     ...customFormatter,
@@ -1137,6 +1146,7 @@ export default {
       return 'primary'
     },
     changeDisabled(state) {
+      debugger
       this.disabled = state
     },
     refreshList() {
@@ -1199,6 +1209,13 @@ export default {
     align-items: center;
     gap: 10px;
 
+    [table-column-placeholder] {
+      display: block;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
     &::after {
       content: ' ';
       position: absolute;