n20-common-lib 3.0.22 → 3.0.23

package/src/components/DragList/index.vue

@@ -4,23 +4,34 @@
     :animation="200"
     :group="group"
     :disabled="disabled"
-    :handle="'.n20-icon-tuodong'"
+    :handle="'.icon-drag'"
     @change="change"
   >
-    <div v-for="(item, index) in list" :key="index" class="n20-drag-list-item">
-      <i class="n20-drag-icon n20-icon-tuodong"></i>
+    <div
+      v-for="(item, index) in list"
+      :key="index"
+      class="n20-drag-list-item"
+      @mouseenter="hoverIndex = index"
+      @mouseleave="hoverIndex = -1"
+    >
+      <i class="iconfont icon-drag f-s-b pointer m-r-s"></i>
       <slot :item="item" :index="index">
-        <span
-          v-hover-tooltip:158="item[labelKey] || item"
-          class="text-ellipsis pointer color-primary"
-          @click="$emit('click', item)"
-          >{{ item[labelKey] || item }}</span
-        >
+        <span v-hover-tooltip:158="item[labelKey] || item" class="drag-item-text" @click="$emit('click', item)">{{
+          item[labelKey] || item
+        }}</span>
       </slot>
-      <el-link
+      <!-- hover 时显示锁定图标，点击将该项固定到 fixedColumns -->
+      <i
+        v-if="inSC && !disabled && !hideDelete"
+        v-show="hoverIndex === index"
+        class="iconfont icon-unlock icon-class"
+        :disabled="item.checked"
+        @click="lock(index)"
+      />
+      <i
+        v-show="hoverIndex === index"
         v-if="!disabled && !hideDelete"
-        class="n20-icon-shanchu"
-        :underline="false"
+        class="iconfont icon-delete icon-class"
         :disabled="inSC && item.checked"
         @click="remove(index)"
       />
@@ -57,6 +68,11 @@ export default {
       default: 'label'
     }
   },
+  data() {
+    return {
+      hoverIndex: -1
+    }
+  },
   computed: {
     inSC() {
       return !!this.$attrs['in-show-column']
@@ -66,6 +82,11 @@ export default {
     change() {
       this.$emit('change', this.list)
     },
+    lock(index) {
+      const item = this.list[index]
+      if (item.checked) return
+      this.$emit('lock', { index, item })
+    },
     remove(index) {
       let item = this.list[index]
       if (this.$listeners.remove) {

package/src/components/HandlingAdvice/index.vue

@@ -8,6 +8,7 @@
       @closed="$emit('closed')"
       @open="$emit('open')"
       @opened="$emit('opened')"
+      :close-on-click-modal="false"
     >
       <el-form v-if="whether" style="margin-bottom: 50px">
         <el-form-item>

package/src/components/ShowColumn/index copy.vue

@@ -280,7 +280,12 @@ export default {
       }
     },
     setState() {
-      return this.columnsAs.length && this.columnsAs.length === this.dragListN.length
+      const columnsAs = []
+      forEachs(this.columnsAs, (item) => {
+        columnsAs.push(item)
+      })
+      return columnsAs.length && columnsAs.length === this.dragListN.length
+      // return this.columnsAs.length && this.columnsAs.length === this.dragListN.length
     },
     columnsAs: {
       get() {
@@ -289,6 +294,9 @@ export default {
       set(val) {
         return val
       }
+    },
+    columnsN() {
+      return this.columns || []
     }
   },
   watch: {
@@ -373,8 +381,7 @@ export default {
       this.configVisible = false
     },
     popOpen() {
-      // 深拷贝一下，防止修改
-      this.dragList = JSON.parse(JSON.stringify(this.checkColumns)).filter((col) => !col.static)
+      this.dragList = this.checkColumns.filter((col) => !col.static)
     },
     setAll() {
       if (this.setState) {
@@ -425,30 +432,27 @@ export default {
       // 自动保存设置的显示列
       this.userNo = sessionStorage.getItem('userNo')
       !this.isExport && this.autoSave && this.saveColumns(list)
+
+      this.$emit('setColumns', list)
       if (this.isExport) {
         this.visible = false
-         this.$emit('setColumns', list)
       }
     },
     saveColumns(list) {
       let columns = saveTransform(list, this.labelKey, this.isFilter)
       axios.post(
-        '/bems/prod_1.0/user/pageHabit',
+        `/bems/prod_1.0/user/pageHabit?t=${Math.random()}`,
         {
           userNo: this.userNo,
           pageId: this.pageId,
           showStructure: JSON.stringify(columns)
         },
         { loading: false }
-      ).then(() => {
-        this.getColumns(this.pageId).then(list => {
-               this.visible = false
-        this.$emit('setColumns', list)
-      })
-      })
+      )
+      this.visible = false
     },
     getColumns(pageId) {
-      return getColumns(pageId || this.pageId, this.userNo, this.columns, this.labelKey)
+      return getColumns(pageId || this.pageId, this.userNo, this.columnsN, this.labelKey)
     }
   }
 }
@@ -459,14 +463,12 @@ function saveTransform(list, labelKey, isFilter) {
     list.forEach((c) => {
       if (c.prop && !c.children && !c.isNew && !c.width & !c.isNew) {
         listN.push({ _colKey: 'prop', _colVal: c.prop })
-      } else if (c.slotName) {
-        listN.push({ _colKey: 'slotName', _colVal: c.slotName })
       } else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
         listN.push({ _colKey: 'type', _colVal: c.type })
       } else {
         let sFn = false
         for (let k in c) {
-          // if (typeof c[k] === 'function') sFn = true
+          if (typeof c[k] === 'function') sFn = true
         }
         if (sFn && c[labelKey]) {
           listN.push({ _colKey: labelKey, _colVal: c[labelKey] })
@@ -483,8 +485,6 @@ function saveTransform(list, labelKey, isFilter) {
         listN.push({ _colKey: 'startValue', _colVal: c.startValue })
       } else if (c.startDate) {
         listN.push({ _colKey: 'startDate', _colVal: c.startDate })
-      } else if (c.slotName) {
-        listN.push({ _colKey: 'slotName', _colVal: c.slotName })
       } else {
         listN.push(c)
       }
@@ -495,7 +495,6 @@ function saveTransform(list, labelKey, isFilter) {
 
 function getTransform(list, columnsT, labelKey = 'label') {
   let columns = []
-
   list.forEach((d) => {
     // 如果list中的每一项是字符串
     if (typeof d === 'string') {
@@ -505,16 +504,6 @@ function getTransform(list, columnsT, labelKey = 'label') {
       column && columns.push(column)
       // 如果list中的每一项是对象
     } else if (typeof d === 'object') {
-      if (d.children) {
-        d.children.forEach((item, index) => {
-          let column = columnsT.find((c) => c.prop === d.children[index].prop)
-          // 如果找到，则将其添加到columns中
-        if (column.formatter) {
-          d.children[index].formatter = column.formatter
-        }
-        })
-        columns.push(d)
-      } else {
       // 如果d中有_colKey属性
       if (d._colKey) {
         // 从columnsT中找到d._colKey等于d._colVal的项
@@ -523,15 +512,11 @@ function getTransform(list, columnsT, labelKey = 'label') {
         column && columns.push(column)
         // 如果d中没有_colKey属性
       } else {
-        let column = columnsT.find((c) => c.prop === d.prop)
-        d.formatter = column.formatter
         // 将d添加到columns中
         columns.push(d)
-        }
       }
     }
   })
-    console.log(columns)
   // 返回columns
   return columns
 }
@@ -541,7 +526,7 @@ export function getColumns(pageId, userNo, columnsT, labelKey = 'label') {
   return new Promise((resolve, reject) => {
     axios
       .post(
-        '/bems/prod_1.0/user/pageHabit/list',
+        `/bems/prod_1.0/user/pageHabit/list?t=${Math.random()}`,
         {
           userNo: userNo,
           pageId: pageId

package/src/components/ShowColumn/index.vue

@@ -2,7 +2,7 @@
   <dialog-wrap
     ref="dialog"
     v-drag
-    class="p-t-0"
+    class="p-a-0"
     v-bind="$attrs"
     :visible.sync="visible"
     :title="title"
@@ -12,26 +12,32 @@
   >
     <div class="dialog-view">
       <div class="flex-box">
-        <div class="left-c flex-column p-t-m bd-r">
-          <div class="flex-box flex-v p-r m-b">
-            <span>{{ header }}</span>
-            <span class="m-l-m color-999">
-              {{ '已选' | $lc }}
-              <span class="color-main">{{ dragList.length }}</span>
-            </span>
-            <el-link :underline="false" type="primary" class="m-l-auto" @click="setAll">{{
-              setState ? $lc('全部清空') : $lc('全部选中')
-            }}</el-link>
+        <div class="left-c">
+          <div>
+            <el-input
+              v-model="searchKeyword"
+              class="dialog-view-search"
+              :placeholder="$lc('搜索')"
+              suffix-icon="el-icon-search"
+              clearable
+            ></el-input>
+
+            <div class="m-t-m">
+              <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="setAll">{{
+                $lc('全部')
+              }}</el-checkbox>
+            </div>
           </div>
           <div class="flex-item p-r" style="height: 50%; overflow: auto">
-            <el-checkbox-group :value="dragListN.map((d) => d[labelKey])">
+            <!-- :value 需包含 static 列的 label，使其显示为选中状态 -->
+            <el-checkbox-group :value="checkedLabelValues" @change="handleCheckedChange">
               <template v-if="!columnsGroups">
                 <el-checkbox
-                  v-for="(column, i) in columnsAs"
+                  v-for="(column, i) in filteredColumnsAs"
                   :key="i"
                   v-hover-tooltip="column[labelKey]"
                   :label="column[labelKey]"
-                  :disabled="column.checked"
+                  :disabled="column.checked || !!column.static"
                   class="m-t"
                   @change="(val) => checkChange(val, column)"
                   >{{ column[labelKey] }}</el-checkbox
@@ -40,13 +46,13 @@
               <template v-else>
                 <div v-for="gp in columnsGroups" :key="gp.groupId" class="m-b">
                   <div class="f-s-b font-w600">{{ gp.groupName }}</div>
-                  <template v-for="(column, i) in columnsAs">
+                  <template v-for="(column, i) in filteredColumnsAs">
                     <el-checkbox
                       v-if="column.groupId === gp.groupId"
                       :key="i"
                       v-hover-tooltip="column[labelKey]"
                       :label="column[labelKey]"
-                      :disabled="column.checked"
+                      :disabled="column.checked || !!column.static"
                       class="m-t"
                       @change="(val) => checkChange(val, column)"
                       >{{ column[labelKey] }}</el-checkbox
@@ -57,13 +63,68 @@
             </el-checkbox-group>
           </div>
         </div>
-        <div v-if="!hasPX" class="right-c flex-column p-t-m">
-          <div class="m-b">
-            {{ '当前选定项' | $lc }}
-            <el-link type="primary" style="visibility: hidden">{{ '当前选定项' | $lc }}</el-link>
+        <div v-if="!hasPX" class="right-c">
+          <div class="right-header m-b-s">
+            <div>
+              {{ '当前选定项' | $lc }}
+              <span class="right-count"> ({{ rightTotalCount }}) </span>
+            </div>
+            <i class="iconfont icon-delete pointer icon-class" @click="clearAll"></i>
           </div>
-          <div class="flex-1 overflow-y">
-            <drag-list :list="dragList" :label-key="labelKey" :in-show-column="true" />
+          <div class="overflow-y w-100p darg-list-wrap">
+            <!-- 纯静态列（static=true），不可拖拽，无删除 -->
+            <div v-for="(item, index) in pureStaticColumns" :key="'ps-' + index" class="n20-drag-list-item">
+              <i class="iconfont icon-lock f-s-b m-r-s"></i>
+              <span v-hover-tooltip:158="item[labelKey] || item" class="drag-item-text">{{
+                item[labelKey] || item
+              }}</span>
+            </div>
+            <!-- 固定列（fixed=true），可拖拽排序，可解锁，可删除 -->
+            <template v-if="fixedColumns.length > 0">
+              <vue-draggable
+                :list="fixedColumns"
+                :animation="200"
+                group="fixedBox"
+                handle=".icon-drag"
+                @change="onFixedDragChange"
+              >
+                <div
+                  v-for="(item, index) in fixedColumns"
+                  :key="'fx-' + index"
+                  class="n20-drag-list-item"
+                  @mouseenter="fixedHoverIndex = index"
+                  @mouseleave="fixedHoverIndex = -1"
+                >
+                  <i class="iconfont icon-drag f-s-b pointer m-r-s"></i>
+                  <span v-hover-tooltip:158="item[labelKey] || item" class="drag-item-text flex-item">{{
+                    item[labelKey] || item
+                  }}</span>
+                  <!-- hover 时显示解锁图标，点击将该项移回 dragList -->
+                  <i
+                    v-show="fixedHoverIndex === index"
+                    class="iconfont icon-unlock icon-class m-r-s"
+                    @click="unlockFixed(item, index)"
+                  />
+                  <i
+                    v-show="fixedHoverIndex === index"
+                    class="iconfont icon-delete icon-class"
+                    @click="removeFixed(item)"
+                  />
+                </div>
+              </vue-draggable>
+            </template>
+            <!-- 分隔线 -->
+            <div class="fixed-divider">
+              <span class="fixed-divider-text">{{ '以上为已固定列' | $lc }}</span>
+            </div>
+            <!-- 可拖拽列 -->
+            <drag-list
+              :list="dragList"
+              :label-key="labelKey"
+              :in-show-column="true"
+              @change="onDragChange"
+              @lock="onDragLock"
+            />
           </div>
         </div>
         <div v-else class="right-tree flex-column p-t-m">
@@ -88,7 +149,7 @@
           >
             <span slot-scope="{ node, data }" class="menu-item flex-item flex-box flex-lr flex-v">
               <span>
-                <i class="n20-drag-icon n20-icon-tuodong"></i>
+                <i class="iconfont icon-drag pointer"></i>
                 <span
                   :class="data.isNew ? 'color-success' : 'color-primary'"
                   class="text-ellipsis pointer"
@@ -165,9 +226,12 @@
         <el-button type="primary" @click="configSaveN">{{ '确定' | $lc }}</el-button>
       </div>
     </dialogWrap>
-    <div slot="footer" class="text-c">
-      <el-button type="primary" @click="setChange">{{ '确定' | $lc }}</el-button>
+    <div slot="footer" class="flex-box flex-lr">
       <el-button plain @click="reset">{{ '恢复默认' | $lc }}</el-button>
+      <div>
+        <el-button type="primary" plain @click="setChange">{{ '取消' | $lc }}</el-button>
+        <el-button type="primary" @click="setChange">{{ '确定' | $lc }}</el-button>
+      </div>
     </div>
   </dialog-wrap>
 </template>
@@ -178,11 +242,16 @@ import { $lc } from '../../utils/i18n/index'
 
 import { Message } from 'element-ui'
 import forEachs from '../../utils/forEachs'
+import importG from '../../utils/importGlobal.js'
 import dialogWrap from '../Dialog/index.vue'
 import dragList from '../DragList/index.vue'
 export default {
   name: 'ShowColumn',
-  components: { dialogWrap, dragList },
+  components: {
+    dialogWrap,
+    dragList,
+    vueDraggable: () => importG('vuedraggable', () => import(/*webpackChunkName: "vuedraggable"*/ 'vuedraggable'))
+  },
   inheritAttrs: false,
   props: {
     dialogVisible: {
@@ -233,6 +302,9 @@ export default {
   data() {
     return {
       dragList: [],
+      fixedColumns: [], // fixed属性的列（固定但可删除）
+      fixedHoverIndex: -1, // 固定列区域当前 hover 的项索引
+      searchKeyword: '', // 左侧搜索关键词
       configVisible: false,
       enabled: false,
       configModel: {
@@ -247,9 +319,12 @@ export default {
         isNew: true,
         children: []
       },
+      staticColumn: [], // 静态列
       userNo: sessionStorage.getItem('userNo'),
       configVisibleN: false,
-      dragListN: []
+      dragListN: [],
+      isIndeterminate: false,
+      checkAll: false
     }
   },
   computed: {
@@ -280,21 +355,50 @@ export default {
       }
     },
     setState() {
-      const columnsAs = []
-      forEachs(this.columnsAs, (item) => {
-        columnsAs.push(item)
-      })
-      return columnsAs.length && columnsAs.length === this.dragListN.length
-      // return this.columnsAs.length && this.columnsAs.length === this.dragListN.length
+      // 只用非 static 的可操作列判断全选状态，static 列不参与全选计算
+      const operableCols = this.columnsAs.filter((col) => !col.static)
+      return operableCols.length > 0 && operableCols.length === this.dragListN.length
+    },
+    // 纯静态列（static===true，即非 'pre'/'next' 的固定占位列，且非 fixed 可删列）
+    // 从 checkColumns（已选中列）中读取，在右侧顶部固定展示，不可删除不可拖拽
+    // static='pre'/'next' 的列在 setChange 中单独拼接到首尾，不在右侧展示
+    pureStaticColumns() {
+      return this.checkColumns.filter((col) => col.static && col.type !== 'checkbox' && !col.fixed)
+    },
+    // 右侧总数
+    rightTotalCount() {
+      return this.pureStaticColumns.length + this.fixedColumns.length + this.dragList.length
     },
+    // 左侧可选列：
+    // 1. 优先排除 type=checkbox/selection 的纯工具列（无论是否有 static）
+    // 3. 保留其余所有列：static 列（禁用已勾选）和普通可操作列
     columnsAs: {
       get() {
-        return this.columns.filter((col) => !col.static)
+        return this.columns.filter((col) => {
+          // 优先排除 type=checkbox/selection
+          if (col.type === 'checkbox' || col.type === 'selection') return false
+          return true
+        })
       },
       set(val) {
         return val
       }
     },
+    // 搜索过滤后的左侧列表，支持中英文实时过滤
+    filteredColumnsAs() {
+      const kw = (this.searchKeyword || '').trim().toLowerCase()
+      if (!kw) return this.columnsAs
+      return this.columnsAs.filter((col) => {
+        const label = (col[this.labelKey] || '').toLowerCase()
+        return label.includes(kw)
+      })
+    },
+    // checkbox-group 的已选中列表：包含当前选中的普通列 + 所有 static 列（默认选中且禁用）
+    checkedLabelValues() {
+      const selectedLabels = this.dragListN.map((d) => d[this.labelKey])
+      const staticLabels = this.columnsAs.filter((col) => col.static).map((col) => col[this.labelKey])
+      return [...new Set([...selectedLabels, ...staticLabels])]
+    },
     columnsN() {
       return this.columns || []
     }
@@ -302,26 +406,48 @@ export default {
   watch: {
     dragList: {
       handler() {
-        let arr = []
-        forEachs(this.dragList, (item) => {
-          arr.push(item)
-        })
-        this.dragListN = arr
-        /* const newArr = arr.filter((item) => {
-          return item.isNew
-        })
-        newArr.forEach((item) => {
-          const index = this.columns.findIndex((col) => col.prop === item.prop || col.label === item.label)
-          if (index === -1) {
-            this.columns.push(item)
-          }
-        }) */
+        this._syncDragListN()
       },
       immediate: true,
       deep: true
+    },
+    fixedColumns: {
+      handler() {
+        this._syncDragListN()
+      },
+      deep: true
     }
   },
   methods: {
+    _syncDragListN() {
+      let arr = []
+      forEachs(this.fixedColumns, (item) => {
+        arr.push(item)
+      })
+      forEachs(this.dragList, (item) => {
+        arr.push(item)
+      })
+      this.dragListN = arr
+      // 同步更新全选状态
+      this._syncCheckAllState()
+    },
+    _syncCheckAllState() {
+      // 只计算非 static 的可操作列数量，static 列禁用且默认选中，不参与全选状态计算
+      const operableCols = this.columnsAs.filter((col) => !col.static)
+      const total = operableCols.length
+      const checkedCount = this.dragListN.length
+      if (total === 0) {
+        this.checkAll = false
+        this.isIndeterminate = false
+      } else {
+        this.checkAll = checkedCount >= total
+        this.isIndeterminate = checkedCount > 0 && checkedCount < total
+      }
+    },
+    handleCheckedChange() {
+      // dragListN 由 watch 异步同步，此处不需要额外处理
+      // 全选状态由 _syncDragListN 结尾的 _syncCheckAllState 继序保证
+    },
     validator(rule, value, callback) {
       if (value) {
         if (value > 300) {
@@ -381,31 +507,90 @@ export default {
       this.configVisible = false
     },
     popOpen() {
-      this.dragList = this.checkColumns.filter((col) => !col.static)
+      // 每次开启弹窗重置搜索词
+      this.searchKeyword = ''
+      // static='pre'/'next' 是列表首尾占位列，在 setChange 中单独拼接，不进 data
+      // static===true 且带 fixed 的列需要进 fixedColumns；其他列进 dragList
+      const checked = this.checkColumns.filter((col) => col.static !== 'pre' && col.static !== 'next')
+      this.fixedColumns = checked.filter((col) => col.fixed)
+      this.dragList = checked.filter((col) => !col.fixed && !col.static)
     },
-    setAll() {
-      if (this.setState) {
-        this.dragList = this.dragList.filter((c) => c.checked)
+    setAll(val) {
+      if (val) {
+        // 点击全选：只操作非 static 的可操作列
+        const operableCols = this.columnsAs.filter((c) => !c.static)
+        this.fixedColumns = operableCols.filter((c) => c.fixed)
+        this.dragList = operableCols.filter((c) => !c.fixed)
       } else {
-        this.dragList = [...this.columnsAs]
+        // 点击反选：清空所有非锁定项（保留 checked=true 的常亮锁定项）
+        this.fixedColumns = this.fixedColumns.filter((c) => c.checked)
+        this.dragList = this.dragList.filter((c) => c.checked)
       }
+      // 手动同步确保当前 tick 内 dragListN 和全选状态就绪
+      this._syncDragListN()
     },
     checkChange(val, column) {
       if (val === false) {
+        // 从 fixedColumns 中移除
+        let fixedIdx = this.fixedColumns.findIndex((d) => d[this.labelKey] === column[this.labelKey])
+        if (fixedIdx !== -1) {
+          this.fixedColumns.splice(fixedIdx, 1)
+          return
+        }
+        // 从 dragList 中移除
         let index = this.dragList.findIndex((d) => d[this.labelKey] === column[this.labelKey])
         index !== -1 && this.dragList.splice(index, 1)
       } else {
+        // 检查是否已在 dragListN（同步列表）中
         let index = this.dragListN.findIndex((d) => d[this.labelKey] === column[this.labelKey])
         if (index !== -1) {
           Message.warning($lc(`子级请在右侧删除!`))
           return false
         }
-        this.dragList.push(column)
+        if (column.fixed) {
+          this.fixedColumns.push(column)
+        } else {
+          this.dragList.push(column)
+        }
+      }
+    },
+    removeFixed(item) {
+      let index = this.fixedColumns.findIndex((d) => d[this.labelKey] === item[this.labelKey])
+      if (index !== -1) {
+        this.fixedColumns.splice(index, 1)
       }
     },
+    unlockFixed(item, index) {
+      // 移除 fixed 属性，将该项从 fixedColumns 移回 dragList
+      const target = Object.assign({}, item, { fixed: false })
+      delete target.fixed
+      this.dragList.push(target)
+      this.fixedColumns.splice(index, 1)
+      this.fixedHoverIndex = -1
+    },
+    clearAll() {
+      this.fixedColumns = this.fixedColumns.filter((c) => c.checked)
+      this.dragList = this.dragList.filter((c) => c.checked)
+    },
+    onDragChange(list) {
+      this.dragList = list
+    },
+    onFixedDragChange() {
+      // vue-draggable 直接操作 fixedColumns 引用内容，触发 watch 同步 dragListN
+      this._syncDragListN()
+    },
+    onDragLock({ index, item }) {
+      // 将该项 fixed 设为 'left'，移入 fixedColumns，从 dragList 移除
+      const target = Object.assign({}, item, { fixed: 'left' })
+      this.fixedColumns.push(target)
+      this.dragList.splice(index, 1)
+    },
     reset() {
-      let dragList = this.columns.filter((col) => col.isDefault)
-      this.dragList = dragList.length ? dragList : this.checkColumns.filter((col) => !col.static)
+      const baseCols = this.columns.length
+        ? this.columns
+        : this.checkColumns.filter((col) => col.static !== 'pre' && col.static !== 'next')
+      this.fixedColumns = baseCols.filter((col) => col.fixed)
+      this.dragList = baseCols.filter((col) => !col.fixed && !col.static)
     },
     setChange() {
       if (this.dragList.length < 1) {
@@ -420,7 +605,7 @@ export default {
       let list = []
       let preCols = this.columns.filter((col) => col.static === 'pre')
       let nextCols = this.columns.filter((col) => col.static === 'next')
-      list.push(...preCols, ...this.dragList, ...nextCols)
+      list.push(...preCols, ...this.fixedColumns, ...this.dragList, ...nextCols)
       // 新增校验
       if (!this.isExport) {
         let state = list.findIndex((c) => c.isNew && c.children && c.children.length === 0)
@@ -441,7 +626,7 @@ export default {
     saveColumns(list) {
       let columns = saveTransform(list, this.labelKey, this.isFilter)
       axios.post(
-        '/bems/prod_1.0/user/pageHabit',
+        `/bems/prod_1.0/user/pageHabit?t=${Math.random()}`,
         {
           userNo: this.userNo,
           pageId: this.pageId,
@@ -526,7 +711,7 @@ export function getColumns(pageId, userNo, columnsT, labelKey = 'label') {
   return new Promise((resolve, reject) => {
     axios
       .post(
-        '/bems/prod_1.0/user/pageHabit/list',
+        `/bems/prod_1.0/user/pageHabit/list?t=${Math.random()}`,
         {
           userNo: userNo,
           pageId: pageId