Merge branch 'main-v2' into lite-ba

src/views/ne/neConfig/hooks/useOptions.ts

@@ -29,8 +29,13 @@ export default function useOptions({ t }: any) {
       case 'int':
         // filter: "0~128"
 
-        if (filter && filter.indexOf('~') !== -1) {
-          const filterArr = filter.split('~');
+        if (filter) {
+          let filterArr = ['0', '1'];
+          if (filter.indexOf('-') !== -1) {
+            filterArr = filter.split('-');
+          } else if (filter.indexOf('~') !== -1) {
+            filterArr = filter.split('~');
+          }
           const minInt = parseInt(filterArr[0]);
           const maxInt = parseInt(filterArr[1]);
           const valueInt = parseInt(value);
@@ -47,18 +52,12 @@ export default function useOptions({ t }: any) {
         break;
       case 'ipv4':
         if (!regExpIPv4.test(value)) {
-          return [
-            false,
-            t('views.ne.neConfig.requireIpv4', { display }),
-          ];
+          return [false, t('views.ne.neConfig.requireIpv4', { display })];
         }
         break;
       case 'ipv6':
         if (!regExpIPv6.test(value)) {
-          return [
-            false,
-            t('views.ne.neConfig.requireIpv6', { display }),
-          ];
+          return [false, t('views.ne.neConfig.requireIpv6', { display })];
         }
         break;
       case 'enum':
@@ -71,10 +70,7 @@ export default function useOptions({ t }: any) {
           }
 
           if (!Object.keys(filterJson).includes(`${value}`)) {
-            return [
-              false,
-              t('views.ne.neConfig.requireEnum', { display }),
-            ];
+            return [false, t('views.ne.neConfig.requireEnum', { display })];
           }
         }
         break;
@@ -90,10 +86,7 @@ export default function useOptions({ t }: any) {
           }
 
           if (!Object.values(filterJson).includes(`${value}`)) {
-            return [
-              false,
-              t('views.ne.neConfig.requireBool', { display }),
-            ];
+            return [false, t('views.ne.neConfig.requireBool', { display })];
           }
         }
         break;
@@ -101,12 +94,20 @@ export default function useOptions({ t }: any) {
         // filter: "0~128"
 
         // 字符串长度判断
-        if (filter && filter.indexOf('~') !== -1) {
+        if (filter) {
           try {
-            const filterArr = filter.split('~');
-            let rule = new RegExp(
-              '^\\S{' + filterArr[0] + ',' + filterArr[1] + '}$'
-            );
+            let rule: RegExp = new RegExp('^.*$');
+            if (filter.indexOf('-') !== -1) {
+              const filterArr = filter.split('-');
+              rule = new RegExp(
+                '^.{' + filterArr[0] + ',' + filterArr[1] + '}$'
+              );
+            } else if (filter.indexOf('~') !== -1) {
+              const filterArr = filter.split('~');
+              rule = new RegExp(
+                '^\\S{' + filterArr[0] + ',' + filterArr[1] + '}$'
+              );
+            }
             if (!rule.test(value)) {
               return [
                 false,
@@ -157,10 +158,7 @@ export default function useOptions({ t }: any) {
         break;
 
       default:
-        return [
-          false,
-          t('views.ne.neConfig.requireUn', { display }),
-        ];
+        return [false, t('views.ne.neConfig.requireUn', { display })];
     }
     return result;
   }

src/views/ne/neLicense/index.vue

@@ -105,8 +105,8 @@ let tableColumns = ref<TableColumnsType>([
     width: 120,
   },
   {
-    title: t('views.ne.common.capability'),
-    dataIndex: 'capability',
+    title: t('views.ne.common.ueNumber'),
+    dataIndex: 'ueNumber',
     align: 'left',
     customRender(opt) {
       if (['UDM', 'AMF', 'MME'].includes(opt.record.neType)) {
@@ -116,6 +116,18 @@ let tableColumns = ref<TableColumnsType>([
     },
     width: 100,
   },
+  {
+    title: t('views.ne.common.nbNumber'),
+    dataIndex: 'nbNumber',
+    align: 'left',
+    customRender(opt) {
+      if (['AMF', 'MME'].includes(opt.record.neType)) {
+        return opt.value;
+      }
+      return '-';
+    },
+    width: 100,
+  },
   {
     title: t('common.remark'),
     dataIndex: 'remark',
@@ -276,7 +288,8 @@ function fnRecordState(row: Record<string, any>) {
             row.status = '1';
             row.serialNum = res.data.sn;
             row.expiryDate = res.data.expire;
-            row.capability = res.data.capability;
+            row.ueNumber = res.data.ueNumber;
+            row.nbNumber = res.data.nbNumber;
             row.updateTime = new Date().getTime();
             message.success(
               `${row.neType} ${row.neId} ${dictStatus.value[1].label}`,

src/views/ne/neVersion/index.vue

@@ -108,6 +108,7 @@ let tableColumns = ref<TableColumnsType>([
   {
     title: t('views.ne.neVersion.version'),
     dataIndex: 'version',
+    key: 'version',
     align: 'left',
     width: 150,
     resizable: true,
@@ -605,6 +606,21 @@ onMounted(() => {
           <template v-if="column.key === 'status'">
             <DictTag :options="dictStatus" :value="record.status" />
           </template>
+          <template v-if="column.key === 'version'">
+            {{ record.version }}
+            <a-tooltip
+              placement="topRight"
+              v-if="
+                record.version &&
+                (record.path === '' || record.path === '-')
+              "
+            >
+              <template #title>
+                {{ t('views.ne.neVersion.noPath') }}
+              </template>
+              <InfoCircleOutlined />
+            </a-tooltip>
+          </template>
           <template v-if="column.key === 'preVersion'">
             {{ record.preVersion }}
             <a-tooltip