Browse Source

fix: 系统相关组件修改

fan 2 years ago
parent
commit
e63ed75444

+ 5 - 0
src/api/sys/sysTenantApi.ts

@@ -7,6 +7,7 @@ enum Api {
   sysTenantAdd = '/sys/tenant/add',
   sysTenantEdit = '/sys/tenant/edit',
   sysTenantRemove = '/sys/tenant/removeByIds',
+  sysTenantQueryCurrent = '/sys/tenant/query/current',
 }
 
 /**
@@ -34,6 +35,10 @@ enum Api {
 export const sysTenantQueryPage = (params?: object) => {
   return defHttp.post({ url: Api.sysTenantQueryPage, params: setParams(params) });
 };
+
+export const sysTenantQueryCurrent = () => {
+  return defHttp.post({ url: Api.sysTenantQueryCurrent });
+};
 /**
  *
  * @author lf

+ 1 - 0
src/views/sys/sysConfig/data.ts

@@ -75,6 +75,7 @@ export const dataFormSchema: FormSchema[] = [
     required: true,
     componentProps: {
       placeholder: '请输入参数名称',
+      // extra: '123123',
     },
   },
   {

+ 13 - 12
src/views/sys/sysConfig/index.vue

@@ -100,7 +100,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, onBeforeMount, reactive } from 'vue';
+  import { onBeforeMount, reactive } from 'vue';
   import { Tag } from 'ant-design-vue';
   import { BasicTable, TableAction, useTable } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
@@ -113,7 +113,7 @@
   // import { downloadFile, listDictModel } from '/@/api/common';
   // import { listDictModel } from '/@/api/common';
   import { commonDict } from '/@/utils';
-  import { templateRef } from '@vueuse/core';
+  // import { templateRef } from '@vueuse/core';
   import { useDebounceFn } from '@vueuse/shared';
 
   defineOptions({
@@ -250,14 +250,15 @@
   }
 </script>
 
-<sytle scoped lang="less">
-.table-search {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  &-item {
-    margin-right: 10px;
-    max-width: 180px;
+<style lang="less" scoped>
+  .table-search {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    &-item {
+      margin-right: 10px;
+      max-width: 180px;
+    }
   }
-}
-</sytle>
+</style>

+ 4 - 2
src/views/sys/sysMenu/MenuTree.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="m-4 mr-0 overflow-hidden bg-white">
     <BasicTree
+      v-if="treeData.length"
       ref="treeRef"
       title=""
       toolbar
@@ -9,19 +10,20 @@
       :clickRowToExpand="false"
       :fieldNames="{ key: 'id', title: 'name' }"
       :renderIcon="createIcon"
+      v-model:expandedKeys="defaultExpandedKeys"
       @select="handleSelect"
     />
   </div>
 </template>
 <script lang="ts" setup>
-  import { onBeforeMount, ref } from 'vue';
+  import { onBeforeMount, ref, defineExpose } from 'vue';
   import { BasicTree } from '/@/components/Tree';
 
   import { sysMenuQueryTree } from '/@/api/sys/sysMenuApi';
   import { getAllParentKeys } from '/@/utils';
 
   const emit = defineEmits(['select']);
-
+  const defaultExpandedKeys = ref(['0']);
   const treeData = ref([]);
   const treeRef = ref();
   onBeforeMount(() => {

+ 1 - 0
src/views/sys/sysNotice/FormModal.vue

@@ -5,6 +5,7 @@
     @register="registerModal"
     :title="getTitle"
     @ok="handleSubmit"
+    :footer="123"
     ><!-- :maskClosable="false" -->
     <BasicForm @register="registerForm">
       <!-- <template #deptIds>

+ 1 - 1
src/views/sys/sysOrg/OrgTree.vue

@@ -16,7 +16,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onBeforeMount, ref } from 'vue';
+  import { onBeforeMount, ref, defineExpose } from 'vue';
   import { BasicTree } from '/@/components/Tree';
 
   import { sysOrgQueryTree } from '/@/api/sys/sysOrgApi';

+ 1 - 1
src/views/sys/sysUser/OrgTree.vue

@@ -15,7 +15,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onBeforeMount, ref } from 'vue';
+  import { onBeforeMount, ref, defineExpose } from 'vue';
   import { BasicTree } from '/@/components/Tree';
 
   import { sysOrgQueryTree } from '/@/api/sys/sysOrgApi';