Merge branch 'sqy_dev' into 'main'

修改antdv的按需引入组件的方式，解决不能打包的问题' See merge request huang/yun-teng-iot-front!76

Merge branch 'sqy_dev' into 'main'
修改antdv的按需引入组件的方式，解决不能打包的问题' See merge request huang/yun-teng-iot-front!76
xp.Huang
2 parents 0b6ae45b 25070427
Showing 14 changed files with 82 additions and 182 deletions
src/components/Application/src/AppLogo.vue
src/layouts/page/index.vue
src/main.ts
src/utils/rules.ts
src/views/dashboard/workbench/components/GrowCard.vue
src/views/dashboard/workbench/components/HelpDoc.vue
src/views/device/manage/cpns/modal/DeviceDetailDrawer.vue
src/views/device/manage/cpns/modal/DeviceModal.vue
src/views/device/profile/deviceConfigDetail.vue
src/views/message/records/index.vue
src/views/stationnotification/notificationmanager/config.d.ts
src/views/system/account/AccountDetail.vue
src/views/system/account/index.vue
src/views/tenant/platform/index.vue
--- a/src/components/Application/src/AppLogo.vue
View file @39d018f
+++ b/src/components/Application/src/AppLogo.vue
View file @39d018f
@@ -4,8 +4,9 @@
 -->
 <template>
-  <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img :src="getLogo" />
+  <div class="application" :class="getAppLogoClass">
+    <img v-if="getLogo" :src="getLogo" />
+    <img v-else src="/src/assets/images/logo.png" />
     <span
       class="ml-2 md:opacity-100"
       :class="getTitleClass"
@@ -19,10 +20,8 @@
 <script lang="ts" setup>
   import { computed, unref } from 'vue';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { useGo } from '/@/hooks/web/usePage';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { PageEnum } from '/@/enums/pageEnum';
   import { useUserStore } from '/@/store/modules/user';
   const props = defineProps({
     /**
@@ -43,7 +42,6 @@
   const { getCollapsedShowTitle } = useMenuSetting();
   const userStore = useUserStore();
   const { title } = useGlobSetting();
-  const go = useGo();
   const getAppLogoClass = computed(() => [
     prefixCls,
@@ -56,12 +54,8 @@
       'xs:opacity-0': !props.alwaysShowTitle,
     },
   ]);
-
-  function goHome() {
-    go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
-  }
   const getLogo = computed(() => {
-    return userStore.platInfo?.logo ?? '/src/assets/images/logo.png';
+    return userStore.platInfo?.logo;
   });
   const getTitle = computed(() => {
     // 设置icon
--- a/src/layouts/page/index.vue
View file @39d018f
+++ b/src/layouts/page/index.vue
View file @39d018f
@@ -21,43 +21,18 @@
       </transition>
     </template>
   </RouterView>
-  <!-- <BasicModal
-    @register="register"
-    v-bind="$attrs"
-    :mask="true"
-    :showCancelBtn="false"
-    :showOkBtn="false"
-    :canFullscreen="false"
-    :closable="false"
-    :maskStyle="maskColor"
-    :height="600"
-    :width="1500"
-    :maskClosable="false"
-    title="请您修改初始密码"
-    :helpMessage="['请您修改初始密码']"
-    :keyboard="false"
-  >
-    <PasswordDialog />
-  </BasicModal> -->
+
   <FrameLayout v-if="getCanEmbedIFramePage" />
 </template>
 <script lang="ts">
-  import { computed, defineComponent, unref, onMounted } from 'vue';
-  // import PasswordDialog from '/@/views/system/password/index.vue';
-
+  import { computed, defineComponent, unref } from 'vue';
   import FrameLayout from '/@/layouts/iframe/index.vue';
-
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
-
   import { useTransitionSetting } from '/@/hooks/setting/useTransitionSetting';
   import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
   import { getTransitionName } from './transition';
-
   import { useMultipleTabStore } from '/@/store/modules/multipleTab';
-  // import { BasicModal, useModal } from '/@/components/Modal';
-  // import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-  // import { getAuthCache } from '/@/utils/auth';
   export default defineComponent({
     name: 'PageLayout',
     components: { FrameLayout },
@@ -78,17 +53,6 @@
         return tabStore.getCachedTabList;
       });
-      // const [register, { openModal }] = useModal();
-      // const maskColor = ref({ backgroundColor: 'grey' });
-      // const statusModel = ref(false);
-      onMounted(() => {
-        // const userInfo = getAuthCache(USER_INFO_KEY);
-        // if (userInfo.needSetPwd == true) {
-        //   statusModel.value = true;
-        //   openModal(statusModel.value);
-        // }
-      });
-
       return {
         getTransitionName,
         openCache,
@@ -96,8 +60,6 @@
         getBasicTransition,
         getCaches,
         getCanEmbedIFramePage,
-        // register,
-        // maskColor,
       };
     },
   });
--- a/src/main.ts
View file @39d018f
+++ b/src/main.ts
View file @39d018f
@@ -14,13 +14,7 @@ import { setupStore } from '/@/store';
 import { setupGlobDirectives } from '/@/directives';
 import { setupI18n } from '/@/locales/setupI18n';
 import { registerGlobComp } from '/@/components/registerGlobComp';
-// Do not introduce on-demand in local development?
-// In the local development for introduce on-demand, the number of browser requests will increase by about 20%.
-// Which may slow down the browser refresh.
-// Therefore, all are introduced in local development, and only introduced on demand in the production environment
-if (import.meta.env.DEV) {
-  import('ant-design-vue/dist/antd.less');
-}
+import 'ant-design-vue/dist/antd.less';
 async function bootstrap() {
   const app = createApp(App);
--- a/src/utils/rules.ts
View file @39d018f
+++ b/src/utils/rules.ts
View file @39d018f
@@ -69,6 +69,7 @@ export const NotificationTitleMaxLength: Rule[] = [
       if (String(value).length > 50) {
         return Promise.reject('标题长度不超过200字');
       }
+      return Promise.resolve();
     },
     validateTrigger: 'blur',
   },
@@ -86,18 +87,6 @@ export const NotificationContentMaxLength: Rule[] = [
     validateTrigger: 'blur',
   },
 ];
-export const NotificationTypeMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (!value) {
-        return Promise.reject('请选择类型');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
 export const DeviceNameMaxLength: Rule[] = [
   {
--- a/src/views/dashboard/workbench/components/GrowCard.vue
View file @39d018f
+++ b/src/views/dashboard/workbench/components/GrowCard.vue
View file @39d018f
@@ -35,13 +35,18 @@
     </Card>
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4">
       <div class="flex" style="height: 100px">
-        <div class="mr-4"
-          ><img
-            :src="
-              !isAdmin(role) ? '/src/assets/images/alarm-count.png' : '/src/assets/images/zh.png'
-            "
+        <div class="mr-4">
+          <img
+            v-if="!isAdmin(role)"
+            src="/src/assets/images/alarm-count.png"
             style="width: 5rem; height: 5rem"
-        /></div>
+          />
+          <img
+            v-if="isAdmin(role)"
+            src="/src/assets/images/zh.png"
+            style="width: 5rem; height: 5rem"
+          />
+        </div>
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
             <div style="font-size: 1.625rem; color: #333">{{
@@ -60,9 +65,15 @@
       <div class="flex" style="height: 100px">
         <div class="mr-4"
           ><img
-            :src="!isAdmin(role) ? '/src/assets/images/msg-count.png' : '/src/assets/images/kf.png'"
+            v-if="!isAdmin(role)"
+            src="/src/assets/images/msg-count.png"
             style="width: 5rem; height: 5rem"
-        /></div>
+          /><img
+            v-if="isAdmin(role)"
+            src="/src/assets/images/kf.png"
+            style="width: 5rem; height: 5rem"
+          />
+        </div>
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
             <div style="font-size: 1.625rem; color: #333">{{
--- a/src/views/dashboard/workbench/components/HelpDoc.vue
View file @39d018f
+++ b/src/views/dashboard/workbench/components/HelpDoc.vue
View file @39d018f
@@ -108,17 +108,7 @@
 <script lang="ts">
   import { defineComponent, ref, computed, onMounted } from 'vue';
-  import {
-    Card,
-    AnchorLink,
-    List,
-    ListItem,
-    ListItemMeta,
-    Avatar,
-    CardMeta,
-    Descriptions,
-    DescriptionsItem,
-  } from 'ant-design-vue';
+  import { Card, Anchor, List, Avatar, Descriptions } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { getEnterPriseDetail } from '/@/api/oem';
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
@@ -128,21 +118,19 @@
   import { columns } from './props';
   import { isAdmin } from '/@/enums/roleEnum';
   import { getTenantExpireTimeList } from '/@/api/dashboard';
-  import 'ant-design-vue/es/anchor-link/style/index';
-
   export default defineComponent({
     components: {
       Card,
-      AnchorLink,
+      CardMeta: Card.Meta,
+      AnchorLink: Anchor.Link,
       List,
-      ListItem,
-      ListItemMeta,
+      ListItem: List.Item,
+      ListItemMeta: List.Item.Meta,
+      Descriptions,
+      DescriptionsItem: Descriptions.Item,
       Avatar,
       Time,
-      CardMeta,
       BasicTable,
-      Descriptions,
-      DescriptionsItem,
     },
     props: {
       role: {
@@ -222,13 +210,13 @@
       return {
         activeKey,
         tabListTitle,
-        onTabChange,
         helpDoc,
         getQrCode,
         getContacts,
         getAddress,
         getTel,
         dataSource,
+        onTabChange,
         go,
         registerTable,
         isAdmin,
@@ -238,7 +226,7 @@
   });
 </script>
-<style lang="less" scoped>
+<style scoped>
   .noticeTitle:hover {
     border-bottom: 1px solid #ccc;
   }
--- a/src/views/device/manage/cpns/modal/DeviceDetailDrawer.vue
View file @39d018f
+++ b/src/views/device/manage/cpns/modal/DeviceDetailDrawer.vue
View file @39d018f
@@ -26,7 +26,7 @@
   import { defineComponent, ref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { Tabs, TabPane } from 'ant-design-vue';
+  import { Tabs } from 'ant-design-vue';
   import Detail from '../tabs/Detail.vue';
   import RealTimeData from '../tabs/RealTimeData.vue';
   import Alarm from '../tabs/Alarm.vue';
@@ -37,13 +37,12 @@
     components: {
       BasicDrawer,
       Tabs,
-      TabPane,
+      TabPane: Tabs.TabPane,
       Detail,
       RealTimeData,
       Alarm,
       ChildDevice,
     },
-
     emits: ['reload', 'register'],
     setup() {
       const activeKey = ref('1');
--- a/src/views/device/manage/cpns/modal/DeviceModal.vue
View file @39d018f
+++ b/src/views/device/manage/cpns/modal/DeviceModal.vue
View file @39d018f
@@ -39,10 +39,9 @@
   import { createOrEditDevice } from '/@/api/device/deviceManager';
   import DeviceStep1 from '../step/DeviceStep1.vue';
   import DeviceStep2 from '../step/DeviceStep2.vue';
-  import { Steps, Step } from 'ant-design-vue';
+  import { Steps } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { credentialTypeEnum } from '../../config/data';
-  import 'ant-design-vue/es/step/style/index';
   export default defineComponent({
     name: 'DeviceModal',
@@ -51,7 +50,7 @@
       DeviceStep1,
       DeviceStep2,
       Steps,
-      Step,
+      Step: Steps.Step,
     },
     props: {
       userData: { type: Object },
--- a/src/views/device/profile/deviceConfigDetail.vue
View file @39d018f
+++ b/src/views/device/profile/deviceConfigDetail.vue
View file @39d018f
@@ -97,7 +97,7 @@
 <script lang="ts">
   import { defineComponent, ref, computed, watch } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { Tabs, TabPane } from 'ant-design-vue';
+  import { Tabs } from 'ant-design-vue';
   import { deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import {
@@ -117,11 +117,10 @@
   import { formSchema as enableClearSchema } from './step/cpns/enablerule/config';
   import { formSchema as detailClearSchema } from './step/cpns/detailtemplate/config';
   import { formSchema as echoFormClearSchema } from './step/cpns/alarmruleconditions/cpns/config';
-  import 'ant-design-vue/es/tab-pane/style/index.css';
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { Tabs, TabPane, BasicModal, BasicForm },
+    components: { Tabs, TabPane: Tabs.TabPane, BasicModal, BasicForm },
     emits: ['success', 'register'],
     setup() {
       const activeKey = ref('1');
--- a/src/views/message/records/index.vue
View file @39d018f
+++ b/src/views/message/records/index.vue
View file @39d018f
@@ -11,17 +11,16 @@
 </template>
 <script lang="ts">
-  import { Tabs, TabPane } from 'ant-design-vue';
+  import { Tabs } from 'ant-design-vue';
   import { defineComponent } from 'vue';
   import SmsLog from './item/SmsLog.vue';
   import EmailLog from './item/EmailLog.vue';
   import { achieveList } from './data';
-  import 'ant-design-vue/es/tab-pane/style/index.css';
   export default defineComponent({
     components: {
       Tabs,
-      TabPane,
+      TabPane: Tabs.TabPane,
       SmsLog,
       EmailLog,
     },
--- a/src/views/stationnotification/notificationmanager/config.d.ts
View file @39d018f
+++ b/src/views/stationnotification/notificationmanager/config.d.ts
View file @39d018f
@@ -5,7 +5,7 @@ import { Tinymce } from '/@/components/Tinymce/index';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { Tag } from 'ant-design-vue';
-import { NotificationTitleMaxLength, NotificationTypeMaxLength } from '/@/utils/rules';
+import { NotificationTitleMaxLength } from '/@/utils/rules';
 export enum IsOrgEnum {
   IS_ORG_ENUM = '1',
@@ -87,7 +87,6 @@ export const formSchema: FormSchema[] = [
         },
       ],
     },
-    rules: NotificationTypeMaxLength,
   },
   {
     field: 'title',
--- a/src/views/system/account/AccountDetail.vue
View file @39d018f
+++ b/src/views/system/account/AccountDetail.vue
View file @39d018f
 <template>
   <div>
-    <BasicModal
-      width="650px"
-      v-bind="$attrs"
-      @register="registerModal"
-      :title="getTitle"
-      @ok="handleSubmit"
-    >
-      <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
-        <Description size="middle" @register="register" />
-      </PageWrapper>
-    </BasicModal>
+    <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
+      <Description size="middle" @register="register" />
+    </PageWrapper>
   </div>
 </template>
 <script>
-  import { defineComponent, ref } from 'vue';
-  // import { useRoute } from 'vue-router';
+  import { defineComponent } from 'vue';
+  import { useRoute } from 'vue-router';
   import { PageWrapper } from '/@/components/Page';
   import { useGo } from '/@/hooks/web/usePage';
   import { Description } from '../../../components/Description';
-  import { useTabs } from '/@/hooks/web/useTabs';
   import { getAccountInfo } from '../../../api/system/system';
   import { accountSchema } from './account.detail.data';
   import { useDescription } from '../../../components/Description';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-
+  import { useTabs } from '/@/hooks/web/useTabs';
   const accountData = {};
   export default defineComponent({
     name: 'AccountDetail',
-    components: { PageWrapper, Description, BasicModal },
+    components: { PageWrapper, Description },
     setup() {
-      // const route = useRoute();
+      const route = useRoute();
       const go = useGo();
-      const { setTitle } = useTabs();
-      const getId = ref('');
-      const getTitle = ref('');
+      const { setTitle, close } = useTabs();
       const [register, methods] = useDescription({
         title: '账号基础信息',
         data: accountData,
-        bordered: false,
         schema: accountSchema,
         column: 3,
       });
-
-      const [registerModal] = useModalInner(async (data) => {
-        getId.value = await data.record.id;
-        getAccountInfo(getId.value).then((result) => {
-          Reflect.set(accountData, 'realName', result.realName);
-          Reflect.set(accountData, 'phoneNumber', result.phoneNumber);
-          Reflect.set(accountData, 'email', result.email);
-          Reflect.set(accountData, 'username', result.username);
-          Reflect.set(
-            accountData,
-            'enabled',
-            result.enabled ? '正常' : !result.enabled ? '禁用' : '已过期'
-          );
-          Reflect.set(accountData, 'accountExpireTime', result.accountExpireTime);
-          Reflect.set(accountData, 'createTime', result.createTime);
-          Reflect.set(accountData, 'updateTime', result.updateTime);
-          Reflect.set(accountData, 'deptId', result.deptId);
-          // 设置Tab的标题（不会影响页面标题）
-          setTitle('详情：用户' + result.realName);
-          getTitle.value = '详情：用户' + result.realName;
-          methods.setDescProps(accountData);
-        });
+      getAccountInfo(route.params?.id).then((result) => {
+        Reflect.set(accountData, 'realName', result.realName);
+        Reflect.set(accountData, 'phoneNumber', result.phoneNumber);
+        Reflect.set(accountData, 'email', result.email);
+        Reflect.set(accountData, 'username', result.username);
+        Reflect.set(
+          accountData,
+          'enabled',
+          result.enabled ? '正常' : !result.enabled ? '禁用' : '已过期'
+        );
+        Reflect.set(accountData, 'accountExpireTime', result.accountExpireTime);
+        Reflect.set(accountData, 'createTime', result.createTime);
+        Reflect.set(accountData, 'updateTime', result.updateTime);
+        Reflect.set(accountData, 'deptId', result.deptId);
+        // 设置Tab的标题（不会影响页面标题）
+        setTitle('详情：用户' + result.realName);
+        methods.setDescProps(accountData);
       });
       // 页面左侧点击返回链接时的操作
       function goBack() {
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
+        close();
         go('/system/account');
       }
-      return { goBack, accountSchema, accountData, register, registerModal, getTitle };
+      return { goBack, accountSchema, accountData, register };
     },
   });
 </script>
-
-<style></style>
--- a/src/views/system/account/index.vue
View file @39d018f
+++ b/src/views/system/account/index.vue
View file @39d018f
@@ -62,7 +62,6 @@
         </template>
       </BasicTable>
       <AccountModal @register="registerModal" @success="handleSuccess" />
-      <AccountDetail @register="registerDetailModal" @success="handleSuccess" />
     </PageWrapper>
   </div>
 </template>
@@ -75,26 +74,17 @@
   import { Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
-  import AccountDetail from './AccountDetail.vue';
+
   import { columns, searchFormSchema } from './account.data';
-  // import { useGo } from '/@/hooks/web/usePage';
+  import { useGo } from '/@/hooks/web/usePage';
   import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'AccountManagement',
-    components: {
-      BasicTable,
-      PageWrapper,
-      OrganizationIdTree,
-      AccountModal,
-      TableAction,
-      Tag,
-      AccountDetail,
-    },
+    components: { BasicTable, PageWrapper, OrganizationIdTree, AccountModal, TableAction, Tag },
     setup() {
-      // const go = useGo();
+      const go = useGo();
       const [registerModal, { openModal }] = useModal();
-      const [registerDetailModal, { openModal: openDetailModal }] = useModal();
       const { createMessage } = useMessage();
       let searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
@@ -157,14 +147,10 @@
       }
       function handleView(record: Recordable) {
-        openDetailModal(true, {
-          record,
-        });
-        // go('/system/account_detail/' + record.id);
+        go('/system/account_detail/' + record.id);
       }
       return {
-        registerDetailModal,
         registerTable,
         registerModal,
         handleCreate,
--- a/src/views/tenant/platform/index.vue
View file @39d018f
+++ b/src/views/tenant/platform/index.vue
View file @39d018f
@@ -2,9 +2,9 @@
   <div class="platform flex">
     <Card class="tab-card" :bordered="false">
       <Tabs v-model:activeKey="activeKey" tab-position="left">
-        <TabPane key="企业信息" tab="企业信息" />
-        <TabPane key="平台定制" tab="平台定制" />
-        <TabPane key="APP定制" tab="APP定制" />
+        <Tabs.TabPane key="企业信息" tab="企业信息" />
+        <Tabs.TabPane key="平台定制" tab="平台定制" />
+        <Tabs.TabPane key="APP定制" tab="APP定制" />
       </Tabs>
     </Card>
@@ -18,7 +18,7 @@
 </template>
 <script lang="ts" setup>
-  import { Tabs, TabPane, Card } from 'ant-design-vue';
+  import { Tabs, Card } from 'ant-design-vue';
   import { ref } from 'vue';
   import EnterpriseInfo from './cpns/EnterpriseInfo.vue';
   import CVIDraw from './cpns/CVIDraw.vue';