agilebuilder-ui 1.1.22 → 1.1.23

package/lib/{tab-content-iframe-index-e6bc24b5.js → tab-content-iframe-index-911248d7.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-e23f840f.js";
+import { _ as s } from "./index-4fa4df3f.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-5a36eab4.js → tab-content-index-d82e9431.js}

@@ -1,6 +1,6 @@
-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-e23f840f.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";
-const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
+import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-4fa4df3f.js";
+import { resolveComponent as m, openBlock as l, createBlock as b, withCtx as g, createVNode as w, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as u, toDisplayString as y, createCommentVNode as f, normalizeClass as S } from "vue";
+const A = { class: "no-redirect" }, k = v({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);
 } }, watch: { $route() {
   this.getBreadcrumb();
@@ -35,8 +35,8 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
 }, 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 });
+  const d = m("el-breadcrumb-item"), n = m("el-breadcrumb");
+  return l(), b(n, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [w(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(() => [u("span", A, y(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() {
@@ -93,10 +93,10 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
     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)])]));
-}], ["__scopeId", "data-v-a5252a92"]]) }, mixins: [E], data: () => ({ showMenuRoute: I(), systemCode: null }), computed: { sidebar() {
+} } }, V = ["src"], Q = { 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 = v({ name: "Layout", components: { Menubar: O, Breadcrumb: k, TabContent: v(N, [["render", function(e, t, a, r, o, s) {
+  const d = m("el-tab-pane"), n = m("el-tabs");
+  return l(), p("div", null, [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(() => [u("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"])) : f("", !0), u("div", Q, [u("div", R, [u("div", q, y(o.defaultPageTipCn), 1), u("div", z, y(o.defaultPageTipEn), 1)])])]);
+}], ["__scopeId", "data-v-acb71e42"]]) }, mixins: [E], data: () => ({ showMenuRoute: I(), systemCode: null }), computed: { sidebar() {
   return this.$store.state.app.sidebar;
 }, device() {
   return this.$store.state.app.device;
@@ -107,8 +107,8 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
 }, 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);
+  const d = m("menubar"), n = m("breadcrumb"), i = m("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)) })) : f("", !0), w(d, { "system-code": o.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), u("div", j, [o.showMenuRoute ? (l(), b(n, { key: 0 })) : f("", !0), w(i)])], 2);
 }], ["__scopeId", "data-v-5c0a6bf6"]]);
 export {
   W as default

package/lib/{tache-subprocess-history-59bda1ed.js → tache-subprocess-history-d52e150e.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-e23f840f.js";
+import { _ as I } from "./index-4fa4df3f.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.22",
+  "version": "1.1.23",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/fs-upload-new/src/fs-upload-new.vue

@@ -136,22 +136,18 @@ const props = defineProps({
       return null
     }
   },
-  //  兼容旧的fs-upload-list {showName: '文件名1,文件名2', serverPath: '文件uuid1,文件uuid2'}
   fileInfo: {
     type: Object,
     default: () => ({})
   },
-  // 系统编码
   systemCode: {
     type: String,
     default: ''
   },
-  // 上传控件显示类型， input / button / drag
   displayType: {
     type: String,
     default: 'input'
   },
-  // 是否禁止编辑
   disabled: {
     type: Boolean,
     default: false
@@ -161,42 +157,34 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
-  // 允许上传的文件类型，默认不限制
   accept: {
     type: String,
     default: ''
   },
-  // 是否多选，默认不多选
   multiple: {
     type: Boolean,
     default: false
   },
-  // 限制文件个数，默认不限制
   limit: {
     type: Number,
     default: null
   },
-  // 文件大小限制，单位是M，默认是30M
   limitFileSize: {
     type: Number,
     default: 30
   },
-  // 占位符文字
   placeholder: {
     type: String,
     default: '拖拽文件 或 点击上传'
   },
-  // 上传地址，可不传
   action: {
     type: String,
     default: ''
   },
-  // 请求头部信息，默认可不传,可传入 { Authorization：‘token’ } 等信息
   headers: {
     type: Object,
     default: () => ({ Authorization: null })
   },
-  // 已上传文件列表，格式：[{ name: '文件名', serverPath: '文件uuid' }]
   fileList: {
     type: Array<{ showName: string; serverPath: string }>,
     default: () => []

package/packages/index.js

@@ -1,8 +1,4 @@
-import '../src/utils/insert_css' // 公共样式库
 // 依次导入组件库的各个组件
-import { resizeDirective } from '../src/utils/resize'
-import '../src/utils/iframe-communicator';
-import store from '../src/store';
 import Breadcrumb from './breadcrumb'
 import DepartmentTree from './department-tree'
 import Hamburger from './hamburger'
@@ -45,10 +41,8 @@ import ScanCodeInputBrowser from './scan-code-input-browser'
 import WorkgroupTreeMobile from './workgroup-tree-mobile'
 import RowForm from './row-form'
 import * as ElementPlusIconsVue from "@element-plus/icons-vue"
-import YxAffix from '../src/components/Affix';
 // 将所有组件都存储起来,方便后续统一注册
 const components = [
-  YxAffix,
   Breadcrumb,
   DepartmentTree,
   Hamburger,
@@ -94,7 +88,6 @@ const install = function (Vue) {
   // customPlugin.install(Vue)
   Vue.use(customPlugin)
   if (install.installed) return
-  Vue.directive('resize', resizeDirective)
   // components.map(component => Vue.component(component.name, component))
   components.forEach((component) => {
     Vue.component(component.name, component)
@@ -105,9 +98,6 @@ const install = function (Vue) {
   for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     Vue.component(key, component)
   }
-  // store挂载到Vue原型
-  Vue.provide('$agilebuilderUIStore', store);
-  if(Vue.config.globalProperties) Vue.config.globalProperties.$agilebuilderUIStore = store;
 }
 
 //  判断是否是直接引入vue的js文件，即全局引用可自动安装所有组件
@@ -156,6 +146,5 @@ export {
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
-  store,
   ...components,
 }

package/packages/row-form/operation.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="column.operations" class="grid-operation-buttons">
+  <div v-if="column.operations" class="grid-operation-buttons operation-area">
     <span
       v-for="(operation, operationIndex) in column.operations"
       :key="operationIndex"
@@ -9,6 +9,7 @@
         v-if="operation.isGroup"
         :size="operation.buttons && operation.buttons.length > 0 ? operation.buttons[0].props.size : 'small'"
         split-button
+        style="padding-left: 10px"
         @command="handleCommand"
       >
         {{ $escapeHtml(operation.label) }}

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

@@ -22,7 +22,6 @@ import eventBus from './eventBus'
 import { isPromise } from '../../../src/utils/common-util'
 import { updateWithPageValue } from '../../../src/utils/jump-page-utils'
 import { getGuId } from '../../../src/utils/guid.js';
-import { ElMessageBox } from 'element-plus';
 
 const apis = {
   // 列表工具栏控件刷新列表数据。添加该方法解决工具栏值清空后，列表内容没有还原问题
@@ -136,6 +135,7 @@ const apis = {
   // 新建行
   createRow(listCode, row, options) {
     return new Promise((resolve, reject) => {
+      debugger;
       if (!listCode) {
         listCode = store.get('_list_code')
       }
@@ -420,60 +420,6 @@ const apis = {
       }
     }
   },
-  isLastEditRowSaveMessage(listCode) {
-    if (!listCode) {
-      listCode = store.get('_list_code')
-    }
-    const gridParams = store.get(listCode)
-    if (!isLastEditRowSave(listCode)) {
-      // 最后编辑的一行没有保存，则提示
-      window.$vueApp.config.globalProperties.$message({
-        showClose: true,
-        message: getI18n().t('superGrid.pleaseSaveLine', {
-          row: gridParams.$rowIndex + 1
-        }),
-        type: 'warning'
-      })
-      return false
-    }
-    return true
-  },
-  // 切换行编辑时候提示
-  confirmBeforeSwitchingRow(listCode, callback) {
-    if (!listCode) {
-      listCode = store.get('_list_code')
-    }
-    const { t } = getI18n()
-    const gridParams = store.get(listCode)
-    const rowIndex = gridParams.$rowIndex
-    if (!isLastEditRowSave(listCode)) {
-      ElMessageBox.confirm(
-        t('superGrid.rowEditMessageBox.content'), // 当前行有未保存的修改，你是否要切换编辑行？
-        t('superGrid.rowEditMessageBox.title'), // 操作确认
-        {
-          distinguishCancelAndClose: true,
-          confirmButtonText: t('superGrid.rowEditMessageBox.confirmButton'), // 提交修改
-          cancelButtonText: t('superGrid.rowEditMessageBox.cancelButton'), // 放弃修改
-          showClose: true,
-          beforeClose: (action, instance, done) => {
-            if (action === 'confirm') {
-              this.saveRow(rowIndex, listCode).then((res) => {
-                // this.editRow(rowIndex, listCode, true)
-                callback?.('confirm');
-                done();
-              })
-            } else if (action === 'cancel') {
-              this.restoreCurrentRow(rowIndex, listCode)
-              callback?.('cancel');
-              done();
-            } else if (action === 'close') {
-              done();
-            }
-          },
-        }
-      )
-    }
-  },
   // 编辑行
   editRow(rowIndex, listCode, isSaveCallback) {
     if (!listCode) {

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

@@ -334,7 +334,7 @@ export default defineComponent({
             renderDom: (AddBtn) => (
                 <Scrollbar onScrollToBottom={scrollLoad} flex-auto set-max-height={data => {
                     if (data?.windowHeight) {
-                        const height = data?.windowHeight - 70
+                        const height = data?.windowHeight - 160
                         return height > 400 ? height : 400
                     }
                 }}>

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

@@ -902,7 +902,6 @@ export default {
       )
       that.innerValue = data.result
       that.blurEvent()
-      this.callCustomEvent('afterScanDone')
     })
   },
   destroyed() {

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

@@ -1,5 +1,5 @@
 <template>
-  <el-table-column :min-width="column.width ? column.width : 150" :align="column.groupHeader ? 'center' : ''">
+  <el-table-column :width="column.width ? column.width : 150" :align="column.groupHeader ? 'center' : ''">
     <template v-slot:header>
       <span class="cell--span" :title="label" v-html="label" />
     </template>

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

@@ -2,7 +2,7 @@
   <el-table-column
     align="center"
     :fixed="fixed"
-    :width="70"
+    :width="column.width ? column.width : '80'"
   >
     <template v-slot:header>
       <span class="cell--span">{{ $t('superGrid.index') }}</span>

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

@@ -1,9 +1,8 @@
 <template>
-  <div class="normal-column-content-view">
+  <div style="width: 100%">
     <!--添加:key="column.prop+'_'+rowIndex"是为了解决多行是行编辑状态时新建的记录的文本框内有值的问题-->
     <dynamic-input
-      v-if="isEditing || isShowForm"
-      ref="dynamicRef"
+      v-if="(lineEdit.editable && isEditable && row.$editing && !isContentViewText) || isShowForm"
       v-model:value="row[column.prop]"
       :class="requiredClass"
       :column="column"
@@ -21,7 +20,6 @@
       :row="row"
       :row-index="rowIndex"
       :type="column.componentType"
-      @keyup.enter="clearAllEditing"
       @findIndex="findIndex(rowIndex)"
       @focus="onFocus(rowIndex)"
       @prohibit-to-edit="prohibitToEdit"
@@ -34,11 +32,7 @@
       @change-required="changeRequired"
       @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">
-        <el-icon :size="14" color="#409eff"><Edit /></el-icon>
-        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>请点击输入</span>
-      </div>
+    <span v-else>
       <span v-if="column.operations" class="grid-operation-buttons">
         <span
           v-for="(operation, operationIndex) in column.operations"
@@ -49,6 +43,7 @@
             v-if="operation.isGroup"
             :size="operation.buttons && operation.buttons.length > 0 ? operation.buttons[0].props.size : 'small'"
             split-button
+            style="padding-left: 10px"
             @command="handleCommand"
           >
             {{ $escapeHtml(operation.label) }}
@@ -178,7 +173,7 @@
           :value="getCellValue(row)"
         />
       </span>
-      <template v-else-if="isObjectProp(column.prop)">
+      <span v-else-if="isObjectProp(column.prop)">
         <!-- isObjectProp => prop.indexOf('.') > 0 -->
         <span v-if="column.formatter && column.formatter.type === 'files'" type="primary">
           <span
@@ -244,8 +239,8 @@
         <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'">{{
           $escapeHtml(getLabel(row, rowIndex))
         }}</span>
-      </template>
-      <template v-else>
+      </span>
+      <span v-else>
         <span v-if="column.componentType === 'annex' || column.componentType === 'multipartUpload'" type="primary">
           <span
             v-if="isShowOverflowTooltip"
@@ -315,11 +310,11 @@
           </span>
         </el-link>
         <!-- 富文本 -->
-        <template v-else-if="column.formatter && column.formatter.type === 'richEditor'">
+        <span v-else-if="column.formatter && column.formatter.type === 'richEditor'">
           <el-tooltip :content="$t('superGrid.show')" class="item" effect="dark" placement="top">
             <em class="fa fa-info-circle annex-cell" @click="showRichEditorContent(row, column, getHeader())" />
           </el-tooltip>
-        </template>
+        </span>
         <GridIcon
           v-else-if="column.formatter && column.formatter.type === 'icon'"
           :id="column.prop + 'DomData' + rowIndex"
@@ -341,8 +336,8 @@
         <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'">{{
           $escapeHtml(getLabel(row, rowIndex))
         }}</span>
-      </template>
-    </div>
+      </span>
+    </span>
     <view-image-dialog v-if="showSingleImgFlag" :file-list="fileList" @close="showSingleImgFlag = false" />
     <rich-editor-viewer
       v-if="showRichEditorViewer"
@@ -380,8 +375,6 @@ import FsPreview from '../../fs-preview'
 import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import { formatScanRuleSets } from './scan-util.ts'
-import storeVuex from '../../../src/store';
-
 export default {
   components: {
     DynamicInput,
@@ -525,43 +518,6 @@ export default {
     }
   },
   computed: {
-    isHideEdit() {
-      if (this.disabled) return true
-      // if (['customControl'].includes(this.columnFormatter?.type) && this.columnFormatter?.options?.format) return true
-      // if (this.column?.operations?.some(operation => operation?.props?.customControl)) return true
-      return false
-    },
-    $rowGuId() {
-      return `${this.row.$rowDataGuId ?? this.row.id ?? this.rowIndex}`
-    },
-    // 字段唯一标识
-    $rowColumnDataGuId() {
-      return `${this.$rowGuId}_${this.column.prop}`
-    },
-    // 手动触发编辑状态
-    isEditing() {
-      try {
-        // 没权限
-        if (!this.hasEditPermission) return
-        // 检测到单选修改模式
-        if (storeVuex.getters.isEditing(this.$rowColumnDataGuId)) return true
-        // 判定不是子表情况
-        if (!this.isFormSubTable) {
-          if (this.row.$editing) {
-            // 检测是否是单元格同一行
-            if (storeVuex.getters.isRowEditing(this.$rowGuId)) return false
-            return true
-          }
-        }
-        return this.row.$editing;
-      } catch (error) {
-        return false
-      }
-    },
-    // 基础编辑权限
-    hasEditPermission() {
-      return this.lineEdit.editable && this.isEditable && !this.isContentViewText
-    },
     // lineEdit() {
     //   let isLineEdit = false
     //   if (this.listCode) {
@@ -578,15 +534,6 @@ export default {
     ...mapGetters(['preventReclick'])
   },
   watch: {
-    // 取消行时候
-    'row.$editing': {
-      deep: true,
-      handler(newValue) {
-        if([false].includes(newValue)) {
-          this.clearAllEditing()
-        }
-      }
-    },
     isSql: {
       deep: true,
 
@@ -763,85 +710,6 @@ export default {
   methods: {
     ...customFormatter,
     ...apis,
-    // 清理所有手动编辑
-    clearAllEditing() {
-      if (this.hasEditPermission) {
-        storeVuex?.dispatch?.('clearAllEditing')
-      }
-    },
-    // 手动编辑触发
-    onEditing(event) {
-      if (this.hasEditPermission && !this.isEditing) {
-        event.stopPropagation()
-
-        const onEditing = () => {
-          this.clearAllEditing()
-          storeVuex?.dispatch?.('setRowEditing', {
-            $rowDataGuId: this.$rowColumnDataGuId,
-            isEditing: true
-          })
-          setTimeout(this.focusBottomInput, 400)
-        }
-
-        if(!this.isFormSubTable) {
-          // 非子表
-          if (storeVuex.getters.isConfigEditing) {
-            if (storeVuex.getters.isRowEditing(this.$rowGuId)) {
-              onEditing()
-            } else {
-              const isNext =  this.isLastEditRowSaveMessage(this.listCode)
-              if (!isNext) return
-            }
-            // else {
-            //   // this.isLastEditRowSaveMessage(this.listCode)
-            //   // this.confirmBeforeSwitchingRow(this.listCode, () => { })
-            // }
-          } else {
-            const isNext =  this.isLastEditRowSaveMessage(this.listCode)
-            if (!isNext) return
-            // 如果不是子表 则 开启 编辑模式
-            this.editRow(this.rowIndex, this.listCode, true)
-            onEditing()
-          }
-        } else {
-          // 取消所有列编辑状态
-          this.restoreGridEdit(this.listCode)
-          // 子表
-          onEditing()
-        }
-      }
-    },
-    // 默认聚焦渲染组件
-    focusBottomInput() {
-      this.$nextTick(() => {
-        try {
-          const getOffsetParent = (selectorAll) => {
-            return selectorAll ? Array.from(this.$refs.dynamicRef.$el.querySelectorAll(selectorAll)).filter(control => !!control.offsetParent) : [];
-          }
-
-          let visibleFormControls = getOffsetParent('.el-select, .el-date-picker, .el-upload');
-          if (visibleFormControls.length) {
-            visibleFormControls[0].click()
-          } else {
-            visibleFormControls = getOffsetParent('input, textarea');
-            if (visibleFormControls.length > 0) {
-              const bottomControl = visibleFormControls.reduce((prev, current) => {
-                return current.getBoundingClientRect().bottom > prev.getBoundingClientRect().bottom
-                  ? current
-                  : prev;
-              });
-              if (['INPUT', 'TEXTAREA'].includes(bottomControl.tagName)) {
-                bottomControl.focus();
-                bottomControl.select();
-              }
-            }
-
-          }
-        } catch (error) {
-          console.error(error)
-        }
-      })
-    },
     getFileObj(fileSet) {
       if (fileSet) {
         return JSON.parse(fileSet)
@@ -1188,36 +1056,4 @@ export default {
   content: '*';
   color: #f56c6c;
 }
-
-.column-text-main {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-
-  .column-text-edit-main {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    &::after {
-      content: ' ';
-      position: absolute;
-      left: 0;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      cursor: pointer;
-    }
-
-    & ~ span {
-      text-align: left;
-      &:empty {
-        display: none;
-      }
-    }
-  }
-}
-.normal-column-content-view {
-  display: inline;
-}
 </style>

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

@@ -9,7 +9,7 @@
     :header-align="headerAlign"
     :prop="column.prop"
     :sortable="sortable"
-    :min-width="getColumnWidth()"
+    :width="getColumnWidth()"
   >
     <template v-slot:header>
       <span v-if="!column.customHeader" :class="{ is_req: isFieldRequired() }">

package/packages/super-grid/src/row-operation.vue

@@ -2,8 +2,8 @@
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
   <span :style="myStyle">
-    <template v-if="isShowButton()">
-      <template v-if="label">
+    <span v-if="isShowButton()">
+      <span v-if="label">
         <!-- <el-tooltip :content="label" class="item" effect="dark" placement="top-start"> -->
         <component
           v-bind="operationSetting"
@@ -23,8 +23,8 @@
           >{{ label }}</component
         >
         <!-- </el-tooltip> -->
-      </template>
-      <template v-else>
+      </span>
+      <span v-else>
         <component
           v-bind="operationSetting"
           :is="elementType"
@@ -40,8 +40,8 @@
           :disabled="preventReclick"
           @mousedown="onClickFun(operationSetting)"
         />
-      </template>
-    </template>
+      </span>
+    </span>
   </span>
 </template>
 
@@ -130,7 +130,7 @@ export default {
         this.operationSetting.elementType === 'el-button')
     ) {
       // 如果不是第0个元素，且是按钮时，添加左边距10px，使按钮不紧挨着
-      // this.myStyle = { marginLeft: '10px' } // 不适合固定，建议结构样式默认
+      this.myStyle = { marginLeft: '10px' }
     }
     if (this.operationSetting.elementType) {
       this.elementType = this.operationSetting.elementType

package/packages/super-grid/src/search-button.vue

@@ -16,7 +16,7 @@
 			{{ $t('superGrid.saveCondition') }}
 		</el-button>
 		<el-button
-			v-if="isShowOpen ?? !isMobile"
+			v-if="!isMobile"
 			:icon="isMyOpen ? CaretTop : CaretBottom"
 			link
 			size="default"
@@ -47,12 +47,7 @@ export default {
 		isOpen: {
 			type: Boolean,
 			default: false,
-		},
-		// 是否手动开启与管理
-		isShowOpen: {
-			type: Boolean,
-			default: undefined,
-		},
+		}
 	},
 	data() {
 		const isMobile = isMobileBrowser()