Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition BUG

See merge request yunteng/thingskit-front!546

+<script lang="ts" setup>
+  import { ReloadOutlined } from '@ant-design/icons-vue';
+  import { Button, List, Tooltip } from 'ant-design-vue';
+  import { reactive } from 'vue';
+  import { ref } from 'vue';
+
+  const listElRef = ref<Nullable<ComponentElRef>>(null);
+
+  const pagination = reactive({});
+
+  const loading = ref(false);
+
+  const dataSource = ref([]);
+
+  const getDataSource = () => {};
+</script>
+
+<template>
+  <section class="bg-light-50 my-4 p-4 x dark:text-gray-300 dark:bg-dark-900">
+    <List
+      ref="listElRef"
+      :dataSource="dataSource"
+      :pagination="pagination"
+      :grid="{ gutter: 16, xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 3, column: 3 }"
+      :loading="loading"
+    >
+      <template #header>
+        <section class="flex justify-between gap-4 min-h-12 items-center">
+          <div class="text-lg font-semibold">
+            <span>任务列表</span>
+          </div>
+          <Tooltip title="刷新">
+            <Button type="primary" @click="getDataSource">
+              <ReloadOutlined :spin="loading" />
+            </Button>
+          </Tooltip>
+        </section>
+      </template>
+      <template #renderItem="{ item }">
+        <List.Item :key="item.id">
+          <slot name="item" :item="item"></slot>
+        </List.Item>
+      </template>
+    </List>
+  </section>
+</template>

+import { ComponentPropsOptions } from 'vue';
+
+export const props = {
+  title: {
+    type: String,
+  },
+} as ComponentPropsOptions;

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { nextTick, onMounted, onUnmounted, reactive, ref, unref } from 'vue';
   import { nextTick, onMounted, onUnmounted, reactive, ref, unref } from 'vue';
-  import { List, Button, Card } from 'ant-design-vue';
+  import { List, Button, Card, Tooltip } from 'ant-design-vue';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
   import { realTimeDataColumns } from '../../config/detail.config';
   import { realTimeDataColumns } from '../../config/detail.config';
@@ -31,6 +31,9 @@
     key?: string;
     key?: string;
     value?: string;
     value?: string;
     time?: number;
     time?: number;
+    type?: string;
+    boolClose?: string;
+    boolOpen?: string;
   }
   }
 
 
   const props = defineProps<{
   const props = defineProps<{
@@ -214,6 +217,14 @@
     open();
     open();
   });
   });
 
 
+  const formatValue = (item: DataSource) => {
+    return item.type === DataTypeEnum.IS_BOOL
+      ? !!Number(item.value)
+        ? item.boolOpen
+        : item.boolClose
+      : item.value || '--';
+  };
+
   onUnmounted(() => close());
   onUnmounted(() => close());
 </script>
 </script>
 
 
@@ -252,13 +263,9 @@
               </template>
               </template>
               <section class="min-h-16 flex flex-col justify-between">
               <section class="min-h-16 flex flex-col justify-between">
                 <div class="flex font-bold text-lg mb-4 gap-2">
                 <div class="flex font-bold text-lg mb-4 gap-2">
-                  <div>{{
-                    item.type === DataTypeEnum.IS_BOOL
-                      ? !!Number(item.value)
-                        ? item.boolOpen
-                        : item.boolClose
-                      : item.value || '--'
-                  }}</div>
+                  <Tooltip :title="formatValue(item)" placement="topLeft">
+                    <div class="truncate">{{ formatValue(item) }}</div>
+                  </Tooltip>
                   <div class="text-xs flex items-center">{{ item.unit }}</div>
                   <div class="text-xs flex items-center">{{ item.unit }}</div>
                 </div>
                 </div>
                 <div class="text-dark-800 text-xs">
                 <div class="text-dark-800 text-xs">

@@ -92,7 +92,6 @@ export const schemas: DescItem[] = [
     render(_val: any, data: TaskRecordType) {
     render(_val: any, data: TaskRecordType) {
       const { executeTime } = data;
       const { executeTime } = data;
       const { time, type, periodType, pollUnit, period } = executeTime;
       const { time, type, periodType, pollUnit, period } = executeTime;
-      console.log({ time, type, periodType, pollUnit });
       return type === ExecuteTimeTypeEnum.POLL
       return type === ExecuteTimeTypeEnum.POLL
         ? `${time}${TimeUnitNameEnum[pollUnit]}`
         ? `${time}${TimeUnitNameEnum[pollUnit]}`
         : `${PeriodTypeNameEnum[periodType]} ${
         : `${PeriodTypeNameEnum[periodType]} ${

@@ -11,6 +11,7 @@
   import { FormValueType } from './util';
   import { FormValueType } from './util';
   import { unref } from 'vue';
   import { unref } from 'vue';
   import { computed } from 'vue';
   import { computed } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const props = defineProps<{
   const props = defineProps<{
     reload: Fn;
     reload: Fn;
@@ -49,6 +50,7 @@
   });
   });
 
 
   const loading = ref(false);
   const loading = ref(false);
+  const { createMessage } = useMessage();
   const handleOk = async () => {
   const handleOk = async () => {
     try {
     try {
       loading.value = true;
       loading.value = true;
@@ -58,6 +60,9 @@
       formMode.value === DataActionModeEnum.CREATE
       formMode.value === DataActionModeEnum.CREATE
         ? await createTask(_res)
         ? await createTask(_res)
         : await updateTask({ ..._res, id: unref(dataSource)?.id as string });
         : await updateTask({ ..._res, id: unref(dataSource)?.id as string });
+      createMessage.success(
+        unref(modalMode) === DataActionModeEnum.CREATE ? '创建成功' : '修改成功'
+      );
       closeModal();
       closeModal();
       props.reload?.();
       props.reload?.();
     } catch (error) {
     } catch (error) {

@@ -65,7 +65,7 @@ export const formSchemas: FormSchema[] = [
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '指定目标设备',
     label: '指定目标设备',
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TARGET_TYPE] === TargetType.ASSIGN,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TARGET_TYPE] === TargetType.ASSIGN,
-    rules: [{ required: true, message: '请选择指定目标设备' }],
+    rules: [{ required: true, message: '请选择指定目标设备', type: 'array' }],
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
       const record = JSON.parse(formModel[FormFieldsEnum.TASK_RECORD]) as TaskRecordType;
       const record = JSON.parse(formModel[FormFieldsEnum.TASK_RECORD]) as TaskRecordType;
       const isDevices = record.targetType === TaskTargetEnum.DEVICES;
       const isDevices = record.targetType === TaskTargetEnum.DEVICES;

 <script setup lang="ts">
 <script setup lang="ts">
-  import { Button, List, Tooltip } from 'ant-design-vue';
+  import { Button, List, Space, Tooltip } from 'ant-design-vue';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { PermissionEnum, formSchemas } from './config';
   import { PermissionEnum, formSchemas } from './config';
@@ -19,6 +19,7 @@
   import { RunTaskModal } from './components/RunTaskModal';
   import { RunTaskModal } from './components/RunTaskModal';
   import { DetailDrawer } from './components/DetailDrawer';
   import { DetailDrawer } from './components/DetailDrawer';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
+  import { CardLayoutButton } from '/@/components/Widget';
 
 
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerDrawer, { openDrawer }] = useDrawer();
@@ -41,12 +42,14 @@
     getDataSource();
     getDataSource();
   };
   };
 
 
+  const colNumber = ref(5);
   const pagination = reactive({
   const pagination = reactive({
     current: 1,
     current: 1,
-    pageSize: 10,
     total: 0,
     total: 0,
+    pageSize: unref(colNumber) * 2,
     showQuickJumper: true,
     showQuickJumper: true,
     size: 'small',
     size: 'small',
+    showSizeChanger: false,
     showTotal: (total: number) => `共 ${total} 条数据`,
     showTotal: (total: number) => `共 ${total} 条数据`,
     onChange: paginationChange,
     onChange: paginationChange,
     onShowSizeChange: paginationChange,
     onShowSizeChange: paginationChange,
@@ -58,13 +61,15 @@
     try {
     try {
       loading.value = true;
       loading.value = true;
       const params = getFieldsValue();
       const params = getFieldsValue();
+      const pageSize = unref(colNumber) * 2;
       const { items, total } = await getTaskCenterList({
       const { items, total } = await getTaskCenterList({
         page: pagination.current,
         page: pagination.current,
-        pageSize: pagination.pageSize,
+        pageSize,
         ...params,
         ...params,
       });
       });
       dataSource.value = items;
       dataSource.value = items;
       pagination.total = total;
       pagination.total = total;
+      pagination.pageSize = pageSize;
     } catch (error) {
     } catch (error) {
       throw error;
       throw error;
     } finally {
     } finally {
@@ -148,11 +153,14 @@
             <div>
             <div>
               <span class="text-lg font-medium">任务列表</span>
               <span class="text-lg font-medium">任务列表</span>
             </div>
             </div>
-            <Tooltip v-if="dataSource.length" title="刷新">
-              <Button type="primary" @click="getDataSource">
-                <ReloadOutlined :spin="loading" />
-              </Button>
-            </Tooltip>
+            <Space>
+              <CardLayoutButton v-model:value="colNumber" @change="reload" />
+              <Tooltip v-if="dataSource.length" title="刷新">
+                <Button type="primary" @click="getDataSource">
+                  <ReloadOutlined :spin="loading" />
+                </Button>
+              </Tooltip>
+            </Space>
           </section>
           </section>
         </template>
         </template>
         <template #renderItem="{ item }">
         <template #renderItem="{ item }">