Merge branch 'main' into local_dev_ft

fengwotao
2 parents 9365c432 07cfb735
Showing 9 changed files with 99 additions and 182 deletions
src/components/Form/index.ts
src/components/Form/src/componentMap.ts
src/layouts/default/sider/MixSider.vue
src/utils/http/axios/Axios.ts
src/views/device/list/index.vue
src/views/rule/dataFlow/addDataTransferDrawer.vue
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/system/customize/config/enterPriseInfo.config.ts
vite.config.ts
--- a/src/components/Form/index.ts
View file @c719245
+++ b/src/components/Form/index.ts
View file @c719245
-import BasicForm from './src/BasicForm.vue';
+export { default as BasicForm } from './src/BasicForm.vue';
 export * from './src/types/form';
 export * from './src/types/formItem';
@@ -22,4 +22,4 @@ export {
 } from '/@/components/Form/src/externalCompns/components/JEasyCron';
 // Jeecg自定义校验
 export { JCronValidator } from '/@/components/Form/src/externalCompns/components/JEasyCron';
-export { BasicForm };
+// export { BasicForm };
--- a/src/components/Form/src/componentMap.ts
View file @c719245
+++ b/src/components/Form/src/componentMap.ts
View file @c719245
@@ -38,9 +38,6 @@ import ApiSearchSelect from './components/ApiSearchSelect.vue';
 import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue';
 import StructForm from './externalCompns/components/StructForm/StructForm.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
-import TransferModal from './components/TransferModal.vue';
-import TransferTableModal from './components/TransferTableModal.vue';
-import ObjectModelValidateForm from './externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 const componentMap = new Map<ComponentType, Component>();
@@ -86,9 +83,6 @@ componentMap.set('ApiSearchSelect', ApiSearchSelect);
 componentMap.set('CustomMinMaxInput', CustomMinMaxInput);
 componentMap.set('StructForm', StructForm);
 componentMap.set('ApiSelectScrollLoad', ApiSelectScrollLoad);
-componentMap.set('TransferModal', TransferModal);
-componentMap.set('TransferTableModal', TransferTableModal);
-componentMap.set('ObjectModelValidateForm', ObjectModelValidateForm);
 export function add(compName: ComponentType, component: Component) {
   componentMap.set(compName, component);
--- a/src/layouts/default/sider/MixSider.vue
View file @c719245
+++ b/src/layouts/default/sider/MixSider.vue
View file @c719245
@@ -150,7 +150,7 @@
       const getIsFixed = computed(() => {
         /* eslint-disable-next-line */
-        mixSideHasChildren.value = unref(childrenMenus).length > 0;interfaceDisplay
+        mixSideHasChildren.value = unref(childrenMenus).length > 0;
         const isFixed = unref(getMixSideFixed) && unref(mixSideHasChildren);
         if (isFixed) {
           /* eslint-disable-next-line */
--- a/src/utils/http/axios/Axios.ts
View file @c719245
+++ b/src/utils/http/axios/Axios.ts
View file @c719245
@@ -120,7 +120,7 @@ export class VAxios {
       if (userStore && userStore.jwtToken) {
         try {
           const res = jwt_decode(userStore.jwtToken) as JwtModel;
-          const currentTime = new Date().getTime() / 1000;
+          const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
           if (currentTime >= res.exp && this.isNeedTokenURL(config.url)) {
             await this.refreshTokenBeforeReq(userStore.doRefresh);
           }
--- a/src/views/device/list/index.vue
View file @c719245
+++ b/src/views/device/list/index.vue
View file @c719245
@@ -182,7 +182,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, unref, nextTick, h, onUnmounted, ref } from 'vue';
+  import { defineComponent, reactive, unref, h, onMounted } from 'vue';
   import {
     DeviceModel,
     DeviceRecord,
@@ -216,7 +216,7 @@
   import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Authority } from '/@/components/Authority';
-  import { useRouter } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { useBatchOperation } from '/@/utils/useBatchOperation';
   export default defineComponent({
@@ -243,7 +243,7 @@
       const { createMessage } = useMessage();
       const go = useGo();
       const ROUTER = useRouter();
-      const immediateStatus = ref(false);
+      const ROUTE = useRoute();
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
@@ -259,9 +259,7 @@
           reload,
           setLoading,
           setSelectedRowKeys,
-          setTableData,
           getForm,
-          setPagination,
           getSelectRowKeys,
           getSelectRows,
           getRowSelection,
@@ -269,17 +267,13 @@
       ] = useTable({
         title: '设备列表',
         api: devicePage,
-        immediate: immediateStatus.value,
         columns,
         beforeFetch: (params) => {
           const { deviceProfileId } = params;
           const obj = {
             ...params,
             ...{
-              deviceProfileIds:
-                deviceProfileId === undefined || deviceProfileId === null || deviceProfileId == ''
-                  ? null
-                  : [deviceProfileId],
+              deviceProfileIds: deviceProfileId ? [deviceProfileId] : null,
             },
           };
           delete obj.deviceProfileId;
@@ -313,54 +307,6 @@
       const { isExistOption } = useBatchOperation(getRowSelection, setSelectedRowKeys);
-      function getParams(keyword) {
-        const reg = new RegExp('(^|&)' + keyword + '=([^&]*)(&|$)', 'i');
-        const r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]);
-        return null; //注意此处参数是中文，解码使用的方法是unescape ，那么在传值的时候如果是中文，需要使用escape('曲浩')方法来编码。
-      }
-
-      const count = ref(0);
-      const onCloseVal = ref(0);
-      const deviceProfileId = ref('');
-      count.value = Number(getParams('count'));
-      deviceProfileId.value = getParams('deviceProfileId') || '';
-      const setRowClassName = async () => {
-        if (deviceProfileId.value !== undefined) {
-          const { items, total } = await devicePage({
-            page: 1,
-            pageSize: count.value === 0 ? 10 : count.value,
-            deviceProfileIds:
-              deviceProfileId.value === undefined ||
-              deviceProfileId.value === null ||
-              deviceProfileId.value == ''
-                ? null
-                : [deviceProfileId.value],
-          });
-          setPagination({ total });
-          nextTick(() => {
-            setTableData(items);
-            const { setFieldsValue, resetFields } = getForm();
-            setFieldsValue({
-              deviceProfileId: deviceProfileId.value || null,
-            });
-            if (onCloseVal.value == 1) {
-              resetFields();
-            }
-          });
-        } else {
-          setTimeout(() => {
-            reload();
-          }, 80);
-        }
-      };
-      setRowClassName();
-      onUnmounted(() => {
-        deviceProfileId.value = '';
-        count.value = 10;
-        onCloseVal.value = 1;
-      });
-
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const role: string = userInfo.roles[0];
@@ -494,6 +440,11 @@
         reload();
       };
+      onMounted(() => {
+        const queryParams = ROUTE.query as Record<'deviceProfileId', undefined | string>;
+        const { setFieldsValue } = getForm();
+        setFieldsValue({ deviceProfileId: queryParams.deviceProfileId });
+      });
       return {
         registerTable,
         handleCreate,
--- a/src/views/rule/dataFlow/addDataTransferDrawer.vue
View file @c719245
+++ b/src/views/rule/dataFlow/addDataTransferDrawer.vue
View file @c719245
@@ -50,6 +50,12 @@
   import { postAddConvertApi } from '/@/api/datamanager/dataManagerApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Button } from '/@/components/Button';
+  import { add } from '/@/components/Form/src/componentMap';
+  import TransferModal from '/@/components/Form/src/components/TransferModal.vue';
+  import TransferTableModal from '/@/components/Form/src/components/TransferTableModal.vue';
+
+  add('TransferModal', TransferModal);
+  add('TransferTableModal', TransferTableModal);
   export default defineComponent({
     name: 'ConfigDrawer',
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @c719245
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @c719245
@@ -127,6 +127,10 @@
   import Action from './cpns/Action.vue';
   import { findOperation } from './config/formatData';
   import { formatToDateTime } from '/@/utils/dateUtil';
+  import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
+  import { add } from '/@/components/Form/src/componentMap';
+
+  add('ObjectModelValidateForm', ObjectModelValidateForm);
   const emit = defineEmits(['register', 'success']);
   const provideOrgid = ref('');
--- a/src/views/system/customize/config/enterPriseInfo.config.ts
View file @c719245
+++ b/src/views/system/customize/config/enterPriseInfo.config.ts
View file @c719245
@@ -2,6 +2,13 @@ import type { FormSchema } from '/@/components/Form/index';
 import { getAreaList } from '/@/api/oem/index';
 import { emailRule, phoneRule } from '/@/utils/rules';
+export enum Level {
+  PROVINCE = 'PROVINCE',
+  CITY = 'CITY',
+  COUNTY = 'COUNTY',
+  TOWN = 'TOWN',
+}
+
 export const schemas: FormSchema[] = [
   {
     field: 'name',
@@ -201,150 +208,104 @@ export const provSchemas: FormSchema[] = [
     colProps: {
       span: 6,
     },
-    componentProps({ formModel, formActionType }) {
-      const { updateSchema } = formActionType;
+    componentProps({ formActionType }) {
+      const { setFieldsValue } = formActionType;
       return {
         api: getAreaList,
         labelField: 'name',
         valueField: 'code',
         placeholder: '省份',
-        params: { parentId: 1 },
-        async onChange(value) {
-          if (value === undefined) {
-            formModel.nameCity = undefined; //  reset city value
-            formModel.nameCoun = undefined;
-            formModel.nameTown = undefined;
-            updateSchema([
-              {
-                field: 'nameCity',
-                componentProps: {
-                  options: [],
-                  placeholder: '城市',
-                },
-              },
-              {
-                field: 'nameCoun',
-                componentProps: {
-                  options: [],
-                  placeholder: '区/县',
-                },
-              },
-              {
-                field: 'nameTown',
-                componentProps: {
-                  options: [],
-                  placeholder: '城镇/街道',
-                },
-              },
-            ]);
-          } else {
-            const nameCity = await getAreaList({ parentId: value });
-            nameCity.forEach((item) => {
-              item.label = item.name;
-              item.value = item.code;
-            });
-            formModel.nameCity = undefined; //  reset city value
-            formModel.nameCoun = undefined;
-            formModel.nameTown = undefined;
-            updateSchema({
-              field: 'nameCity',
-              componentProps: {
-                options: nameCity,
-                placeholder: '城市',
-                async onChange(value) {
-                  if (value === undefined) {
-                    formModel.nameCoun = undefined; //  reset city value
-                    formModel.nameTown = undefined;
-                    updateSchema([
-                      {
-                        field: 'nameCoun',
-                        componentProps: {
-                          options: [],
-                        },
-                      },
-                      {
-                        field: 'nameTown',
-                        componentProps: {
-                          options: [],
-                        },
-                      },
-                    ]);
-                  } else {
-                    // 获取区数据
-                    const nameCoun = await getAreaList({ parentId: value });
-                    nameCoun.forEach((item) => {
-                      item.label = item.name;
-                      item.value = item.code;
-                    });
-                    updateSchema({
-                      field: 'nameCoun',
-                      componentProps: {
-                        // 请选择区
-                        options: nameCoun,
-                        async onChange(value) {
-                          if (value === undefined) {
-                            formModel.nameTown = undefined;
-                            updateSchema({
-                              field: 'nameTown',
-                              componentProps: {
-                                placeholder: '城镇/街道',
-                                options: [],
-                              },
-                            });
-                          } else {
-                            const nameTown = await getAreaList({ parentId: value });
-                            nameTown.forEach((item) => {
-                              item.label = item.name;
-                              item.value = item.code;
-                            });
-                            updateSchema({
-                              field: 'nameTown',
-                              componentProps: {
-                                placeholder: '城镇/街道',
-                                options: nameTown,
-                              },
-                            });
-                          }
-                        },
-                      },
-                    });
-                  }
-                },
-              },
-            });
-          }
+        params: { parentId: 1, level: Level.PROVINCE },
+        onChange: () => {
+          setFieldsValue({ nameCity: null, nameCoun: null, nameTown: null });
         },
       };
     },
   },
   {
     field: 'nameCity',
-    component: 'Select',
+    component: 'ApiSelect',
     label: '',
     colProps: {
       span: 6,
     },
+    componentProps: ({ formActionType, formModel }) => {
+      const nameProv = Reflect.get(formModel, 'nameProv');
+      const { setFieldsValue } = formActionType;
+      return {
+        api: async (params: Recordable) => {
+          try {
+            if (!nameProv) return;
+            const result = await getAreaList(params);
+            return result;
+          } catch (error) {
+            return [];
+          }
+        },
+        labelField: 'name',
+        valueField: 'code',
+        placeholder: '城市',
+        params: { parentId: nameProv, level: Level.CITY },
+        onChange: () => {
+          setFieldsValue({ nameCoun: null, nameTown: null });
+        },
+      };
+    },
   },
   {
     field: 'nameCoun',
-    component: 'Select',
+    component: 'ApiSelect',
     label: '',
     colProps: {
       span: 6,
     },
-    componentProps: {
-      placeholder: '区/县',
+    componentProps: ({ formActionType, formModel }) => {
+      const nameCity = Reflect.get(formModel, 'nameCity');
+      const { setFieldsValue } = formActionType;
+      return {
+        api: async (params: Recordable) => {
+          try {
+            if (!nameCity) return;
+            const result = await getAreaList(params);
+            return result;
+          } catch (error) {
+            return [];
+          }
+        },
+        labelField: 'name',
+        valueField: 'code',
+        placeholder: '区/县',
+        params: { parentId: nameCity, level: Level.COUNTY },
+        onChange: () => {
+          setFieldsValue({ nameTown: null });
+        },
+      };
     },
   },
   {
     field: 'nameTown',
-    component: 'Select',
+    component: 'ApiSelect',
     label: '',
     colProps: {
       span: 6,
     },
-    componentProps: {
-      placeholder: '城镇/街道',
+    componentProps: ({ formModel }) => {
+      const nameCoun = Reflect.get(formModel, 'nameCoun');
+      return {
+        api: async (params: Recordable) => {
+          try {
+            if (!nameCoun) return;
+            const result = await getAreaList(params);
+            return result;
+          } catch (error) {
+            return [];
+          }
+        },
+        labelField: 'name',
+        valueField: 'code',
+        placeholder: '城镇/街道',
+        params: { parentId: nameCoun, level: Level.TOWN },
+      };
     },
   },
 ];
--- a/vite.config.ts
View file @c719245
+++ b/vite.config.ts
View file @c719245
@@ -66,6 +66,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
     build: {
       target: 'es2015',
       outDir: OUTPUT_DIR,
+      // minify: 'terser', // The minify mode is set to use terser to remove console
       terserOptions: {
         compress: {
           keep_infinity: true,