t20-common-lib 0.12.18 → 0.12.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.12.18",
+  "version": "0.12.20",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/branch-bank-select/src/main.vue

@@ -16,7 +16,16 @@
       :key="`display-${displayOption[valueKey]}`"
       :label="displayOption.branchBankName"
       :value="displayOption[valueKey]"
-    />
+    >
+      <slot name="option" :item="displayOption">
+        <div class="flex-column flex-c" style="height: 100%">
+          <div style="line-height: 20px; font-weight: bold">
+            {{ displayOption.branchBankName }}
+          </div>
+          <div style="line-height: 20px">{{ displayOption.cnapsNo || displayOption[valueKey] }}</div>
+        </div>
+      </slot>
+    </el-option>
     <el-option
       v-for="item in branchBankList"
       :key="item.cnapsNo"
@@ -91,6 +100,8 @@ export default {
       branchBankList: [],
       // 本地标志：用于抑制由本组件触发的 bankCode 变更导致的 reset
       _suppressBankCodeReset: false,
+      // 初始化阶段标志：首次拿到有效 bankCode 前，不清空回显值
+      _bankCodeInitialized: false,
       page: {
         current: 1,
         size: 20,
@@ -116,14 +127,12 @@ export default {
         // 只有在值实际变化时才重置（避免无意义的重新加载）
         if (newVal === oldVal) return;
 
-        // immediate 首次执行时 Vue2 的 oldVal 为 undefined，此时不应清空 v-model，
-        // 否则会冲掉父组件传入的回显值；仅按当前 bankCode 重新拉列表即可。
-        if (oldVal === undefined) {
-          this.branchBankList = [];
-          this.page.current = 1;
-          this.page.key = "";
-          this.page.hasMore = true;
-          this.fetchBranchData(true);
+        // 初始化阶段（包括先空后有值的两次触发）只重拉列表，不清空回显值
+        if (!this._bankCodeInitialized) {
+          this.reloadListOnly();
+          if (this.hasValidBankCode(newVal)) {
+            this._bankCodeInitialized = true;
+          }
           return;
         }
 
@@ -205,14 +214,21 @@ export default {
       this.page.hasMore = true;
       this.fetchBranchData(true);
     },
-    resetAndFetch() {
+    hasValidBankCode(val) {
+      if (Array.isArray(val)) return val.length > 0;
+      return val !== undefined && val !== null && val !== "";
+    },
+    reloadListOnly() {
       this.branchBankList = [];
       this.page.current = 1;
       this.page.key = "";
       this.page.hasMore = true;
-      this.branchBankNo = this.multiple ? [] : "";
       this.fetchBranchData(true);
     },
+    resetAndFetch() {
+      this.reloadListOnly();
+      this.branchBankNo = this.multiple ? [] : "";
+    },
     handleBranchChange(val) {
       // 保持 v-model 行为
       // 在 emit 之前设置抑制标志，防止父组件基于此事件同步修改 `bankCode` 导致我们被动地重置