From c93e6935175543e1519ef299e9bfca7f6c15a386 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 26 Apr 2024 17:13:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pcf=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E7=BB=84=E8=A3=85=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E4=B8=8A=E4=BC=A0=E8=B6=85=E6=97=B630s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tool/file.ts           |  1 +
 src/views/neUser/pcf/index.vue | 47 ++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/api/tool/file.ts b/src/api/tool/file.ts
index d19717cd..25b468ba 100644
--- a/src/api/tool/file.ts
+++ b/src/api/tool/file.ts
@@ -241,6 +241,7 @@ export async function uploadFileToNE(
         neType,
         neId,
       },
+      timeout: 30_000,
     });
     return transferToNeFileRes;
   }
diff --git a/src/views/neUser/pcf/index.vue b/src/views/neUser/pcf/index.vue
index 63389fda..3ad0f5ad 100644
--- a/src/views/neUser/pcf/index.vue
+++ b/src/views/neUser/pcf/index.vue
@@ -280,10 +280,28 @@ function fnModalVisibleByEdit(row?: Record<string, any>) {
         getRule(neID, row.imsi)
           .then(res => {
             if (res.code === RESULT_CODE_SUCCESS) {
-              Object.assign(modalState.from, res.data, {
-                pccRules: res.data.pccRules.split('|'),
-                sessRules: res.data.sessRules.split('|'),
-              });
+              Object.assign(modalState.from, res.data);
+
+              let pccRules = res.data.pccRules;
+              if (!pccRules) {
+                pccRules = [];
+              } else if (pccRules.includes('|')) {
+                pccRules = pccRules.split('|');
+              } else {
+                pccRules = [pccRules];
+              }
+              modalState.from.pccRules = pccRules;
+              let sessRules = res.data.sessRules;
+              if (!sessRules) {
+                sessRules = [];
+              } else if (sessRules.includes('|')) {
+                sessRules = sessRules.split('|');
+              } else {
+                sessRules = [sessRules];
+              }
+              modalState.from.sessRules = sessRules;
+              console.log(modalState.from);
+
               modalState.title = t('views.neUser.pcf.updateTitle', {
                 imsi: row.imsi,
               });
@@ -309,8 +327,23 @@ function fnModalOk() {
   const from = JSON.parse(JSON.stringify(modalState.from));
   from.neId = queryParams.neId || '-';
   from.rfsp = Number(from.rfsp) || 0;
-  from.pccRules = modalState.from.pccRules.join('|');
-  from.sessRules = modalState.from.sessRules.join('|');
+  console.log(from);
+  let pccRules = modalState.from.pccRules;
+  if (Array.isArray(pccRules)) {
+    pccRules = pccRules.join('|');
+  } else {
+    pccRules = '';
+  }
+  from.pccRules = pccRules;
+
+  let sessRules = modalState.from.sessRules;
+  if (Array.isArray(sessRules)) {
+    sessRules = sessRules.join('|');
+  } else {
+    sessRules = '';
+  }
+  from.sessRules = sessRules;
+
   let validateArr = ['imsi', 'msisdn'];
   if (modalState.isBatch) {
     validateArr.push('num');
@@ -988,7 +1021,6 @@ onMounted(() => {
                   v-model:value="modalState.from.pccRules"
                   allow-clear
                   mode="tags"
-                  :token-separators="['|']"
                   :options="pcfRuleOption.pccOpt"
                   :title="t('views.neUser.pcf.pccRuleTip')"
                 />
@@ -1000,7 +1032,6 @@ onMounted(() => {
                   v-model:value="modalState.from.sessRules"
                   allow-clear
                   mode="tags"
-                  :token-separators="['|']"
                   :options="pcfRuleOption.sessOpt"
                   :title="t('views.neUser.pcf.sessRuleTip')"
                 />