Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

src/views/DataCollect/Channel/data.ts

@@ -50,9 +50,19 @@ export const regDomain = new RegExp(
 );
 export const checkEndpoint = (_rule: Rule, value: string): Promise<any> =>
     new Promise(async (resolve, reject) => {
+        if(!value) return resolve('');
         const res: any = await validateField(value);
         return res.result.passed ? resolve('') : reject(res.result.reason);
     });
+
+export const checkHost = (_rule: Rule, value: string): Promise<any> =>
+    new Promise(async (resolve, reject) => {
+        if(!value) return resolve('');
+        if(!(regIP.test(value) || regIPv6.test(value) || regDomain.test(value))) {
+            return reject('请输入正确格式的Modbus主机IP地址')
+        }
+        return resolve('')
+    });
 export const FormValidate = {
     name: [
         { required: true, message: '请输入名称', trigger: 'blur' },
@@ -65,8 +75,9 @@ export const FormValidate = {
             message: '请输入Modbus主机IP',
         },
         {
-            pattern: regIP || regIPv6 || regDomain,
+            validator: checkHost,
-            message: '请输入正确格式的Modbus主机IP地址',
+            trigger: 'blur',
+            // message: '请输入正确格式的Modbus主机IP地址',
         },
     ],
     port: [

src/views/DataCollect/Channel/index.vue

@@ -73,7 +73,7 @@
                                                 </j-tooltip>
                                             </div>
                                         </j-col>
-                                        <j-col :span="12">
+                                        <!-- <j-col :span="12">
                                             <div class="card-item-content-text">
                                                 地址
                                             </div>
@@ -98,6 +98,14 @@
                                                     >
                                                 </j-tooltip>
                                             </div>
+                                        </j-col> -->
+                                        <j-col :span="12">
+                                            <div class="card-item-content-text">
+                                                说明
+                                            </div>
+                                            <div class="card-item-content-text">
+                                                <j-ellipsis>{{slotProps.description}}</j-ellipsis>
+                                            </div>
                                         </j-col>
                                     </j-row>
                                 </div>

src/views/Northbound/DuerOS/Detail/command/index.vue

@@ -123,7 +123,7 @@
                         placeholder="请选择功能"
                         v-model:value="modelRef.message.functionId"
                         show-search
-                        @change="funcChange"
+                        @change="(e) => funcChange(e)"
                     >
                         <j-select-option
                             v-for="i in metadata?.functions || []"
@@ -216,12 +216,33 @@ const onPropertyChange = (val: string, flag?: boolean) => {
 };
 
 const onTypeChange = () => {
-    modelRef.message = {
+    // 需要记住之前的选择, 所以注释了该代码
-        properties: undefined,
+    // modelRef.message = {
-        functionId: undefined,
+    //     properties: undefined,
-        inputs: [],
+    //     functionId: undefined,
-        value: undefined,
+    //     inputs: [],
-    };
+    //     value: undefined,
+    // };
+};
+
+const funcChange = (val: string, _inputs?: any[]) => {
+    if (val) {
+        const arr =
+            props.metadata?.functions.find((item: any) => item.id === val)
+                ?.inputs || [];
+        const list = arr.map((item: any) => {
+            const _item = _inputs?.find(i => i.id === item.id)
+            return {
+                id: item.id,
+                name: item.name,
+                value: undefined,
+                valueType: item?.valueType?.type,
+                ..._item,
+                required: item?.expands?.required
+            };
+        });
+        modelRef.message.inputs = list;
+    }
 };
 
 watch(
@@ -232,6 +253,9 @@ watch(
             if (newVal?.message?.properties) {
                 onPropertyChange(newVal?.message?.properties, true);
             }
+            if (newVal?.message?.functionId) {
+                funcChange(newVal?.message?.functionId, newVal?.message?.inputs);
+            }
         }
     },
     {
@@ -239,24 +263,6 @@ watch(
     },
 );
 
-const funcChange = (val: string) => {
-    if (val) {
-        const arr =
-            props.metadata?.functions.find((item: any) => item.id === val)
-                ?.inputs || [];
-        const list = arr.map((item: any) => {
-            return {
-                id: item.id,
-                name: item.name,
-                value: undefined,
-                valueType: item?.valueType?.type,
-                required: item?.expands?.required
-            };
-        });
-        modelRef.message.inputs = list;
-    }
-};
-
 const saveBtn = () =>
     new Promise((resolve) => {
         formRef.value

src/views/account/Center/components/Detail/index.vue

@@ -4,9 +4,9 @@
             <div style="display: flex; padding-bottom: 24px; margin-bottom: 24px; border-bottom: 1px solid #E4E7F6">
                 <j-avatar :size="100" :src="userInfos.avatar"></j-avatar>
                 <div style="margin-left: 24px;">
-                    <div class="name">{{ userInfos.name }}</div>
+                    <div class="name"><j-ellipsis>{{ userInfos.name }}</j-ellipsis></div>
-                    <div class="subTitle">用户名: {{ userInfos?.username }}</div>
+                    <div class="subTitle"><j-ellipsis>用户名: {{ userInfos?.username }}</j-ellipsis></div>
-                    <div class="subTitle">账号ID: {{ userInfos?.id }}</div>
+                    <!-- <div class="subTitle">账号ID: {{ userInfos?.id }}</div> -->
                 </div>
             </div>
             <j-descriptions
@@ -69,10 +69,10 @@ const org = computed(() => {
     color: #1D2129;
     font-weight: 500;
     font-size: 26px;
+    margin: 15px 0 10px 0;
 }
 
 .subTitle {
     color: rgba(0, 0, 0, 0.6);
-    margin-top: 5px;
 }
 </style>

src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue

@@ -72,7 +72,7 @@ const queryChartsAggList = async () => {
             {
                 property: prop.data.id,
                 alias: prop.data.id,
-                agg: agg.value,
+                agg: _type.value ? agg.value : 'COUNT',
             },
         ],
         query: {

src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue

@@ -43,7 +43,7 @@
         >
           <template #bodyCell="{column, record}">
             <span v-if="column.dataIndex === 'value'">
-              {{ record.range === 'true' ? record.value?.join('-') : record.value }}
+              {{ record.range === true ? record.value?.join('-') : record.value }}
             </span>
           </template>
         </j-table>

src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue

@@ -8,10 +8,10 @@
         ref="tableRef"
     >
       <template #range="{data}">
-        {{ data.record.range === 'true' ? '范围值' : '固定值'}}
+        {{ data.record.range === true ? '范围值' : '固定值'}}
       </template>
       <template #value="{data}">
-        {{ data.record.range === 'true' ? data.record.value?.join('-') : data.record.value }}
+        {{ data.record.range === true ? data.record.value?.join('-') : data.record.value }}
       </template>
       <template #action="{data}">
         <j-button
@@ -92,9 +92,9 @@ const newColumns = computed(() => {
         components: {
           props: {
             trueText: '范围值',
-            trueValue: 'true',
+            trueValue: true,
             falseText: '固定值',
-            falseValue: 'false',
+            falseValue: false,
           }
         }
     })

src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue

@@ -59,26 +59,26 @@ const formData = reactive<{
   value: ValueType;
   rangeValue: ValueType;
 }>({
-  value: props.value.range === 'false' ? props.value.value : undefined,
+  value: props.value?.range === false ? props.value?.value : undefined,
-  rangeValue: props.value.range === 'true'
+  rangeValue: props.value?.range === true
-      ? props.value.value || [undefined, undefined]
+      ? props.value?.value || [undefined, undefined]
       : [undefined, undefined],
 });
 
 const formRef = ref()
 
 const showText = computed(() => {
-  if (props.value.range === 'false') {
+  if (props.value.range === false) {
-    return props.value.value || ''
+    return props.value?.value || ''
   } else {
-    return props.value.value?.[0] ? props.value.value.join('-') : ''
+    return props.value?.value?.[0] ? props.value.value.join('-') : ''
   }
 })
 
 const confirm = () => {
   return new Promise((resolve, reject) => {
     formRef.value.validate().then(() => {
-      const value = props.value.range === 'true' ? formData.rangeValue : formData.value
+      const value = props.value.range === true ? formData.rangeValue : formData.value
       emit('update:value', {
         ...props.value,
         value: value
@@ -93,7 +93,7 @@ const confirm = () => {
 
 watch(() => props.value.range,(value, oldValue) => {
   if (value !== oldValue  ) {
-    if (value === 'false') {
+    if (value === false) {
       formData.value = undefined
     } else {
       formData.rangeValue = [undefined, undefined]

src/views/device/components/Metadata/Base/hooks/useMatadata.ts

@@ -35,6 +35,7 @@ const useMetadata = (type: 'device' | 'product', key?: MetadataType, ): {
             const productMetadata: any = JSON.parse(instanceStore.current.productMetadata)
             const metaArray = key ? productMetadata[key] : []
             const productIndexKeys = metaArray?.map((item:any, index: number) => index) || []
+            productNoEdit.value.ids = metaArray?.map((item: any) => item.id) || []
             productNoEdit.value.id = productIndexKeys
             productNoEdit.value.name = productIndexKeys
             if (key === 'properties') {

src/views/device/components/Metadata/index.vue

@@ -1,19 +1,19 @@
 <template>
     <div class='device-detail-metadata' style="position: relative;">
-      <div class="tips">
+<!--      <div class="tips">-->
-        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'
+<!--        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'-->
-        ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
+<!--        ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
-        : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">
+<!--        : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">-->
-          <div class="ellipsis" style='color: #999;'>
+<!--          <div class="ellipsis" style='color: #999;'>-->
-            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />
+<!--            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />-->
-            {{
+<!--            {{-->
-              instanceStore.detail?.independentMetadata && type === 'device'
+<!--              instanceStore.detail?.independentMetadata && type === 'device'-->
-                ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'
+<!--                ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
-                : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'
+<!--                : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'-->
-            }}
+<!--            }}-->
-          </div>
+<!--          </div>-->
-        </j-tooltip>
+<!--        </j-tooltip>-->
-      </div>
+<!--      </div>-->
       <j-tabs class="metadataNav" destroyInactiveTabPane type="card">
         <template #rightExtra>
           <j-space>

src/views/device/components/Metadata/metadata.ts

@@ -2,10 +2,16 @@ import { saveProductMetadata } from "@/api/device/product";
 import { saveMetadata } from "@/api/device/instance";
 import type { DeviceInstance } from "../../Instance/typings";
 import type { DeviceMetadata, MetadataItem, MetadataType, ProductItem } from "../../Product/typings";
+import { differenceBy } from "lodash-es";
 
+const filterProductMetadata = (data: any[], productMetaData: any[]) => {
+  const ids = productMetaData.map((item: any) => item.id)
+  const idsSet = new Set(ids)
+  return data.filter((a) => !idsSet.has(a.id))
+}
 /**
  * 更新物模型
- * @param type 物模型类型 events
+ * @param type 物模型类型 "events" | "functions" | "properties" | "tags"
  * @param item 物模型数据 【{a},{b},{c}】
  // * @param target product、device
  * @param data product 、device [{event:[1,2,3]]
@@ -21,25 +27,29 @@ import type { DeviceMetadata, MetadataItem, MetadataType, ProductItem } from "..
 ): ProductItem | DeviceInstance => {
   if (!data) return data;
   const metadata = JSON.parse(data.metadata || '{}') as DeviceMetadata;
-  const config = (metadata[type] || []) as MetadataItem[];
+  let productMetaData
-  if (item.length > 0) {
+
-    item.forEach((i) => {
+  if ((data as DeviceInstance).productMetadata) {
-      const index = config.findIndex((c) => c.id === i.id);
+    productMetaData = JSON.parse((data as DeviceInstance).productMetadata)
-      if (index > -1) {
-        config[index] = i;
-        // onEvent?.('update', i);
-      } else {
-        config.push(i);
-        // onEvent?.('add', i);
-      }
-    });
-  } else {
-    console.warn('未触发物模型修改');
   }
-  console.log('updateMetadata', config, type)
+
-  // @ts-ignore
+  if (productMetaData) {
-  // metadata[type] = config.sort((a, b) => b?.sortsIndex - a?.sortsIndex);
+    if (productMetaData.properties && productMetaData.properties.length) {
-  metadata[type] = item.sort((a, b) => b?.sortsIndex - a?.sortsIndex);
+      metadata.properties = filterProductMetadata(metadata.properties, productMetaData.properties)
+    }
+    if (productMetaData.functions && productMetaData.functions.length) {
+      metadata.functions = filterProductMetadata(metadata.functions, productMetaData.functions)
+    }
+    if (productMetaData.events && productMetaData.events.length) {
+      metadata.events = filterProductMetadata(metadata.events, productMetaData.events)
+    }
+    if (productMetaData.tags && productMetaData.tags.length) {
+      metadata.tags = filterProductMetadata(metadata.tags, productMetaData.tags)
+    }
+  }
+
+  console.log(metadata)
+  metadata[type] = metadata[type].sort((a, b) => b?.sortsIndex - a?.sortsIndex) as any[]
   console.log('updateMetadata',metadata)
   data.metadata = JSON.stringify(metadata);
   onEvent?.(data.metadata)

src/views/edge/Resource/Issue/index.vue

@@ -31,9 +31,6 @@
                 selectedRowKeys: _selectedRowKeys,
                 onChange: onSelectChange,
             }"
-            :pagination="{
-                showSizeChanger: true,
-            }"
         >
             <template #state="slotProps">
                 <j-badge

src/views/iot-card/CardManagement/BindDevice.vue

@@ -11,13 +11,8 @@
         :request='queryUnbounded'
         model='TABLE'
         :defaultParams="{
-                    pageSize: 10,
                     sorts: [{ name: 'createTime', order: 'desc' }],
                 }"
-        :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
         :rowSelection="{
           type: 'radio',
           selectedRowKeys: _selectedRowKeys,

src/views/iot-card/Recharge/index.vue

@@ -9,13 +9,8 @@
           :request="queryRechargeList"
           model="TABLE"
           :defaultParams="{
-                    pageSize: 10,
                     sorts: [{ name: 'createTime', order: 'desc' }],
                 }"
-          :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
           :params="params"
         >
             <template #headerTitle>

src/views/iot-card/Record/index.vue

@@ -12,13 +12,8 @@
               :columns="columns"
               :request="queryList"
               :defaultParams="{
-                      pageSize: 10,
                       sorts: [{ name: 'time', order: 'desc' }],
                   }"
-              :pagination="{
-                      showSizeChanger: true,
-                      pageSizeOptions: ['10', '20', '50', '100'],
-                  }"
               :params="params"
               :model="'TABLE'"
           >

src/views/media/Cascade/Channel/BindChannel/index.vue

@@ -10,7 +10,11 @@
         @cancel="_vis = false"
         :confirmLoading="loading"
     >
-        <pro-search :columns="columns" target="media-bind" @search="handleSearch" />
+        <pro-search
+            :columns="columns"
+            target="media-bind"
+            @search="handleSearch"
+        />
 
         <JProTable
             ref="listRef"
@@ -18,7 +22,7 @@
             :columns="columns"
             :request="CascadeApi.queryChannelList"
             :defaultParams="{
-                sorts: [{ name: 'name', order: 'desc' }],
+                sorts: [{ name: 'deviceName', order: 'asc' }, { name: 'name', order: 'asc' }],
                 terms: [
                     {
                         column: 'id',
@@ -37,10 +41,9 @@
             :params="params"
             :rowSelection="{
                 selectedRowKeys: _selectedRowKeys,
-                onChange: onSelectChange,
+                onSelectNone: onSelectNone,
-            }"
+                onSelect: onSelect,
-            :pagination="{
+                onSelectAll: onAllSelect,
-                showSizeChanger: true,
             }"
         >
             <template #headerTitle>
@@ -101,6 +104,7 @@ const columns = [
         title: '设备名称',
         dataIndex: 'deviceName',
         key: 'deviceName',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -109,6 +113,7 @@ const columns = [
         title: '通道名称',
         dataIndex: 'name',
         key: 'name',
+        ellipsis: true,
         search: {
             type: 'string',
             first: true,
@@ -118,6 +123,7 @@ const columns = [
         title: '安装地址',
         dataIndex: 'address',
         key: 'address',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -126,6 +132,7 @@ const columns = [
         title: '厂商',
         dataIndex: 'manufacturer',
         key: 'manufacturer',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -135,6 +142,7 @@ const columns = [
         dataIndex: 'status',
         key: 'status',
         scopedSlots: true,
+        width: 150,
         search: {
             type: 'select',
             options: [
@@ -161,8 +169,31 @@ const handleSearch = (e: any) => {
 const listRef = ref();
 const _selectedRowKeys = ref<string[]>([]);
 
-const onSelectChange = (keys: string[]) => {
+const onSelectNone = () => {
-    _selectedRowKeys.value = [...keys];
+    _selectedRowKeys.value = [];
+};
+
+const onSelect = (record: any, selected: boolean) => {
+    const _set = new Set([..._selectedRowKeys.value])
+    if (selected) {
+        _set.add(record.id)
+    } else {
+        _set.delete(record.id)
+    }
+    _selectedRowKeys.value = [..._set]
+};
+
+const onAllSelect = (selected: boolean, _: any, keys: any[]) => {
+    const _keys = keys.map(item => item.id) || []
+    const _set = new Set([..._selectedRowKeys.value])
+    _keys.map((i: any) => {
+        if(selected) {
+            _set.add(i)
+        } else {
+            _set.delete(i)
+        }
+    });
+    _selectedRowKeys.value = [..._set]
 };
 
 const loading = ref(false);

src/views/media/Cascade/Channel/index.vue

@@ -9,7 +9,6 @@
                 :columns="columns"
                 :request="(e:any) => CascadeApi.queryBindChannel(route?.query.id as string, e)"
                 :defaultParams="{
-                    pageSize: 10,
                     sorts: [{ name: 'name', order: 'desc' }],
                 }"
                 :params="params"
@@ -17,10 +16,6 @@
                     selectedRowKeys: _selectedRowKeys,
                     onChange: onSelectChange,
                 }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
             >
                 <template #headerTitle>
                     <h3>通道列表</h3>
@@ -168,6 +163,7 @@ const columns = [
         key: 'deviceName',
         // width: 200,
         // fixed: 'left',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -175,6 +171,7 @@ const columns = [
     {
         title: '通道名称',
         dataIndex: 'name',
+        ellipsis: true,
         key: 'name',
         search: {
             type: 'string',
@@ -185,6 +182,7 @@ const columns = [
         title: '国标ID',
         dataIndex: 'channelId',
         key: 'channelId',
+        ellipsis: true,
         scopedSlots: true,
         headerCell: 'gbChannelIdHeader', // 表头单元格插槽
         search: {
@@ -195,6 +193,7 @@ const columns = [
         title: '安装地址',
         dataIndex: 'address',
         key: 'address',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -203,6 +202,7 @@ const columns = [
         title: '厂商',
         dataIndex: 'manufacturer',
         key: 'manufacturer',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -212,6 +212,7 @@ const columns = [
         dataIndex: 'status',
         key: 'status',
         scopedSlots: true,
+        width: 150,
         search: {
             type: 'select',
             options: [
@@ -226,6 +227,7 @@ const columns = [
     {
         title: '操作',
         key: 'action',
+        width: 100,
         scopedSlots: true,
     },
 ];

src/views/media/Cascade/Save/index.vue

@@ -428,6 +428,10 @@
                                             required: true,
                                             message: '请输入心跳周期',
                                         },
+                                        {
+                                            pattern: /^[1-9]\d*$/,
+                                            message: '请输入1~10000的整数',
+                                        }
                                     ]"
                                 >
                                     <j-input-number
@@ -450,6 +454,10 @@
                                             required: true,
                                             message: '请输入注册间隔',
                                         },
+                                        {
+                                            pattern: /^[1-9]\d*$/,
+                                            message: '请输入1~10000的整数',
+                                        }
                                     ]"
                                 >
                                     <j-input-number

src/views/media/Cascade/index.vue

@@ -56,16 +56,20 @@
                                 {{ slotProps.name }}
                             </h3>
                             <p>通道数量：{{ slotProps.count || 0 }}</p>
-                            <Ellipsis>
+                            <j-badge
-                                <j-badge
+                                :status="
-                                    :text="`sip:${slotProps.sipConfigs[0]?.sipId}@${slotProps.sipConfigs[0]?.hostAndPort}`"
+                                    slotProps.status?.value === 'enabled'
-                                    :status="
+                                        ? 'success'
-                                        slotProps.status?.value === 'enabled'
+                                        : 'error'
-                                            ? 'success'
+                                "
-                                            : 'error'
+                                style="display: flex; align-items: center;"
-                                    "
+                            >
-                                />
+                                <template #text>
-                            </Ellipsis>
+                                    <j-ellipsis>
+                                        {{ `sip:${slotProps.sipConfigs[0]?.sipId}@${slotProps.sipConfigs[0]?.hostAndPort}` }}
+                                    </j-ellipsis>
+                                </template>
+                            </j-badge>
                         </template>
                         <template #actions="item">
                             <PermissionButton
@@ -170,6 +174,7 @@ const columns = [
         key: 'name',
         width: 200,
         fixed: 'left',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -179,12 +184,14 @@ const columns = [
         dataIndex: 'sipId',
         key: 'sipId',
         scopedSlots: true,
+        ellipsis: true,
     },
     {
         title: '上级SIP 地址',
         dataIndex: 'publicHost',
         key: 'publicHost',
         scopedSlots: true,
+        ellipsis: true,
     },
     {
         title: '通道数量',

src/views/media/DashBoard/components/Card.vue

@@ -65,7 +65,7 @@ const createChart = () => {
                 left: maxY > 100000 ? 90 : 50,
                 right: '5%',
                 top: '5%',
-                bottom: '5%',
+                bottom: '10%',
             },
             tooltip: {
                 trigger: 'axis',
@@ -199,7 +199,7 @@ watch(
     .chart,
     .no-data {
         width: 100%;
-        min-height: calc(100vh - 430px);
+        min-height: calc(100vh - 450px);
     }
     .no-data {
         display: flex;

src/views/media/DashBoard/index.vue

@@ -35,11 +35,13 @@
                 />
             </j-col>
             <j-col :span="24" class="dash-board-bottom">
-                <Card
+                <full-page>
-                    title="播放数量(人次)"
+                    <Card
-                    :chartData="chartData"
+                        title="播放数量(人次)"
-                    @change="getPlayCount"
+                        :chartData="chartData"
-                />
+                        @change="getPlayCount"
+                    />
+                </full-page>
             </j-col>
         </j-row>
     </page-container>

src/views/media/Device/Channel/Save.vue

@@ -302,8 +302,8 @@ const handleSubmit = () => {
                 };
             }
             const res = formData.value.id
-                ? await ChannelApi.update(formData.value.id, extraFormData)
+                ? await ChannelApi.update(formData.value.id, extraFormData).finally(() => {loading.value = false;})
-                : await ChannelApi.save(extraFormData);
+                : await ChannelApi.save(extraFormData).finally(() => {loading.value = false;});
             if (res.success) {
                 onlyMessage('操作成功');
                 _vis.value = false;

src/views/media/Device/Channel/index.vue

@@ -34,9 +34,6 @@
                             sorts: [{ name: 'modifyTime', order: 'desc' }],
                         }"
                         :params="params"
-                        :pagination="{
-                            showSizeChanger: true,
-                        }"
                     >
                         <template #headerTitle>
                             <j-tooltip
@@ -156,6 +153,7 @@ const columns = [
         title: '通道ID',
         dataIndex: 'channelId',
         key: 'channelId',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -164,6 +162,7 @@ const columns = [
         title: '名称',
         dataIndex: 'name',
         key: 'name',
+        ellipsis: true,
         search: {
             type: 'string',
             first: true,
@@ -173,6 +172,7 @@ const columns = [
         title: '厂商',
         dataIndex: 'manufacturer',
         key: 'manufacturer',
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -180,6 +180,7 @@ const columns = [
     {
         title: '安装地址',
         dataIndex: 'address',
+        ellipsis: true,
         key: 'address',
         search: {
             type: 'string',
@@ -190,6 +191,7 @@ const columns = [
         dataIndex: 'status',
         key: 'status',
         scopedSlots: true,
+        width: 150,
         search: {
             type: 'select',
             options: [
@@ -204,6 +206,7 @@ const columns = [
     {
         title: '操作',
         key: 'action',
+        width: 200,
         scopedSlots: true,
     },
 ];

src/views/media/Home/index.vue

@@ -57,9 +57,6 @@
                     }
                 }"
                 :alertRender="false"
-                :pagination="{
-                    showSizeChanger: true,
-                }"
             >
                 <template #channelNumber="slotProps">
                     <span>{{ slotProps.channelNumber || 0 }}</span>

src/views/notice/Template/Log/index.vue

@@ -9,14 +9,10 @@
             :columns="columns"
             :request="(e:any) => templateApi.getHistory(e, data.id)"
             :defaultParams="{
-                pageSize: 5,
                 sorts: [{ name: 'notifyTime', order: 'desc' }],
                 terms: [{ column: 'notifyType$IN', value: data.type }],
             }"
             :params="params"
-            :pagination="{
-                pageSizeOptions: ['5', '10', '20', '50', '100'],
-            }"
         >
             <template #notifyTime="slotProps">
                 {{ moment(slotProps.notifyTime).format('YYYY-MM-DD HH:mm:ss') }}

src/views/system/DataSource/index.vue

@@ -14,13 +14,8 @@
                     model="TABLE"
                     :params="queryParams"
                     :defaultParams="{
-                        pageSize: 10,
                         sorts: [{ name: 'createTime', order: 'desc' }],
                     }"
-                    :pagination="{
-                        showSizeChanger: true,
-                        pageSizeOptions: ['10', '20', '50', '100'],
-                    }"
                 >
                     <template #headerTitle>
                         <PermissionButton

src/views/system/Department/user/components/AddBindUserDialog.vue

@@ -29,13 +29,8 @@
                 }"
                 model="TABLE"
                 :defaultParams="{
-                    pageSize: 10,
                     sorts: [{ name: 'createTime', order: 'desc' }],
                 }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
             />
         </div>
     </j-modal>

src/views/system/Department/user/index.vue

@@ -17,13 +17,6 @@
                     onChange: table.onSelectChange,
                 }"
                 model="TABLE"
-                :defaultParams="{
-                    pageSize: 10,
-                }"
-                :pagination="{
-                    showSizeChanger: true,
-                    pageSizeOptions: ['10', '20', '50', '100'],
-                }"
             >
                 <template #headerTitle>
                     <PermissionButton

src/views/system/Permission/components/EditDialog.vue

@@ -261,7 +261,7 @@ const table = reactive({
 
 const pager = reactive({
     current: 1,
-    pageSize: 10,
+    pageSize: 12,
     total: table.data.length,
 });
 const pageArr = computed(() => {

src/views/system/Permission/index.vue

@@ -14,13 +14,8 @@
                     model="TABLE"
                     :params="queryParams"
                     :defaultParams="{
-                        pageSize: 10,
                         sorts: [{ name: 'id', order: 'asc' }],
                     }"
-                    :pagination="{
-                        showSizeChanger: true,
-                        pageSizeOptions: ['10', '20', '50', '100'],
-                    }"
                 >
                     <template #headerTitle>
                         <PermissionButton

src/views/system/Platforms/Api/components/ChooseApi.vue

@@ -3,12 +3,11 @@
         <div class="table">
             <j-pro-table
                 :columns="columns"
-                :dataSource="props.tableData"
+                :dataSource="_tableData"
                 :rowSelection="props.mode !== 'home' ? rowSelection : undefined"
                 noPagination
                 model="TABLE"
             >
-            <!-- :rowKey="(record) => record.id + record.method" -->
                 <template #url="slotProps">
                     <span
                         style="color: #1d39c4; cursor: pointer"
@@ -39,6 +38,7 @@ import {
 import { modeType } from '../typing';
 import { useDepartmentStore } from '@/store/department';
 import { onlyMessage } from '@/utils/comm';
+import { uniqBy } from 'lodash-es';
 
 const department = useDepartmentStore();
 const emits = defineEmits([
@@ -70,8 +70,8 @@ const columns = [
     },
 ];
 
-watchEffect(() => {
+const _tableData = computed(() => {
-    console.log(props.tableData)
+    return uniqBy(props.tableData, 'id') || []
 })
 
 const rowSelection = {
@@ -91,9 +91,10 @@ const rowSelection = {
     //         });
     //     }
     // },
-    onChange: (keys: string[]) => {
+    onChange: (keys: string[], _data: any[]) => {
+        const _keys = _data.map(i => i.id)
         // 当前节点表格数据id
-        const currenTableKeys = props.tableData.map((m: any) => m.id);
+        const currenTableKeys = _tableData.value.map((m: any) => m.id);
         // 当前表格, 原有选中的id
         const oldSelectedKeys = currenTableKeys.filter((key) =>
             props.sourceKeys.includes(key),
@@ -104,16 +105,16 @@ const rowSelection = {
         );
 
         // 取消选择的数据项
-        const removeKeys = oldSelectedKeys.filter((key) => !keys.includes(key));
+        const removeKeys = oldSelectedKeys.filter((key) => !_keys.includes(key));
         // 新增选择的项
-        const addKeys = keys.filter((key) => !oldSelectedKeys.includes(key));
+        const addKeys = _keys.filter((key) => !oldSelectedKeys.includes(key));
         // 缓存当前表格和其他表格改变的数据
-        emits('update:selectedRowKeys', [...otherSelectedKeys, ...keys]);
+        emits('update:selectedRowKeys', [...otherSelectedKeys, ..._keys]);
 
         // 新增选中/取消选中的数据
         const changed = {};
         [...addKeys, ...removeKeys].forEach((key: string) => {
-            changed[key] = props.tableData.find((f: any) => f.id === key);
+            changed[key] = _tableData.value.find((f: any) => f.id === key);
         });
         if (props.mode === 'appManger') {
             // 缓存当前表格和其他表格改变的数据
@@ -178,7 +179,7 @@ watch(
     () => props.selectedRowKeys,
     (n) => {
         // console.log('props.selectedRowKeys: ', n);
-        rowSelection.selectedRowKeys.value = n;
+        rowSelection.selectedRowKeys.value = n
     },
 );
 </script>

src/views/system/Relationship/index.vue

@@ -14,13 +14,8 @@
                     model="TABLE"
                     :params="queryParams"
                     :defaultParams="{
-                        pageSize: 10,
                         sorts: [{ name: 'createTime', order: 'desc' }],
                     }"
-                    :pagination="{
-                        showSizeChanger: true,
-                        pageSizeOptions: ['10', '20', '50', '100'],
-                    }"
                 >
                     <template #headerTitle>
                         <PermissionButton

src/views/system/Role/index.vue

@@ -14,16 +14,11 @@
                     model="TABLE"
                     :params="queryParams"
                     :defaultParams="{
-                        pageSize: 10,
                         sorts: [
                             { name: 'createTime', order: 'desc' },
                             { name: 'id', order: 'desc' },
                         ],
                     }"
-                    :pagination="{
-                        showSizeChanger: true,
-                        pageSizeOptions: ['10', '20', '50', '100'],
-                    }"
                 >
                     <template #headerTitle>
                         <PermissionButton

src/views/system/User/index.vue

@@ -14,13 +14,8 @@
                     model="TABLE"
                     :params="queryParams"
                     :defaultParams="{
-                        pageSize: 10,
                         sorts: [{ name: 'createTime', order: 'desc' }],
                     }"
-                    :pagination="{
-                        showSizeChanger: true,
-                        pageSizeOptions: ['10', '20', '50', '100'],
-                    }"
                 >
                     <template #headerTitle>
                         <PermissionButton