n20-common-lib 3.2.45 → 3.2.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.45",
+  "version": "3.2.47",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/DynamicField/DynamicFormView.vue

@@ -1,263 +1,263 @@
-<template>
-  <cl-page class="CustomFormView">
-    <slot name="top"></slot>
-    <cl-expandable-pane v-for="(item, index) in formOptions" :key="index" :title="item.tabName">
-      <template v-if="item.slotName">
-        <slot :name="item.slotName"></slot>
-      </template>
-      <cl-descriptions>
-        <template v-for="(formItem, key) in item.list">
-          <!-- 字段标识：数组模式用 formItem.key，对象模式用 v-for 的 key -->
-          <el-descriptions-item v-if="formItem.type" :key="formItem.key || key" :label="$l(formItem.label)">
-            <template slot="label">
-              {{ formItem.label }}
-            </template>
-            <!-- 插槽 -->
-            <template v-if="formItem.type === 'slot'">
-              <div>
-                <slot :name="formItem.key || key"></slot>
-              </div>
-            </template>
-            <!-- 期限 -->
-            <template v-else-if="(formItem.key || key) === 'contractDTO_loanTerm' && formItem.type === 'input'">
-              <cl-diff
-                v-if="diff"
-                :value="`${formValue['contractDTO_loanTerm']} ${
-                  formValue['contractDTO_termUnit'] === 'DAY'
-                    ? $lc('天')
-                    : formValue['contractDTO_termUnit'] === 'MONTH'
-                    ? $lc('月')
-                    : formValue['contractDTO_termUnit'] === 'YEAR'
-                    ? $lc('年')
-                    : ''
-                }`"
-                :old-value="`${oldFormValue['contractDTO_loanTerm']} ${
-                  oldFormValue['contractDTO_termUnit'] === 'DAY'
-                    ? $lc('天')
-                    : oldFormValue['contractDTO_termUnit'] === 'MONTH'
-                    ? $lc('月')
-                    : oldFormValue['contractDTO_termUnit'] === 'YEAR'
-                    ? $lc('年')
-                    : ''
-                }`"
-                :tooltip="true"
-              />
-              <div v-else>
-                {{ formValue['contractDTO_loanTerm'] }}
-                {{
-                  formValue['contractDTO_termUnit'] === 'DAY'
-                    ? $lc('天')
-                    : formValue['contractDTO_termUnit'] === 'MONTH'
-                    ? $lc('月')
-                    : formValue['contractDTO_termUnit'] === 'YEAR'
-                    ? $lc('年')
-                    : ''
-                }}
-              </div>
-            </template>
-            <!-- 结构化/费用编号 -->
-            <template
-              v-else-if="
-                $lc(formItem.label) === $lc('是否结构化') ||
-                ((formItem.key || key) === 'exInfoDTO_feeNo' && (formItem.key || key) !== 'mainFeeCurrencyCode')
-              "
-            >
-              <cl-diff
-                v-if="diff"
-                :value="(formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'"
-                :old-value="(oldFormValue[formItem.key || key] && oldFormValue[formItem.key || key].name) || '--'"
-                :tooltip="true"
-              />
-              <div v-else>{{ (formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--' }}</div>
-            </template>
-            <!-- 地区信息 -->
-            <template v-else-if="(formItem.key || key) === 'recInfoDTO_areaInfo'">
-              <cl-diff
-                v-if="diff"
-                :value="formValue['recInfoDTO_areaInfoName'] || '--'"
-                :old-value="oldFormValue['recInfoDTO_areaInfoName'] || '--'"
-                :tooltip="true"
-              />
-              <div v-else>{{ formValue['recInfoDTO_areaInfoName'] || '--' }}</div>
-            </template>
-            <!-- 借/贷方 -->
-            <template
-              v-else-if="
-                (formItem.key || key) === 'contractDTO_debtorCode' ||
-                (formItem.key || key) === 'contractDTO_creditorCode'
-              "
-            >
-              <cl-diff
-                v-if="diff"
-                :value="(formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'"
-                :old-value="(oldFormValue[formItem.key || key] && oldFormValue[formItem.key || key].name) || '--'"
-                :tooltip="true"
-              />
-              <div v-else>{{ (formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--' }}</div>
-            </template>
-            <!-- 金额 -->
-            <template v-else-if="formItem.type === 'input-number'">
-              <div
-                v-if="
-                  [$lc('利率'), $lc('合同利率'), $lc('利率（%）'), $lc('合同利率（%）'), $lc('中间价')].includes(
-                    $l(formItem.label)
-                  )
-                "
-              >
-                <cl-diff
-                  v-if="diff"
-                  :value="
-                    (formValue[formItem.key || key] && numerify(formValue[formItem.key || key], '0.000000')) || '--'
-                  "
-                  :old-value="
-                    (oldFormValue[formItem.key || key] && numerify(oldFormValue[formItem.key || key], '0.000000')) ||
-                    '--'
-                  "
-                  :tooltip="true"
-                />
-                <span v-else>{{
-                  formValue[formItem.key || key] ? numerify(formValue[formItem.key || key], '0.000000') : '--'
-                }}</span>
-              </div>
-              <div v-else>
-                <cl-diff
-                  v-if="diff"
-                  :value="
-                    (formValue[formItem.key || key] && numerify(formValue[formItem.key || key], '0,0.00')) || '--'
-                  "
-                  :old-value="
-                    (oldFormValue[formItem.key || key] && numerify(oldFormValue[formItem.key || key], '0,0.00')) || '--'
-                  "
-                  :tooltip="true"
-                />
-                <span v-else>{{
-                  formValue[formItem.key || key] ? numerify(formValue[formItem.key || key], '0,0.00') : '--'
-                }}</span>
-              </div>
-            </template>
-            <!-- 来款国家（地区） -->
-            <template v-else-if="$lc(formItem.label) === $lc('来款国家（地区）')">
-              <cl-diff
-                v-if="diff"
-                :value="formValue['applyInfoDTO_areaInfoName'] || '--'"
-                :old-value="oldFormValue['applyInfoDTO_areaInfoName'] || '--'"
-                :tooltip="true"
-              />
-              <div v-else>{{ formValue['applyInfoDTO_areaInfoName'] || '--' }}</div>
-            </template>
-            <!-- 下拉枚举 -->
-            <template v-else-if="formItem.type === 'select'">
-              <div class="flex-box flex-v">
-                <div v-if="formValue[formItem.key || key] && formValue[formItem.key || key].name">
-                  <cl-diff
-                    v-if="diff"
-                    :value="(formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'"
-                    :old-value="(oldFormValue[formItem.key || key] && oldFormValue[formItem.key || key].name) || '--'"
-                    :tooltip="true"
-                  />
-                  <span v-else>{{
-                    (formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'
-                  }}</span>
-                </div>
-                <div v-else-if="formItem.label === $lc('结售汇性质')">
-                  <cl-diff
-                    v-if="diff"
-                    :value="formValue[formItem.key || key] || '--'"
-                    :old-value="oldFormValue[formItem.key || key] || '--'"
-                    :tooltip="true"
-                  />
-                  <span v-else>{{ formValue[formItem.key || key] || '--' }}</span>
-                </div>
-                <div v-else>
-                  <template v-if="diff">
-                    <cl-diff
-                      :value="getEnumName(formItem.enumList, formValue[formItem.key || key])"
-                      :old-value="getEnumName(formItem.enumList, oldFormValue[formItem.key || key])"
-                      :tooltip="true"
-                    />
-                  </template>
-                  <span v-else>{{ getEnumName(formItem.enumList, formValue[formItem.key || key]) }}</span>
-                </div>
-              </div>
-            </template>
-            <!-- 其他类型（含 text 类型，自动支持超长文本 Tooltip） -->
-            <template v-else>
-              <div>
-                <cl-diff
-                  v-if="diff"
-                  :value="formValue[formItem.key || key] || '--'"
-                  :old-value="oldFormValue[formItem.key || key] || '--'"
-                  :tooltip="true"
-                />
-                <div v-else>
-                  <el-tooltip
-                    v-if="formValue[formItem.key || key] && formValue[formItem.key || key].length > 50"
-                    class="item"
-                    effect="dark"
-                    :content="formValue[formItem.key || key]"
-                    placement="top"
-                  >
-                    <span>{{ formValue[formItem.key || key].slice(0, 50) + '...' }}</span>
-                  </el-tooltip>
-                  <span v-else>{{ formValue[formItem.key || key] || '--' }}</span>
-                </div>
-              </div>
-            </template>
-          </el-descriptions-item>
-        </template>
-      </cl-descriptions>
-    </cl-expandable-pane>
-    <slot name="bottom"></slot>
-  </cl-page>
-</template>
-
-<script>
-import numerify from 'numerify'
-
-import ClDescriptions from '../Descriptions/index.vue'
-import ClDiff from '../Diff/index.vue'
-import ClExpandablePane from '../Expandable/index.vue'
-import ClPage from '../PageLayout/page.vue'
-
-export default {
-  name: 'DynamicFormView',
-  components: { ClPage, ClExpandablePane, ClDescriptions, ClDiff },
-  props: {
-    // 表单配置
-    formOptions: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    formValue: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    diff: {
-      type: Boolean,
-      default: false
-    },
-    oldFormValue: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      numerify
-    }
-  },
-  methods: {
-    getEnumName(enumList, code) {
-      if (!enumList?.length) return
-      const enumData = Array.isArray(enumList) ? enumList : JSON.parse(enumList)
-      return enumData?.find((item) => (item.code || item.value) === code)?.name || '--'
-    }
-  }
-}
-</script>
+<template>
+  <cl-page class="CustomFormView">
+    <slot name="top"></slot>
+    <cl-expandable-pane v-for="(item, index) in formOptions" :key="index" :title="item.tabName">
+      <template v-if="item.slotName">
+        <slot :name="item.slotName"></slot>
+      </template>
+      <cl-descriptions>
+        <template v-for="(formItem, key) in item.list">
+          <!-- 字段标识：数组模式用 formItem.key，对象模式用 v-for 的 key -->
+          <el-descriptions-item v-if="formItem.type" :key="formItem.key || key" :label="$l(formItem.label)">
+            <template slot="label">
+              {{ formItem.label }}
+            </template>
+            <!-- 插槽 -->
+            <template v-if="formItem.type === 'slot'">
+              <div>
+                <slot :name="formItem.key || key"></slot>
+              </div>
+            </template>
+            <!-- 期限 -->
+            <template v-else-if="(formItem.key || key) === 'contractDTO_loanTerm' && formItem.type === 'input'">
+              <cl-diff
+                v-if="diff"
+                :value="`${formValue['contractDTO_loanTerm']} ${
+                  formValue['contractDTO_termUnit'] === 'DAY'
+                    ? $lc('天')
+                    : formValue['contractDTO_termUnit'] === 'MONTH'
+                    ? $lc('月')
+                    : formValue['contractDTO_termUnit'] === 'YEAR'
+                    ? $lc('年')
+                    : ''
+                }`"
+                :old-value="`${oldFormValue['contractDTO_loanTerm']} ${
+                  oldFormValue['contractDTO_termUnit'] === 'DAY'
+                    ? $lc('天')
+                    : oldFormValue['contractDTO_termUnit'] === 'MONTH'
+                    ? $lc('月')
+                    : oldFormValue['contractDTO_termUnit'] === 'YEAR'
+                    ? $lc('年')
+                    : ''
+                }`"
+                :tooltip="true"
+              />
+              <div v-else>
+                {{ formValue['contractDTO_loanTerm'] }}
+                {{
+                  formValue['contractDTO_termUnit'] === 'DAY'
+                    ? $lc('天')
+                    : formValue['contractDTO_termUnit'] === 'MONTH'
+                    ? $lc('月')
+                    : formValue['contractDTO_termUnit'] === 'YEAR'
+                    ? $lc('年')
+                    : ''
+                }}
+              </div>
+            </template>
+            <!-- 结构化/费用编号 -->
+            <template
+              v-else-if="
+                $lc(formItem.label) === $lc('是否结构化') ||
+                ((formItem.key || key) === 'exInfoDTO_feeNo' && (formItem.key || key) !== 'mainFeeCurrencyCode')
+              "
+            >
+              <cl-diff
+                v-if="diff"
+                :value="(formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'"
+                :old-value="(oldFormValue[formItem.key || key] && oldFormValue[formItem.key || key].name) || '--'"
+                :tooltip="true"
+              />
+              <div v-else>{{ (formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--' }}</div>
+            </template>
+            <!-- 地区信息 -->
+            <template v-else-if="(formItem.key || key) === 'recInfoDTO_areaInfo'">
+              <cl-diff
+                v-if="diff"
+                :value="formValue['recInfoDTO_areaInfoName'] || '--'"
+                :old-value="oldFormValue['recInfoDTO_areaInfoName'] || '--'"
+                :tooltip="true"
+              />
+              <div v-else>{{ formValue['recInfoDTO_areaInfoName'] || '--' }}</div>
+            </template>
+            <!-- 借/贷方 -->
+            <template
+              v-else-if="
+                (formItem.key || key) === 'contractDTO_debtorCode' ||
+                (formItem.key || key) === 'contractDTO_creditorCode'
+              "
+            >
+              <cl-diff
+                v-if="diff"
+                :value="(formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'"
+                :old-value="(oldFormValue[formItem.key || key] && oldFormValue[formItem.key || key].name) || '--'"
+                :tooltip="true"
+              />
+              <div v-else>{{ (formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--' }}</div>
+            </template>
+            <!-- 金额 -->
+            <template v-else-if="formItem.type === 'input-number'">
+              <div
+                v-if="
+                  [$lc('利率'), $lc('合同利率'), $lc('利率（%）'), $lc('合同利率（%）'), $lc('中间价')].includes(
+                    $l(formItem.label)
+                  )
+                "
+              >
+                <cl-diff
+                  v-if="diff"
+                  :value="
+                    (formValue[formItem.key || key] && numerify(formValue[formItem.key || key], '0.000000')) || '--'
+                  "
+                  :old-value="
+                    (oldFormValue[formItem.key || key] && numerify(oldFormValue[formItem.key || key], '0.000000')) ||
+                    '--'
+                  "
+                  :tooltip="true"
+                />
+                <span v-else>{{
+                  formValue[formItem.key || key] ? numerify(formValue[formItem.key || key], '0.000000') : '--'
+                }}</span>
+              </div>
+              <div v-else>
+                <cl-diff
+                  v-if="diff"
+                  :value="
+                    (formValue[formItem.key || key] && numerify(formValue[formItem.key || key], '0,0.00')) || '--'
+                  "
+                  :old-value="
+                    (oldFormValue[formItem.key || key] && numerify(oldFormValue[formItem.key || key], '0,0.00')) || '--'
+                  "
+                  :tooltip="true"
+                />
+                <span v-else>{{
+                  formValue[formItem.key || key] ? numerify(formValue[formItem.key || key], '0,0.00') : '--'
+                }}</span>
+              </div>
+            </template>
+            <!-- 来款国家（地区） -->
+            <template v-else-if="$lc(formItem.label) === $lc('来款国家（地区）')">
+              <cl-diff
+                v-if="diff"
+                :value="formValue['applyInfoDTO_areaInfoName'] || '--'"
+                :old-value="oldFormValue['applyInfoDTO_areaInfoName'] || '--'"
+                :tooltip="true"
+              />
+              <div v-else>{{ formValue['applyInfoDTO_areaInfoName'] || '--' }}</div>
+            </template>
+            <!-- 下拉枚举 -->
+            <template v-else-if="formItem.type === 'select'">
+              <div class="flex-box flex-v">
+                <div v-if="formValue[formItem.key || key] && formValue[formItem.key || key].name">
+                  <cl-diff
+                    v-if="diff"
+                    :value="(formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'"
+                    :old-value="(oldFormValue[formItem.key || key] && oldFormValue[formItem.key || key].name) || '--'"
+                    :tooltip="true"
+                  />
+                  <span v-else>{{
+                    (formValue[formItem.key || key] && formValue[formItem.key || key].name) || '--'
+                  }}</span>
+                </div>
+                <div v-else-if="formItem.label === $lc('结售汇性质')">
+                  <cl-diff
+                    v-if="diff"
+                    :value="formValue[formItem.key || key] || '--'"
+                    :old-value="oldFormValue[formItem.key || key] || '--'"
+                    :tooltip="true"
+                  />
+                  <span v-else>{{ formValue[formItem.key || key] || '--' }}</span>
+                </div>
+                <div v-else>
+                  <template v-if="diff">
+                    <cl-diff
+                      :value="getEnumName(formItem.enumList, formValue[formItem.key || key])"
+                      :old-value="getEnumName(formItem.enumList, oldFormValue[formItem.key || key])"
+                      :tooltip="true"
+                    />
+                  </template>
+                  <span v-else>{{ getEnumName(formItem.enumList, formValue[formItem.key || key]) }}</span>
+                </div>
+              </div>
+            </template>
+            <!-- 其他类型（含 text 类型，自动支持超长文本 Tooltip） -->
+            <template v-else>
+              <div>
+                <cl-diff
+                  v-if="diff"
+                  :value="formValue[formItem.key || key] || '--'"
+                  :old-value="oldFormValue[formItem.key || key] || '--'"
+                  :tooltip="true"
+                />
+                <div v-else>
+                  <el-tooltip
+                    v-if="formValue[formItem.key || key] && formValue[formItem.key || key].length > 50"
+                    class="item"
+                    effect="dark"
+                    :content="formValue[formItem.key || key]"
+                    placement="top"
+                  >
+                    <span>{{ formValue[formItem.key || key].slice(0, 50) + '...' }}</span>
+                  </el-tooltip>
+                  <span v-else>{{ formValue[formItem.key || key] || '--' }}</span>
+                </div>
+              </div>
+            </template>
+          </el-descriptions-item>
+        </template>
+      </cl-descriptions>
+    </cl-expandable-pane>
+    <slot name="bottom"></slot>
+  </cl-page>
+</template>
+
+<script>
+import numerify from 'numerify'
+
+import ClDescriptions from '../Descriptions/index.vue'
+import ClDiff from '../Diff/index.vue'
+import ClExpandablePane from '../Expandable/index.vue'
+import ClPage from '../PageLayout/page.vue'
+
+export default {
+  name: 'DynamicFormView',
+  components: { ClPage, ClExpandablePane, ClDescriptions, ClDiff },
+  props: {
+    // 表单配置
+    formOptions: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    formValue: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    diff: {
+      type: Boolean,
+      default: false
+    },
+    oldFormValue: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      numerify
+    }
+  },
+  methods: {
+    getEnumName(enumList, code) {
+      if (!enumList?.length) return
+      const enumData = Array.isArray(enumList) ? enumList : JSON.parse(enumList)
+      return enumData?.find((item) => (item.code || item.value) === code)?.name || '--'
+    }
+  }
+}
+</script>

package/src/components/FileUploadTable/index.vue

@@ -109,7 +109,7 @@
               :action="apiPrefix ? apiPrefix + action : action"
               :multiple="multiple"
               :headers="headers"
-              :disabled="!row[keys.type] || row._typeDisabled"
+              :disabled="!row[keys.type] || row._typeDisabled || row._uploadDisabled"
               :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
               :size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
               :http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
@@ -816,6 +816,22 @@ export default {
 
         let responseList = Array.isArray(data) ? data : []
         let rows = responseList.map((item) => this.buildAutoMatchBatchRow(item))
+        rows.forEach((row) => {
+          let type = row[this.keys.type]
+          if (!type) {
+            return
+          }
+          let placeholderIndex = this.tableData.findIndex(
+            (item) =>
+              item[this.keys.type] === type &&
+              !item[this.keys.url] &&
+              !item[this.keys.name] &&
+              !item._name
+          )
+          if (placeholderIndex > -1) {
+            this.tableData.splice(placeholderIndex, 1)
+          }
+        })
         this.tableData.splice(0, 0, ...rows)
         let pendingFiles = [...files]
         rows.forEach((row) => {
@@ -841,6 +857,7 @@ export default {
         _percent: 100,
         _status: 'success',
         _typeDisabled: false,
+        _uploadDisabled: true,
         _typeUpdating: false,
         _shouldUpdateFileType: !item.attno,
         _lastFileType: item.attno,

package/src/components/ShowColumn/index.vue

@@ -647,31 +647,14 @@ export function saveTransform(list, labelKey, isFilter) {
   if (!isFilter) {
     // 遍历列配置列表，将每列转换为存储格式
     list.forEach((c) => {
-      // 普通列：有prop属性、无子列、非新增列、无宽度设置
-      if (c.prop && !c.children && !c.isNew && !c.width && !c.isNew) {
-        const entry = { _colKey: 'prop', _colVal: c.prop }
-        if (c.fixed) entry.fixed = c.fixed
-        listN.push(entry)
+      const colKey = getColumnKey(c, labelKey)
+      // 已有列只保存稳定标识和用户设置，label 始终从当前 columns 中获取
+      if (colKey && !c.isNew && !c.remote) {
+        listN.push(createColumnReference(c, colKey))
       }
-      // 特殊类型列：多选/序号/展开列
-      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 (sFn && c[labelKey]) {
-          listN.push({ _colKey: labelKey, _colVal: c[labelKey], ...c })
-        }
-        // 其他情况直接存储完整列配置
-        else {
-          listN.push(c)
-        }
+        listN.push(c)
       }
     })
   } else {
@@ -690,6 +673,44 @@ export function saveTransform(list, labelKey, isFilter) {
   return listN
 }
 
+const COLUMN_KEY_PRIORITY = ['columnKey', 'prop', 'slotName', 'field', 'type']
+const COLUMN_SETTING_KEYS = ['fixed', 'width', 'wrap', 'bold', 'align']
+
+function getColumnKey(column, labelKey = 'label') {
+  return COLUMN_KEY_PRIORITY.find(
+    (key) => key !== labelKey && column[key] !== undefined && column[key] !== null && column[key] !== ''
+  )
+}
+
+function createColumnReference(column, colKey) {
+  const entry = { _colKey: colKey, _colVal: column[colKey] }
+  COLUMN_SETTING_KEYS.forEach((key) => {
+    if (column[key] !== undefined) entry[key] = column[key]
+  })
+  return entry
+}
+
+function findCurrentColumn(savedColumn, columnsT, labelKey) {
+  if (savedColumn._colKey) {
+    const column = columnsT.find((c) => c[savedColumn._colKey] === savedColumn._colVal)
+    if (column) return column
+  }
+
+  // 兼容历史完整对象，以及曾使用翻译后 label 作为 _colKey 的数据
+  const colKey = getColumnKey(savedColumn, labelKey)
+  if (colKey) {
+    return columnsT.find((c) => c[colKey] === savedColumn[colKey])
+  }
+}
+
+function mergeColumnSettings(column, savedColumn) {
+  const settings = {}
+  COLUMN_SETTING_KEYS.forEach((key) => {
+    if (savedColumn[key] !== undefined) settings[key] = savedColumn[key]
+  })
+  return Object.keys(settings).length ? { ...column, ...settings } : column
+}
+
 function getTransform(list, columnsT, labelKey = 'label') {
   let columns = []
   list.forEach((d) => {
@@ -701,23 +722,15 @@ function getTransform(list, columnsT, labelKey = 'label') {
       column && columns.push(column)
       // 如果list中的每一项是对象
     } else if (typeof d === 'object') {
-      // 如果d中有_colKey属性
-      if (d._colKey) {
-        // 从columnsT中找到d._colKey等于d._colVal的项
-        let column = columnsT.find((c) => c[d._colKey] === d._colVal)
-        if (column) {
-          // 将保存的 fixed、width 合并到列对象上（避免直接修改 props）
-          if (d.fixed !== undefined || d.width !== undefined) {
-            column = { ...column }
-            if (d.fixed !== undefined) column.fixed = d.fixed
-            if (d.width !== undefined) column.width = d.width
-          }
-          columns.push(column)
-        }
-        // 如果d中没有_colKey属性
-      } else {
-        // 将d添加到columns中
+      const column = findCurrentColumn(d, columnsT, labelKey)
+      if (column) {
+        // 使用当前 columns 的完整定义（包括当前语言 label），仅合并用户设置
+        columns.push(mergeColumnSettings(column, d))
+      } else if (!d._colKey) {
+        // 用户新增列、远程列等没有本地定义，保持原有数据形态
         columns.push(d)
+      } else {
+        // _colKey 数据未匹配到当前列时沿用原行为：忽略已不存在的列
       }
     }
   })

package/src/utils/asyncGetRelaNos.js

@@ -1,6 +1,6 @@
 import axios from './axios'
-import { getItem, setItem } from './storageEdit'
 import { persistPermissionItems } from './permissionStorage'
+import { getItem, setItem } from './storageEdit'
 
 /**
  * @description: 按需/按模块 加载权限

package/src/utils/permission-storage-worker.v1.js

@@ -1,296 +1,23 @@
-/*
- * 用于 n20 权限存储压缩的专用 Worker。
- * 压缩算法兼容 lz-string 1.5.0。
- * 不包含网络、cookie、DOM 或存储访问。
- */
-;(function () {
-  'use strict'
-
-  var BASE64_ALPHABET =
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-
-  function compressToBase64(input) {
-    if (input == null) return ''
-
-    var result = compress(input, 6, function (value) {
-      return BASE64_ALPHABET.charAt(value)
-    })
-
-    switch (result.length % 4) {
-      case 1:
-        return result + '==='
-      case 2:
-        return result + '=='
-      case 3:
-        return result + '='
-      default:
-        return result
-    }
-  }
-
-  function compress(uncompressed, bitsPerChar, getCharFromInt) {
-    if (uncompressed == null) return ''
-
-    var index
-    var value
-    var bitIndex
-    var contextDictionary = {}
-    var contextDictionaryToCreate = {}
-    var contextCharacter = ''
-    var contextWordAndCharacter = ''
-    var contextWord = ''
-    var contextEnlargeIn = 2
-    var contextDictionarySize = 3
-    var contextNumberOfBits = 2
-    var contextData = []
-    var contextDataValue = 0
-    var contextDataPosition = 0
-
-    for (index = 0; index < uncompressed.length; index += 1) {
-      contextCharacter = uncompressed.charAt(index)
-
-      if (
-        !Object.prototype.hasOwnProperty.call(
-          contextDictionary,
-          contextCharacter
-        )
-      ) {
-        contextDictionary[contextCharacter] = contextDictionarySize++
-        contextDictionaryToCreate[contextCharacter] = true
-      }
-
-      contextWordAndCharacter = contextWord + contextCharacter
-      if (
-        Object.prototype.hasOwnProperty.call(
-          contextDictionary,
-          contextWordAndCharacter
-        )
-      ) {
-        contextWord = contextWordAndCharacter
-        continue
-      }
-
-      if (
-        Object.prototype.hasOwnProperty.call(
-          contextDictionaryToCreate,
-          contextWord
-        )
-      ) {
-        if (contextWord.charCodeAt(0) < 256) {
-          for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-            contextDataValue <<= 1
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-          }
-
-          value = contextWord.charCodeAt(0)
-          for (bitIndex = 0; bitIndex < 8; bitIndex++) {
-            contextDataValue = (contextDataValue << 1) | (value & 1)
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-            value >>= 1
-          }
-        } else {
-          value = 1
-          for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-            contextDataValue = (contextDataValue << 1) | value
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-            value = 0
-          }
-
-          value = contextWord.charCodeAt(0)
-          for (bitIndex = 0; bitIndex < 16; bitIndex++) {
-            contextDataValue = (contextDataValue << 1) | (value & 1)
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-            value >>= 1
-          }
-        }
-
-        contextEnlargeIn--
-        if (contextEnlargeIn === 0) {
-          contextEnlargeIn = Math.pow(2, contextNumberOfBits)
-          contextNumberOfBits++
-        }
-        delete contextDictionaryToCreate[contextWord]
-      } else {
-        value = contextDictionary[contextWord]
-        for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-          contextDataValue = (contextDataValue << 1) | (value & 1)
-          if (contextDataPosition === bitsPerChar - 1) {
-            contextDataPosition = 0
-            contextData.push(getCharFromInt(contextDataValue))
-            contextDataValue = 0
-          } else {
-            contextDataPosition++
-          }
-          value >>= 1
-        }
-      }
-
-      contextEnlargeIn--
-      if (contextEnlargeIn === 0) {
-        contextEnlargeIn = Math.pow(2, contextNumberOfBits)
-        contextNumberOfBits++
-      }
-
-      contextDictionary[contextWordAndCharacter] = contextDictionarySize++
-      contextWord = String(contextCharacter)
-    }
-
-    if (contextWord !== '') {
-      if (
-        Object.prototype.hasOwnProperty.call(
-          contextDictionaryToCreate,
-          contextWord
-        )
-      ) {
-        if (contextWord.charCodeAt(0) < 256) {
-          for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-            contextDataValue <<= 1
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-          }
-
-          value = contextWord.charCodeAt(0)
-          for (bitIndex = 0; bitIndex < 8; bitIndex++) {
-            contextDataValue = (contextDataValue << 1) | (value & 1)
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-            value >>= 1
-          }
-        } else {
-          value = 1
-          for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-            contextDataValue = (contextDataValue << 1) | value
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-            value = 0
-          }
-
-          value = contextWord.charCodeAt(0)
-          for (bitIndex = 0; bitIndex < 16; bitIndex++) {
-            contextDataValue = (contextDataValue << 1) | (value & 1)
-            if (contextDataPosition === bitsPerChar - 1) {
-              contextDataPosition = 0
-              contextData.push(getCharFromInt(contextDataValue))
-              contextDataValue = 0
-            } else {
-              contextDataPosition++
-            }
-            value >>= 1
-          }
-        }
-
-        contextEnlargeIn--
-        if (contextEnlargeIn === 0) {
-          contextEnlargeIn = Math.pow(2, contextNumberOfBits)
-          contextNumberOfBits++
-        }
-        delete contextDictionaryToCreate[contextWord]
-      } else {
-        value = contextDictionary[contextWord]
-        for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-          contextDataValue = (contextDataValue << 1) | (value & 1)
-          if (contextDataPosition === bitsPerChar - 1) {
-            contextDataPosition = 0
-            contextData.push(getCharFromInt(contextDataValue))
-            contextDataValue = 0
-          } else {
-            contextDataPosition++
-          }
-          value >>= 1
-        }
-      }
-
-      contextEnlargeIn--
-      if (contextEnlargeIn === 0) {
-        contextEnlargeIn = Math.pow(2, contextNumberOfBits)
-        contextNumberOfBits++
-      }
-    }
-
-    value = 2
-    for (bitIndex = 0; bitIndex < contextNumberOfBits; bitIndex++) {
-      contextDataValue = (contextDataValue << 1) | (value & 1)
-      if (contextDataPosition === bitsPerChar - 1) {
-        contextDataPosition = 0
-        contextData.push(getCharFromInt(contextDataValue))
-        contextDataValue = 0
-      } else {
-        contextDataPosition++
-      }
-      value >>= 1
-    }
-
-    while (true) {
-      contextDataValue <<= 1
-      if (contextDataPosition === bitsPerChar - 1) {
-        contextData.push(getCharFromInt(contextDataValue))
-        break
-      }
-      contextDataPosition++
-    }
-
-    return contextData.join('')
+import LZString from 'lz-string'
+
+self.onmessage = function ({ data }) {
+  if (
+    !data ||
+    (typeof data.id !== 'number' && typeof data.id !== 'string') ||
+    typeof data.value !== 'string'
+  ) {
+    return
   }
 
-  self.onmessage = function (event) {
-    var message = event.data
-    if (
-      !message ||
-      (typeof message.id !== 'number' && typeof message.id !== 'string') ||
-      typeof message.value !== 'string'
-    ) {
-      return
-    }
-
-    try {
-      self.postMessage({
-        id: message.id,
-        compressed: compressToBase64(message.value)
-      })
-    } catch (error) {
-      self.postMessage({
-        id: message.id,
-        error: error && error.message ? error.message : 'Compression failed'
-      })
-    }
+  try {
+    self.postMessage({
+      id: data.id,
+      compressed: LZString.compressToBase64(data.value)
+    })
+  } catch (error) {
+    self.postMessage({
+      id: data.id,
+      error: error && error.message ? error.message : 'Compression failed'
+    })
   }
-})()
+}

package/src/utils/permissionStorage.js

@@ -1,4 +1,5 @@
 import PermissionStorageWorker from 'worker-loader?filename=js/permission-storage-worker.[contenthash:8].js!./permission-storage-worker.v1.js'
+
 import { setItem } from './storageEdit'
 
 const LARGE_STORAGE_THRESHOLD = 524288
@@ -61,9 +62,7 @@ function getCompressionWorker() {
 function compressInWorker(value) {
   const worker = getCompressionWorker()
   if (!worker) {
-    return Promise.reject(
-      new Error('Permission compression worker is unavailable')
-    )
+    return Promise.reject(new Error('Permission compression worker is unavailable'))
   }
 
   return new Promise((resolve, reject) => {
@@ -83,10 +82,7 @@ function writeCompressedValue(key, compressed) {
   const rawSetItem = storage._setItem
   const rawRemoveItem = storage._removeItem
 
-  if (
-    typeof rawSetItem !== 'function' ||
-    typeof rawRemoveItem !== 'function'
-  ) {
+  if (typeof rawSetItem !== 'function' || typeof rawRemoveItem !== 'function') {
     throw new Error('Extended Storage API is unavailable')
   }
 
@@ -101,10 +97,7 @@ function writeCompressedValue(key, compressed) {
 }
 
 async function persistItem({ key, value, serialized }) {
-  if (
-    typeof serialized !== 'string' ||
-    serialized.length <= LARGE_STORAGE_THRESHOLD
-  ) {
+  if (typeof serialized !== 'string' || serialized.length <= LARGE_STORAGE_THRESHOLD) {
     window.sessionStorage.setItem(key, serialized)
     return
   }