小修改
zhangdaiscott
parent
a588da907d
commit
308326a5f9
|
|
@ -4,6 +4,7 @@ VITE_USE_MOCK = true
|
|||
# 发布路径
|
||||
VITE_PUBLIC_PATH = /
|
||||
|
||||
|
||||
# 跨域代理，您可以配置多个 ,请注意，没有换行符
|
||||
VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ pnpm-debug.log*
|
|||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
.svn
|
||||
# .vscode
|
||||
*.suo
|
||||
*.ntvs*
|
||||
|
|
|
|||
4
LICENSE
4
LICENSE
|
|
@ -32,4 +32,6 @@ SOFTWARE.
|
|||
违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
|
||||
|
||||
总结：在遵循Apache开源协议和开源协议补充条款下，允许商用使用，不会造成侵权行为！
|
||||
解释权归：http://www.jeecg.com
|
||||
解释权归：
|
||||
http://www.jeecg.com
|
||||
http://guojusoft.com
|
||||
|
|
|
|||
|
|
@ -166,6 +166,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<script type="module" src="/src/main.ts"></script>
|
||||
<!-- 百度统计 -->
|
||||
<script>
|
||||
var _hmt = _hmt || [];
|
||||
(function() {
|
||||
|
|
@ -175,5 +176,6 @@
|
|||
s.parentNode.insertBefore(hm, s);
|
||||
})();
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ export const LoginRoute: AppRouteRecordRaw = {
|
|||
},
|
||||
};
|
||||
|
||||
//update-begin---author:wangshuai ---date:20220629 for：auth2登录页面路由------------
|
||||
export const Oauth2LoginRoute: AppRouteRecordRaw = {
|
||||
path: '/oauth2-app/login',
|
||||
name: 'oauth2-app-login',
|
||||
|
|
@ -49,6 +50,7 @@ export const Oauth2LoginRoute: AppRouteRecordRaw = {
|
|||
title: t('routes.oauth2.login'),
|
||||
},
|
||||
};
|
||||
//update-end---author:wangshuai ---date:20220629 for：auth2登录页面路由------------
|
||||
|
||||
/**
|
||||
* 【通过token直接静默登录】流程办理登录页面 中转跳转
|
||||
|
|
|
|||
|
|
@ -466,14 +466,6 @@ const comp: AppRouteModule = {
|
|||
title: t('routes.demo.feat.copy'),
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'codemirror',
|
||||
name: 'codemirrorDemo',
|
||||
component: () => import('/@/views/demo/codemirror/index.vue'),
|
||||
meta: {
|
||||
title: t('routes.demo.feat.codemirror'),
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'ripple',
|
||||
name: 'RippleDemo',
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
export const GITHUB_URL = 'https://github.com/jeecgboot/jeecg-boot';
|
||||
|
||||
// vue-Jeecg-admin-next-doc
|
||||
export const DOC_URL = 'http://help.jeecg.com';
|
||||
export const DOC_URL = 'https://help.jeecg.com';
|
||||
|
||||
// site url
|
||||
export const SITE_URL = 'http://www.jeecg.com';
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
|
|||
// authentication schemes，e.g: Bearer
|
||||
// authenticationScheme: 'Bearer',
|
||||
authenticationScheme: '',
|
||||
//接口超时设置
|
||||
timeout: 10 * 1000,
|
||||
// 基础接口地址
|
||||
// baseURL: globSetting.apiUrl,
|
||||
|
|
|
|||
|
|
@ -196,6 +196,7 @@
|
|||
*/
|
||||
function handleDetail(record) {
|
||||
openModal(true,{
|
||||
title: "消息模板详情",
|
||||
isUpdate: true,
|
||||
showFooter: false,
|
||||
record:record
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<BasicModal v-bind="$attrs" @register="registerModal" title="查看详情" :showCancelBtn="false" :showOkBtn="false" :height="500">
|
||||
<BasicModal v-bind="$attrs" @register="registerModal" title="查看详情" :showCancelBtn="false" :showOkBtn="false" :maxHeight="500">
|
||||
<iframe :src="frameSrc" class="detail-iframe" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
const showFooter = ref(true);
|
||||
const [roleUserDrawer, { openDrawer: openRoleUserDrawer }] = useDrawer();
|
||||
const [registerDrawer, { openDrawer }] = useDrawer();
|
||||
const [registerModal, { openModal }] = useModal();
|
||||
const [registerIndexModal, { openModal: openIndexModal }] = useModal();
|
||||
const [rolePermissionDrawer, { openDrawer: openRolePermissionDrawer }] = useDrawer();
|
||||
const [registerDesc, { openDrawer: openRoleDesc }] = useDrawer();
|
||||
|
|
@ -136,7 +135,6 @@
|
|||
function handlePerssion(record) {
|
||||
openRolePermissionDrawer(true, { roleId: record.id });
|
||||
}
|
||||
|
||||
/**
|
||||
* 首页配置弹窗
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
import { useModal } from '/@/components/Modal';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { columns, searchFormSchema } from '../user/user.data';
|
||||
import { list , deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch, syncUser, getUserTenantPageList, updateUserTenantStatus } from '../user/user.api';
|
||||
import { list , deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch , getUserTenantPageList, updateUserTenantStatus } from '../user/user.api';
|
||||
// import { usePermission } from '/@/hooks/web/usePermission'
|
||||
// const { hasPermission } = usePermission();
|
||||
import { userTenantColumns, userTenantFormSchema } from '../user/user.data';
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" :disabled="isDisabledAuth('system:user:export')"> 导出</a-button>
|
||||
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
|
||||
<a-button type="primary" @click="openModal(true, {})" preIcon="ant-design:hdd-outlined"> 回收站</a-button>
|
||||
<!-- <JThirdAppButton biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally" />-->
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<template #overlay>
|
||||
<a-menu>
|
||||
|
|
@ -221,7 +220,6 @@
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*同步钉钉和微信回调
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -200,7 +200,6 @@ export const saveOrUpdateAgent = (params) => {
|
|||
return defHttp.post({ url: url, params });
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* 用户离职(新增代理人和用户状态变更操作)
|
||||
* @param params
|
||||
|
|
@ -230,14 +229,14 @@ export const putCancelQuit = (params, handleSuccess) => {
|
|||
/**
|
||||
* 待审批获取列表数据
|
||||
*/
|
||||
export const getUserTenantPageList = (params)=>{
|
||||
return defHttp.get({url:Api.getUserTenantPageList,params})
|
||||
}
|
||||
export const getUserTenantPageList = (params) => {
|
||||
return defHttp.get({ url: Api.getUserTenantPageList, params });
|
||||
};
|
||||
|
||||
/**
|
||||
* 更新租户状态
|
||||
* @param params
|
||||
*/
|
||||
export const updateUserTenantStatus = (params)=>{
|
||||
return defHttp.put({ url: Api.updateUserTenantStatus, params }, { joinParamsToUrl: true,isTransformResponse: false });
|
||||
}
|
||||
export const updateUserTenantStatus = (params) => {
|
||||
return defHttp.put({ url: Api.updateUserTenantStatus, params }, { joinParamsToUrl: true, isTransformResponse: false });
|
||||
};
|
||||
|
|
|
|||
|
|
@ -152,6 +152,10 @@ export const formSchema: FormSchema[] = [
|
|||
required: true,
|
||||
message: '请输入登录密码',
|
||||
},
|
||||
{
|
||||
pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
|
||||
message: '密码由8位数字、大小写字母和特殊符号组成!',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
|
|
@ -171,7 +175,7 @@ export const formSchema: FormSchema[] = [
|
|||
field: 'workNo',
|
||||
required: true,
|
||||
component: 'Input',
|
||||
dynamicRules: ({ model, schema }) => ({ ...rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true), trigger: 'blur' }),
|
||||
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
|
||||
},
|
||||
{
|
||||
label: '职务',
|
||||
|
|
@ -341,6 +345,10 @@ export const formPasswordSchema: FormSchema[] = [
|
|||
required: true,
|
||||
message: '请输入登录密码',
|
||||
},
|
||||
{
|
||||
pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
|
||||
message: '密码由8位数字、大小写字母和特殊符号组成!',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue