Merge branch 'ft-dev' into 'main'

feat:新增租户配置的创建时间字段，fix：修复消息配置编辑控制台警告问题

See merge request huang/yun-teng-iot-front!95

 // 时间戳转时间
-export const transformTime = (timestamp = +new Date()) => {
-  if (timestamp) {
-    const time = new Date(timestamp);
-    const y = time.getFullYear(); //getFullYear方法以四位数字返回年份
-    const M = time.getMonth() + 1; // getMonth方法从 Date 对象返回月份 (0 ~ 11)，返回结果需要手动加一
-    const d = time.getDate(); // getDate方法从 Date 对象返回一个月中的某一天 (1 ~ 31)
-    // const h = time.getHours(); // getHours方法返回 Date 对象的小时 (0 ~ 23)
-    // const m = time.getMinutes(); // getMinutes方法返回 Date 对象的分钟 (0 ~ 59)
-    // const s = time.getSeconds(); // getSeconds方法返回 Date 对象的秒数 (0 ~ 59)
-    // h + ':' + m + ':' + s
-    return y + '-' + M + '-' + d;
-  } else {
-    return '';
-  }
+export const transformTime = (str) => {
+  const n = parseInt(str);
+  const D = new Date(n);
+  const year = D.getFullYear(); //四位数年份
+  let month = D.getMonth() + 1; //月份(0-11),0为一月份
+  month = month < 10 ? '0' + month : month;
+  let day = D.getDate(); //月的某一天(1-31)
+  day = day < 10 ? '0' + day : day;
+  let hours = D.getHours(); //小时(0-23)
+  hours = hours < 10 ? '0' + hours : hours;
+  let minutes = D.getMinutes(); //分钟(0-59)
+  minutes = minutes < 10 ? '0' + minutes : minutes;
+  const now_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes;
+  return now_time;
 };

@@ -36,12 +36,33 @@
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
-          const config = data.record.config;
-          for (const key in config) {
-            Reflect.set(data.record, key + '', config[key]);
-          }
+          console.log(data);
+          // const config = data.record.config;
+          // for (const key in config) {
+          //   Reflect.set(data.record, key + '', config[key]);
+          // }
+          // await setFieldsValue({
+          //   ...data.record,
+          // });
           await setFieldsValue({
-            ...data.record,
+            accessKeyId: data.record.config.accessKeyId,
+            accessKeySecret: data.record.config.accessKeySecret,
+            platformTypeDictText: data.record.platformTypeDictText,
+            messageTypeDictText: data.record.messageTypeDictText,
+            messageType: data.record.messageType,
+            platformType: data.record.platformType,
+            configName: data.record.configName,
+            createTime: data.record.createTime,
+            creator: data.record.creator,
+            enabled: data.record.enabled,
+            id: data.record.id,
+            key: data.record.key,
+            pendingStatus: data.record.pendingStatus,
+            remark: data.record.remark,
+            status: data.record.status,
+            tenantId: data.record.tenantId,
+            updateTime: data.record.updateTime,
+            updater: data.record.updater,
           });
         }
       });

@@ -73,7 +73,6 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'messageType',
     label: '消息类型',
-    required: true,
     component: 'ApiSelect',
     colProps: {
       span: 6,

@@ -54,7 +54,6 @@ export const searchFormSchema: FormSchema[] = [
     label: '发送手机',
     component: 'Input',
     colProps: { span: 6 },
-    rules: phoneRule,
     componentProps: {
       maxLength: 36,
     },

@@ -49,26 +49,12 @@ export const searchFormSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入用户名',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'realName',
     label: '姓名',
     component: 'Input',
     colProps: { span: 8 },
-    required: true,
     componentProps: {
       maxLength: 255,
       placeholder: '请输入姓名',

@@ -10,6 +10,7 @@
     <BasicForm @register="registerForm">
       <template #menu="{ model, field }">
         <BasicTree
+          v-if="treeData.length > 0"
           ref="tree"
           v-model:value="model[field]"
           :treeData="treeData"
@@ -19,6 +20,7 @@
           toolbar
           title="菜单分配"
           @check="handleCheckClick"
+          :defaultExpandAll="true"
         />
       </template>
     </BasicForm>

@@ -4,7 +4,9 @@ import { h } from 'vue';
 import { Switch } from 'ant-design-vue';
 import { setRoleStatus } from '/@/api/system/system';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { getAllRoleList } from '/@/api/system/system';
+import { getRoleListByPage } from '/@/api/system/system';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
 
 export const columns: BasicColumn[] = [
   {
@@ -34,9 +36,18 @@ export const columns: BasicColumn[] = [
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
           const { createMessage } = useMessage();
-          const data = await getAllRoleList();
-          const findById = data.find((f) => f.id == record.id);
-          if (findById?.id) return createMessage.error(`该租户下面有此用户，无法禁用`);
+          const data = await getRoleListByPage({
+            page: 1,
+            pageSize: 100,
+            // roleType: 'CUSTOMER_USER',
+          });
+          const userInfo = (await getAuthCache(USER_INFO_KEY)) as unknown as any;
+          const findById = data.items.find((f) => {
+            if (f.id === userInfo.plainRoles[0].roleId) {
+              return f.id;
+            }
+          });
+          if (record.id == findById?.id) return createMessage.error(`该租户下面有此客户，无法禁用`);
           record.pendingStatus = true;
           setRoleStatus(record.id, newStatus)
             .then(() => {
@@ -112,6 +123,49 @@ export const formSchema: FormSchema[] = [
         { label: '停用', value: 0 },
       ],
     },
+    // componentProps({ formModel, formActionType }) {
+    //   const initStatus = formModel.status;
+    //   const { createMessage } = useMessage();
+    //   let initBoolean = false;
+    //   const { setFieldsValue } = formActionType;
+    //   if (formModel.name !== undefined) {
+    //     initBoolean = true;
+    //   } else if (formModel.name == undefined) {
+    //     initBoolean = false;
+    //   }
+    //   return {
+    //     options: [
+    //       { label: '启用', value: 1 },
+    //       { label: '停用', value: 0 },
+    //     ],
+    //     async onChange(e) {
+    //       // const data = await getAllRoleList();
+    //       // const findById = data.find((f) => f.id);
+    //       if (!initBoolean) {
+    //         setFieldsValue({
+    //           status: initStatus,
+    //         });
+    //       } else {
+    //         if (e == 0 && formModel.name !== undefined) {
+    //           createMessage.error(`该租户下面有此用户，无法停用`);
+    //           setFieldsValue({
+    //             status: Number(1),
+    //           });
+    //         } else {
+    //           setFieldsValue({
+    //             status: initStatus,
+    //           });
+    //         }
+    //       }
+    //       // if (e == 0) {
+    //       //   if (findById?.id) return createMessage.error(`该租户下面有此用户，无法禁用`);
+    //       //   setFieldsValue({
+    //       //     status: 1,
+    //       //   });
+    //       // }
+    //     },
+    //   };
+    // },
   },
   {
     label: '备注',

@@ -10,6 +10,7 @@
     <BasicForm @register="registerForm">
       <template #menu="{ model, field }">
         <BasicTree
+          v-if="treeData.length > 0"
           v-model:value="model[field]"
           :treeData="treeData"
           :replaceFields="{ title: 'menuName' }"
@@ -19,6 +20,7 @@
           ref="tree"
           title="菜单分配"
           @check="handleCheckClick"
+          :defaultExpandAll="true"
         />
       </template>
     </BasicForm>

@@ -35,17 +35,19 @@
       const { proxy } = getCurrentInstance();
       const getChildData = ref(null);
       const editGetId: any = ref('');
-      const [registerForm, { validateFields, getFieldsValue, resetFields, setFieldsValue }] =
-        useForm({
-          schemas: formSchema,
-          showActionButtonGroup: false,
-        });
+      const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         //清除表单值
         proxy.$refs.getChildData.funcResetFields();
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
+        if (!unref(isUpdate)) {
+          editGetId.value = '';
+        }
         //编辑
         if (unref(isUpdate)) {
           parentSetData.value = { ...data.record.profileData.configuration };
@@ -58,44 +60,44 @@
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增租户配置' : '编辑租户配置'));
 
+      const getAllFieldsFunc = () => {
+        getValuesFormData = getFieldsValue();
+        let getChildValues = proxy.$refs.getChildData.getAllFields();
+        let profileData1 = {
+          configuration: getChildValues,
+        };
+        const id: any = {
+          id: unref(isUpdate) ? editGetId.value : '',
+        };
+
+        const createTime = {
+          createdTime: Date.now(),
+        };
+
+        Object.assign(
+          postAllData,
+          {
+            profileData: profileData1,
+          },
+          getValuesFormData,
+          id,
+          createTime
+        );
+        if (!unref(isUpdate)) {
+          delete postAllData.id;
+        }
+      };
+
       async function handleSubmit() {
         if (!unref(isUpdate)) {
-          let res = validateFields();
-          if (!res) return;
-          getValuesFormData = getFieldsValue();
-          let getChildValues = proxy.$refs.getChildData.getAllFields();
-          let profileData1 = {
-            configuration: getChildValues,
-          };
-          Object.assign(
-            postAllData,
-            {
-              profileData: profileData1,
-            },
-            getValuesFormData
-          );
+          getAllFieldsFunc();
           await saveTenantProfileApi(postAllData);
           createMessage.success('租户配置新增成功');
           closeDrawer();
           emit('success');
           resetFields();
-        }
-        if (unref(isUpdate)) {
-          let res = validateFields();
-          if (!res) return;
-          getValuesFormData = getFieldsValue();
-          getValuesFormData.id = editGetId.value;
-          let getChildValues = proxy.$refs.getChildData.getAllFields();
-          let profileData1 = {
-            configuration: getChildValues,
-          };
-          Object.assign(
-            postAllData,
-            {
-              profileData: profileData1,
-            },
-            getValuesFormData
-          );
+        } else {
+          getAllFieldsFunc();
           await saveTenantProfileApi(postAllData);
           createMessage.success('租户配置编辑成功');
           closeDrawer();