Merge branch 'ft-dev' into 'main'

fix:发现打包问题，原因是ant-design-vue有些样式没找到

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

@@ -111,14 +111,11 @@
       const getPersonalDetailValue: any = ref({});
       const getPersonalDetailValue: any = ref({});
       const avatarUrl: any = ref('');
       const avatarUrl: any = ref('');
       const getBackendV: any = ref({});
       const getBackendV: any = ref({});
-      const retryFormData: any = ref({});
-      // const retryDefaultData: any = ref({});
       const [registerDesc] = useDescription({
       const [registerDesc] = useDescription({
         title: '个人详情',
         title: '个人详情',
         schema: schema,
         schema: schema,
       });
       });
 
 
-      const [registerModal, { closeModal }] = useModalInner();
       const avatar = computed(() => {
       const avatar = computed(() => {
         const { avatar } = userStore.getUserInfo;
         const { avatar } = userStore.getUserInfo;
         return avatarUrl.value || avatar || defaultImage;
         return avatarUrl.value || avatar || defaultImage;
@@ -130,25 +127,15 @@
         showActionButtonGroup: false,
         showActionButtonGroup: false,
         schemas: formSchema,
         schemas: formSchema,
       });
       });
-      //回显数据
-      const retryFieldsValue = async () => {
-        try {
-          // retryDefaultData.value = await personalGet(getUserInfo.userId);
-          const getUserInfo = await userInfo;
-          // const getUserInfo = userStore.getUserInfo;
-          retryFormData.value = getUserInfo;
-          setFieldsValue({
-            realName: retryFormData.value.realName,
-            phoneNumber: retryFormData.value.phoneNumber,
-            email: retryFormData.value.email,
-          });
-        } catch (e) {
-          return e;
-        }
-      };
-      // setTimeout(() => {
-      //   retryFieldsValue();
-      // }, 3000);
+
+      const [registerModal, { closeModal }] = useModalInner(async (data) => {
+        setFieldsValue({
+          realName: data.userInfo.realName,
+          phoneNumber: data.userInfo.phoneNumber,
+          email: data.userInfo.email,
+        });
+        getPersonalDetailValue.value = data.userInfo;
+      });
       const handleSubmit = async () => {
       const handleSubmit = async () => {
         const getUserInfo = await userInfo;
         const getUserInfo = await userInfo;
         getPersonalValue.value = await validate();
         getPersonalValue.value = await validate();
@@ -160,29 +147,10 @@
         closeModal();
         closeModal();
         resetFields();
         resetFields();
       };
       };
-
-      const getPersonalDetail = async () => {
-        try {
-          const getUserInfo = await userInfo;
-          getPersonalDetailValue.value = getUserInfo;
-          setTimeout(() => {
-            setFieldsValue({
-              realName: getPersonalDetailValue.value.realName,
-              phoneNumber: getPersonalDetailValue.value.phoneNumber,
-              email: getPersonalDetailValue.value.email,
-            });
-          }, 1000);
-        } catch (e) {
-          return e;
-        }
-      };
-      getPersonalDetail();
-
       const compHeight = computed(() => {
       const compHeight = computed(() => {
         return 1000;
         return 1000;
       });
       });
       return {
       return {
-        retryFieldsValue,
         uploadApi,
         uploadApi,
         compHeight,
         compHeight,
         updateAvatar,
         updateAvatar,

@@ -53,13 +53,13 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
-
   import headerImg from '/@/assets/images/header.jpg';
   import headerImg from '/@/assets/images/header.jpg';
   import { propTypes } from '/@/utils/propTypes';
   import { propTypes } from '/@/utils/propTypes';
   import { openWindow } from '/@/utils';
   import { openWindow } from '/@/utils';
-
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
-
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { useUserStore } from '/@/store/modules/user';
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal';
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal';
 
 
   export default defineComponent({
   export default defineComponent({
@@ -75,6 +75,7 @@
       theme: propTypes.oneOf(['dark', 'light']),
       theme: propTypes.oneOf(['dark', 'light']),
     },
     },
     setup() {
     setup() {
+      const userInfo = getAuthCache(USER_INFO_KEY);
       const { proxy } = getCurrentInstance();
       const { proxy } = getCurrentInstance();
       const personalRef = ref(null);
       const personalRef = ref(null);
       const { prefixCls } = useDesign('header-user-dropdown');
       const { prefixCls } = useDesign('header-user-dropdown');
@@ -123,8 +124,9 @@
 
 
       const openPersonalFunc = () => {
       const openPersonalFunc = () => {
         setTimeout(() => {
         setTimeout(() => {
-          openModalPersonal(true);
-          proxy.$refs.personalRef.retryFieldsValue();
+          openModalPersonal(true, {
+            userInfo,
+          });
         }, 10);
         }, 10);
       };
       };
 
 

@@ -128,6 +128,8 @@
   import { columns } from './props';
   import { columns } from './props';
   import { isAdmin } from '/@/enums/roleEnum';
   import { isAdmin } from '/@/enums/roleEnum';
   import { getTenantExpireTimeList } from '/@/api/dashboard';
   import { getTenantExpireTimeList } from '/@/api/dashboard';
+  import 'ant-design-vue/es/anchor-link/style/index';
+
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
       Card,
       Card,

@@ -25,6 +25,7 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     component: 'Input',
     componentProps: {
     componentProps: {
       placeholder: '设备名称',
       placeholder: '设备名称',
+      maxLength: 30,
     },
     },
     rules: DeviceNameMaxLength,
     rules: DeviceNameMaxLength,
   },
   },
@@ -268,7 +269,7 @@ export const step2Schemas: FormSchema[] = [
     required: true,
     required: true,
     ifShow: false,
     ifShow: false,
     componentProps: {
     componentProps: {
-      maxLength: 64,
+      maxLength: 0,
     },
     },
   },
   },
   {
   {
@@ -298,6 +299,9 @@ export const step2Schemas: FormSchema[] = [
     required: true,
     required: true,
     rules: DeviceUserNameMaxLength,
     rules: DeviceUserNameMaxLength,
     ifShow: false,
     ifShow: false,
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
   {
   {
     label: '密码',
     label: '密码',
@@ -446,7 +450,7 @@ export const TokenSchemas: FormSchema[] = [
     required: true,
     required: true,
     ifShow: false,
     ifShow: false,
     componentProps: {
     componentProps: {
-      maxLength: 64,
+      maxLength: 0,
     },
     },
   },
   },
   {
   {
@@ -476,6 +480,9 @@ export const TokenSchemas: FormSchema[] = [
     required: true,
     required: true,
     ifShow: false,
     ifShow: false,
     rules: DeviceUserNameMaxLength,
     rules: DeviceUserNameMaxLength,
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
   {
   {
     label: '密码',
     label: '密码',

@@ -203,6 +203,9 @@ export const alarmSchemasForm: FormSchema[] = [
     field: 'details',
     field: 'details',
     label: '详情',
     label: '详情',
     component: 'InputTextArea',
     component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
 ];
 ];
 
 
@@ -213,12 +216,18 @@ export const childDeviceSchemas: FormSchema[] = [
     label: '设备配置',
     label: '设备配置',
     component: 'Select',
     component: 'Select',
     colProps: { span: 12 },
     colProps: { span: 12 },
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
   {
   {
     field: 'icon',
     field: 'icon',
     label: '设备名称',
     label: '设备名称',
     component: 'Input',
     component: 'Input',
     colProps: { span: 12 },
     colProps: { span: 12 },
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
 ];
 ];
 export const childDeviceColumns: BasicColumn[] = [
 export const childDeviceColumns: BasicColumn[] = [

@@ -88,5 +88,8 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     component: 'Input',
     colProps: { span: 7 },
     colProps: { span: 7 },
     rules: DeviceQueryUserNameMaxLength,
     rules: DeviceQueryUserNameMaxLength,
+    componentProps: {
+      maxLength: 255,
+    },
   },
   },
 ];
 ];

@@ -42,6 +42,8 @@
   import { Steps, Step } from 'ant-design-vue';
   import { Steps, Step } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { credentialTypeEnum } from '../../config/data';
   import { credentialTypeEnum } from '../../config/data';
+  import 'ant-design-vue/es/step/style/index';
+
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceModal',
     name: 'DeviceModal',
     components: {
     components: {

@@ -117,6 +117,7 @@
   import { formSchema as enableClearSchema } from './step/cpns/enablerule/config';
   import { formSchema as enableClearSchema } from './step/cpns/enablerule/config';
   import { formSchema as detailClearSchema } from './step/cpns/detailtemplate/config';
   import { formSchema as detailClearSchema } from './step/cpns/detailtemplate/config';
   import { formSchema as echoFormClearSchema } from './step/cpns/alarmruleconditions/cpns/config';
   import { formSchema as echoFormClearSchema } from './step/cpns/alarmruleconditions/cpns/config';
+  import 'ant-design-vue/es/tab-pane/style/index.css';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ConfigDrawer',
     name: 'ConfigDrawer',

@@ -2,6 +2,17 @@
   <div class="step1">
   <div class="step1">
     <div class="step1-form">
     <div class="step1-form">
       <BasicForm @register="register" />
       <BasicForm @register="register" />
+      <div>
+        <span>请上传图片</span>
+        <CropperAvatar
+          :uploadApi="uploadApi"
+          :value="avatar"
+          btnText="更换头像"
+          :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
+          @change="updateAvatar"
+          width="150"
+        />
+      </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -10,6 +21,8 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from './data';
   import { step1Schemas } from './data';
   import { Select, Input, Divider } from 'ant-design-vue';
   import { Select, Input, Divider } from 'ant-design-vue';
+  import { CropperAvatar } from '/@/components/Cropper';
+  import { uploadApi } from '/@/api/personal/index';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -18,6 +31,7 @@
       [Input.name]: Input,
       [Input.name]: Input,
       [Input.Group.name]: Input.Group,
       [Input.Group.name]: Input.Group,
       [Divider.name]: Divider,
       [Divider.name]: Divider,
+      CropperAvatar,
     },
     },
     emits: ['next', 'resetFunc'],
     emits: ['next', 'resetFunc'],
     setup(_, { emit }) {
     setup(_, { emit }) {
@@ -45,7 +59,7 @@
       const customResetFunc = async () => {
       const customResetFunc = async () => {
         await resetFields();
         await resetFields();
       };
       };
-      return { register, resetFieldsFunc, customResetFunc };
+      return { register, resetFieldsFunc, customResetFunc, uploadApi };
     },
     },
   });
   });
 </script>
 </script>

@@ -48,7 +48,7 @@ export const step1Schemas: FormSchema[] = [
   //     span: 8,
   //     span: 8,
   //   },
   //   },
   //   componentProps: {
   //   componentProps: {
-  //     // api: uploadApi,
+  //     api: uploadApi,
   //   },
   //   },
   // },
   // },
   {
   {

@@ -16,6 +16,7 @@
   import SmsLog from './item/SmsLog.vue';
   import SmsLog from './item/SmsLog.vue';
   import EmailLog from './item/EmailLog.vue';
   import EmailLog from './item/EmailLog.vue';
   import { achieveList } from './data';
   import { achieveList } from './data';
+  import 'ant-design-vue/es/tab-pane/style/index.css';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {

@@ -97,6 +97,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     component: 'Input',
     componentProps: {
     componentProps: {
       placeholder: '请输入标题',
       placeholder: '请输入标题',
+      maxLength: 200,
     },
     },
     rules: NotificationTitleMaxLength,
     rules: NotificationTitleMaxLength,
   },
   },

@@ -11,9 +11,9 @@
         <a-button @click="fireResourceError" type="primary">
         <a-button @click="fireResourceError" type="primary">
           {{ t('sys.errorLog.fireResourceError') }}
           {{ t('sys.errorLog.fireResourceError') }}
         </a-button>
         </a-button>
-        <a-button @click="fireAjaxError" type="primary">
+        <!-- <a-button @click="fireAjaxError" type="primary">
           {{ t('sys.errorLog.fireAjaxError') }}
           {{ t('sys.errorLog.fireAjaxError') }}
-        </a-button>
+        </a-button> -->
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -36,7 +36,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useErrorLogStore } from '/@/store/modules/errorLog';
   import { useErrorLogStore } from '/@/store/modules/errorLog';
-  import { fireErrorApi } from '/@/api/demo/error';
+  // import { fireErrorApi } from '/@/api/demo/error';
   import { getColumns } from './data';
   import { getColumns } from './data';
   import { cloneDeep } from 'lodash-es';
   import { cloneDeep } from 'lodash-es';
 
 
@@ -86,7 +86,7 @@
     imgList.value.push(`${new Date().getTime()}.png`);
     imgList.value.push(`${new Date().getTime()}.png`);
   }
   }
 
 
-  async function fireAjaxError() {
-    await fireErrorApi();
-  }
+  // async function fireAjaxError() {
+  //   await fireErrorApi();
+  // }
 </script>
 </script>