iZaiZaiA il y a 2 ans
Parent
commit
bc28eeca0c

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202207281745',    //开发版本号
+    dev_version: '202209131600',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 2 - 2
src/global/components/hc-context-menu/index.vue

@@ -15,7 +15,7 @@
 <script setup>
 import {ref, useSlots, watch, nextTick, onMounted, onBeforeUnmount} from "vue";
 import clickOutsideVue from 'click-outside-vue3';
-import {UUID, deepClone} from "vue-utils-plus"
+import {getRandom, deepClone} from "vue-utils-plus"
 const props = defineProps({
     ui: {
         type: String,
@@ -28,7 +28,7 @@ const props = defineProps({
 })
 
 //初始变量
-const uuid = UUID()
+const uuid = getRandom()
 const menus = ref(props.datas)
 
 //挂载自定义指令

+ 3 - 3
src/views/user/index.vue

@@ -19,7 +19,7 @@
             </div>
         </div>
         <div class="hc-layout-content-box">
-            <HcCard :title="menuItem.label" :ui="basicHight?'basic-hight':''" v-if="menuKey !== 'log' && menuKey !== 'recycle'">
+            <HcCard scrollbar :title="menuItem.label" :ui="basicHight?'basic-hight':''" v-if="menuKey !== 'log' && menuKey !== 'recycle'">
                 <template #extra>
                     <span class="text-link" v-if="menuKey === 'basic' && !basicFormEdit" @click="basicFormEditClick">编辑</span>
                     <span class="text-link" v-if="menuKey === 'project'" @click="setDefaultProjectClick">设置默认项目</span>
@@ -104,7 +104,7 @@
                     <span>取消</span>
                 </el-button>
             </div>
-            <HcCard :title="menuItem.label" :scrollbar="false" v-if="menuKey === 'log'">
+            <HcCard :title="menuItem.label" v-if="menuKey === 'log'">
                 <template #search>
                     <div class="flex items-center">
                         <div class="w-32">
@@ -150,7 +150,7 @@
                     <HcPages :pages="searchLogForm" @change="pageLogChange"/>
                 </template>
             </HcCard>
-            <HcCard :scrollbar="false" v-if="menuKey === 'recycle'" actionSize="lg">
+            <HcCard v-if="menuKey === 'recycle'" actionSize="lg">
                 <template #header>
                     <div class="mr-5">{{menuItem.label}}</div>
                     <HcNewSwitch :datas="userTypeTab" :keys="userTypeKey" @change="userTypeChange"/>

+ 1 - 1
vite.config.js

@@ -36,7 +36,7 @@ export default defineConfig({
         }),
     ],
     server: {
-        port: '3001',
+        //port: '3001',
         //host: '0.0.0.0',
         proxy: {
             '/api': {