xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2026-03-05 06:54:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v3.30.0 【增加】字典项增加回显样式;【优化】文件S3协议对最新minio的支持;

Browse Source
This commit is contained in:
zhuoda
2026-03-01 21:34:21 +08:00
parent 36de38fda3
commit 2c661120ca
132 changed files with 975 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
View File

@@ -118,7 +118,7 @@
{{ text }}
</template>
<template v-if="column.dataIndex === 'place'">
<DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
<DictLabel :show-style="true" :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
</template>
<template v-if="column.dataIndex === 'remark'">
<span>{{ text ? text : '' }}</span>
@@ -200,7 +200,7 @@
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
import _ from 'lodash';
import SmartHeaderCell from '/@/components/support/table-header-cell/index.vue';
import { DICT_CODE_ENUM } from '/@/constants/support/dict-const.js';
import { DICT_CODE_ENUM } from '/@/constants/support/dict-const';
import DictLabel from '/@/components/support/dict-label/index.vue';
// ---------------------------- 表格列 ----------------------------

2
smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
View File

@@ -92,7 +92,7 @@
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
import { defaultTimeRanges } from '/@/lib/default-time-ranges.js';
import { defaultTimeRanges } from '/@/lib/default-time-ranges';
const props = defineProps({
enterpriseId: {

3
smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
View File

@@ -183,6 +183,7 @@
let removePrefixTableName = tableInfo.tableName;
if (_.startsWith(tableInfo.tableName, tablePrefix.value)) {
removePrefixTableName = _.trimStart(removePrefixTableName, tablePrefix.value);
removePrefixTableName = removePrefixTableName.slice(tablePrefix.value.length);
}
formData.moduleName = basic && basic.moduleName ? basic.moduleName : removePrefixTableName;
formData.moduleName = convertUpperCamel(formData.moduleName);
@@ -205,7 +206,7 @@
function onChangeTablePrefix(e) {
let removePrefixTableName = tableInfo.tableName;
if (_.startsWith(tableInfo.tableName, tablePrefix.value)) {
removePrefixTableName = _.trim(removePrefixTableName, tablePrefix.value);
removePrefixTableName = tableInfo.tableName.slice(tablePrefix.value.length);
}
formData.moduleName = convertUpperCamel(removePrefixTableName);
}

2
smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
View File

@@ -84,7 +84,7 @@
import DictCodeSelect from '/@/components/support/dict-code-select/index.vue';
import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
import _ from 'lodash';
import { useDictStore } from '/@/store/modules/system/dict.js';
import { useDictStore } from '/@/store/modules/system/dict';
const dictRef = ref();
function refreshDict() {

2
smart-admin-web-javascript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
View File

@@ -42,7 +42,7 @@
import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST } from '../../code-generator-util';
import { smartSentry } from '/@/lib/smart-sentry';
import { lineNumbersBlock } from '/@/lib/highlight-line-number';
import hljs from 'highlight.js';
import hljs from 'highlight';
import 'highlight.js/styles/github-dark.css';
import javascript from 'highlight.js/lib/languages/javascript';
import typescript from 'highlight.js/lib/languages/typescript';

16
smart-admin-web-javascript/src/views/support/dict/components/dict-data-form-modal.vue
View File

@@ -17,6 +17,15 @@
<a-form-item label="字典项值" name="dataValue">
<a-input v-model:value="form.dataValue" placeholder="请输入 字典项值" />
</a-form-item>
<a-form-item label="显示样式">
<a-select ref="dataStyleSelect" v-model:value="form.dataStyle" :allowClear="true">
<template v-for="item in DICT_DATA_STYLE_ENUM" :key="item.value">
<a-select-option :value="item.value">
<div :style="{ color: token[item.color] }">{{ item.desc }}({{ item.value }})</div>
</a-select-option>
</template>
</a-select>
</a-form-item>
<a-form-item label="排序" name="sort" help="值越大越靠前">
<a-input-number style="width: 100%" v-model:value="form.sortOrder" :min="0" :max="1000" />
</a-form-item>
@@ -28,10 +37,14 @@
</template>
<script setup>
import { ref, reactive } from 'vue';
import { message } from 'ant-design-vue';
import { message, theme } from 'ant-design-vue';
import { SmartLoading } from '/@/components/framework/smart-loading';
import { dictApi } from '/@/api/support/dict-api';
import { smartSentry } from '/@/lib/smart-sentry';
import { DICT_DATA_STYLE_ENUM } from '/@/constants/support/dict-const';
const { useToken } = theme;
const { token } = useToken();
// emit
const emit = defineEmits(['reloadList']);
@@ -46,6 +59,7 @@
sortOrder: 0,
dataValue: '',
dataLabel: '',
dataStyle: '',
remark: '',
};
let form = reactive({ ...formDefault });

21
smart-admin-web-javascript/src/views/support/file/file-list.vue
View File

@@ -145,11 +145,12 @@
title: '文件夹',
dataIndex: 'folderType',
ellipsis: true,
width: 100,
width: 70,
},
{
title: '文件名称',
dataIndex: 'fileName',
ellipsis: true,
width: 200,
},
{
@@ -164,24 +165,18 @@
ellipsis: true,
width: 80,
},
{
title: '上传人',
dataIndex: 'creatorName',
ellipsis: true,
width: 100,
},
{
title: '人类型',
dataIndex: 'creatorUserType',
ellipsis: true,
width: 100,
},
{
title: '上传时间',
dataIndex: 'createTime',
ellipsis: true,
width: 150,
},
{
title: '文件Key',
dataIndex: 'fileKey',
ellipsis: true,
width: 100,
},
{
title: '操作',
dataIndex: 'action',

2
smart-admin-web-javascript/src/views/support/job/components/deleted-job-list.vue
View File

@@ -130,7 +130,7 @@
import { jobApi } from '/@/api/support/job-api';
import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
import { smartSentry } from '/@/lib/smart-sentry';
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const';
import JobLogListModal from './job-log-list-modal.vue';
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const.js";
import TableOperator from "/@/components/support/table-operator/index.vue";

4
smart-admin-web-javascript/src/views/support/job/components/job-form-modal.vue
View File

@@ -120,8 +120,8 @@ import { message } from 'ant-design-vue';
import { reactive, ref } from 'vue';
import { jobApi } from '/@/api/support/job-api';
import { smartSentry } from '/@/lib/smart-sentry';
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
import { SmartLoading } from '/@/components/framework/smart-loading/index';
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const';
// emit
const emit = defineEmits(['reloadList']);

2
smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue
View File

@@ -94,7 +94,7 @@
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
import { defaultTimeRanges } from '/@/lib/default-time-ranges.js';
import { defaultTimeRanges } from '/@/lib/default-time-ranges';
const showFlag = ref(false);
const title = ref('');

4
smart-admin-web-javascript/src/views/support/job/job-list.vue
View File

@@ -160,10 +160,10 @@
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
import DeletedJobList from './components/deleted-job-list.vue';
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const';
import JobFormModal from './components/job-form-modal.vue';
import JobLogListModal from './components/job-log-list-modal.vue';
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
import { SmartLoading } from '/@/components/framework/smart-loading/index';
const activeKey = ref('1');
const columns = ref([
{

2
smart-admin-web-javascript/src/views/support/level3protect/data-masking-list.vue
View File

@@ -62,7 +62,7 @@
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
import { dataMaskingApi } from '/@/api/support/data-masking-api.js';
import { dataMaskingApi } from '/@/api/support/data-masking-api';
//------------------------ 表格渲染 ---------------------

6
smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue
View File

@@ -117,9 +117,9 @@
</template>
<script setup>
import { onMounted, reactive, ref } from 'vue';
import { level3ProtectApi } from '/@/api/support/level3-protect-api.js';
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
import { smartSentry } from '/@/lib/smart-sentry.js';
import { level3ProtectApi } from '/@/api/support/level3-protect-api';
import { SmartLoading } from '/@/components/framework/smart-loading/index';
import { smartSentry } from '/@/lib/smart-sentry';
import { message, Modal } from 'ant-design-vue';
// 三级等保的默认值

2
smart-admin-web-javascript/src/views/support/message/message-list.vue
View File

@@ -96,7 +96,7 @@
import TableOperator from '/@/components/support/table-operator/index.vue';
import MessageSendForm from './components/message-send-form.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
import { defaultTimeRanges } from '/@/lib/default-time-ranges.js';
import { defaultTimeRanges } from '/@/lib/default-time-ranges';
// ---------------------------- 表格列 ----------------------------
const columns = ref([

14
smart-admin-web-javascript/src/views/system/account/components/center/index.vue
View File

@@ -76,18 +76,18 @@
</template>
<script setup>
import { onMounted, reactive, ref } from 'vue';
import { regular } from '/@/constants/regular-const.js';
import { regular } from '/@/constants/regular-const';
import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
import PositionSelect from '/@/components/system/position-select/index.vue';
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
import { loginApi } from '/@/api/system/login-api.js';
import { useUserStore } from '/@/store/modules/system/user.js';
import { loginApi } from '/@/api/system/login-api';
import { useUserStore } from '/@/store/modules/system/user';
import { message } from 'ant-design-vue';
import { smartSentry } from '/@/lib/smart-sentry.js';
import { smartSentry } from '/@/lib/smart-sentry';
import { employeeApi } from '/@/api/system/employee-api';
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
import { fileApi } from '/@/api/support/file-api.js';
import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const.js';
import { SmartLoading } from '/@/components/framework/smart-loading/index';
import { fileApi } from '/@/api/support/file-api';
import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
// 组件ref
const formRef = ref();

4
smart-admin-web-javascript/src/views/system/account/components/message/components/message-detail.vue
View File

@@ -14,8 +14,8 @@
</template>
<script setup>
import { reactive, ref } from 'vue';
import { messageApi } from '/@/api/support/message-api.js';
import { useUserStore } from '/@/store/modules/system/user.js';
import { messageApi } from '/@/api/support/message-api';
import { useUserStore } from '/@/store/modules/system/user';
const emit = defineEmits(['refresh']);

2
smart-admin-web-javascript/src/views/system/account/components/message/index.vue
View File

@@ -86,7 +86,7 @@
import { messageApi } from '/@/api/support/message-api';
import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
import SmartEnumSelect from '/@/components/framework/smart-enum-select//index.vue';
import { smartSentry } from '/@/lib/smart-sentry.js';
import { smartSentry } from '/@/lib/smart-sentry';
import MessageDetail from './components/message-detail.vue';
const columns = reactive([

6
smart-admin-web-javascript/src/views/system/account/components/password/index.vue
View File

@@ -20,9 +20,9 @@
<script setup>
import { computed, onMounted, reactive, ref } from 'vue';
import { message } from 'ant-design-vue';
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
import { employeeApi } from '/@/api/system/employee-api.js';
import { smartSentry } from '/@/lib/smart-sentry.js';
import { SmartLoading } from '/@/components/framework/smart-loading/index';
import { employeeApi } from '/@/api/system/employee-api';
import { smartSentry } from '/@/lib/smart-sentry';
const emits = defineEmits(['onSuccess']);

4
smart-admin-web-javascript/src/views/system/account/index.vue
View File

@@ -21,9 +21,9 @@
<script setup>
import { computed, onMounted, ref, watch } from 'vue';
import _ from 'lodash';
import { ACCOUNT_MENU } from '/@/views/system/account/account-menu.js';
import { ACCOUNT_MENU } from '/@/views/system/account/account-menu';
import { useRoute } from 'vue-router';
import { useUserStore } from '/@/store/modules/system/user.js';
import { useUserStore } from '/@/store/modules/system/user';
import { theme as antDesignTheme } from 'ant-design-vue';
// 菜单展示

2
smart-admin-web-javascript/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
View File

@@ -43,7 +43,7 @@
import ToBeDoneModal from './to-be-done-modal.vue';
import localKey from '/@/constants/local-storage-key-const';
import { localRead, localSave } from '/@/utils/local-util';
import { useUserStore } from '/@/store/modules/system/user.js';
import { useUserStore } from '/@/store/modules/system/user';
import { computed, ref, onMounted } from 'vue';
import { Modal } from 'ant-design-vue';

10
smart-admin-web-javascript/src/views/system/login/login.less
View File

@@ -7,7 +7,7 @@
align-items: center;
justify-content: center;
.box-item {
width: 444px;
width: 464px;
height: 600px;
&.desc {
background: #003b94;
@@ -108,7 +108,7 @@
transform: translateX(0);
}
100% {
transform: translateX(-30%);
transform: translateX(-5%);
}
}
@@ -119,7 +119,7 @@
display: inline-block;
width: 100%;
white-space: nowrap;
animation: marquee 5s linear infinite;
animation: marquee 3s linear infinite;
}
}
}
@@ -151,7 +151,7 @@
.code-btn{
height: 44px;
padding: 4px 5px;
width: 108px;
width: 100%;
}
.eye-box {
@@ -165,7 +165,7 @@
}
}
.btn {
width: 350px;
width: 100%;
height: 50px;
background: #1748FD;
border-radius: 4px;

43
smart-admin-web-javascript/src/views/system/login/login.vue
View File

@@ -46,7 +46,8 @@
<img :src="gzh" />
<div class="qr-desc-marquee">
<div class="marquee">
<span>关注：六边形工程师，分享：赚钱、代码、生活</span>
<span>关注：六边形工程师</span>
<span>分享：AI、赚钱、代码、健康</span>
</div>
</div>
</div>
@@ -68,24 +69,33 @@
</a-input-group>
</a-form-item>
<a-form-item name="password">
<a-input-password
v-model:value="loginForm.password"
autocomplete="on"
:type="showPassword ? 'text' : 'password'"
placeholder="请输入密码"
/>
<a-popover placement="top">
<template #content>
<a-flex :vertical="true" justify="center" align="center">
<img :src="gzh" />
<a-typography-text type="danger">扫码关注：【六边形工程师】</a-typography-text>
<a-typography-text type="danger">完成问卷调查，获取登录密码</a-typography-text>
</a-flex>
</template>
<a-input-password
v-model:value="loginForm.password"
autocomplete="on"
:type="showPassword ? 'text' : 'password'"
placeholder="请输入密码"
/>
</a-popover>
</a-form-item>
<a-form-item name="captchaCode">
<a-input class="captcha-input" v-model:value.trim="loginForm.captchaCode" placeholder="请输入验证码" />
<img class="captcha-img" :src="captchaBase64Image" @click="getCaptcha" />
</a-form-item>
<a-form-item>
<a-checkbox v-model:checked="rememberPwd">记住密码</a-checkbox>
<span> ( 账号：admin, 密码：123456)</span>
</a-form-item>
<a-form-item>
<div class="btn" @click="onLogin">登录</div>
</a-form-item>
<a-form-item>
<span> 账号：admin, 关注【六边形工程师】，参与问卷，获取密码</span>
</a-form-item>
</a-form>
<div class="more">
<div class="title-box">
@@ -129,10 +139,10 @@
import { smartSentry } from '/@/lib/smart-sentry';
import { encryptData } from '/@/lib/encrypt';
import { h } from 'vue';
import { localSave } from '/@/utils/local-util.js';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
import { useDictStore } from '/@/store/modules/system/dict.js';
import {dictApi} from "/@/api/support/dict-api.js";
import { localSave } from '/@/utils/local-util';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const';
import { useDictStore } from '/@/store/modules/system/dict';
import { dictApi } from '/@/api/support/dict-api';
//--------------------- 登录表单 ---------------------------------
@@ -221,6 +231,7 @@
//--------------------- 验证码 ---------------------------------
const captchaBase64Image = ref('');
async function getCaptcha() {
try {
let captchaResult = await loginApi.getCaptcha();
@@ -233,6 +244,7 @@
}
let refreshCaptchaInterval = null;
function beginRefreshCaptchaInterval(expireSeconds) {
if (refreshCaptchaInterval === null) {
refreshCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
@@ -258,6 +270,7 @@
let emailCodeButtonDisabled = ref(false);
// 定时器
let countDownTimer = null;
// 开始倒计时
function runCountDown() {
emailCodeButtonDisabled.value = true;

8
smart-admin-web-javascript/src/views/system/login2/login.vue
View File

@@ -90,10 +90,10 @@
import { buildRoutes } from '/@/router/index';
import { smartSentry } from '/@/lib/smart-sentry';
import { encryptData } from '/@/lib/encrypt';
import { localSave } from '/@/utils/local-util.js';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
import { useDictStore } from '/@/store/modules/system/dict.js';
import { dictApi } from '/@/api/support/dict-api.js';
import { localSave } from '/@/utils/local-util';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const';
import { useDictStore } from '/@/store/modules/system/dict';
import { dictApi } from '/@/api/support/dict-api';
//--------------------- 登录表单 ---------------------------------

8
smart-admin-web-javascript/src/views/system/login3/login.vue
View File

@@ -92,10 +92,10 @@
import { buildRoutes } from '/@/router/index';
import { smartSentry } from '/@/lib/smart-sentry';
import { encryptData } from '/@/lib/encrypt';
import { localSave } from '/@/utils/local-util.js';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
import { useDictStore } from '/@/store/modules/system/dict.js';
import { dictApi } from '/@/api/support/dict-api.js';
import { localSave } from '/@/utils/local-util';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const';
import { useDictStore } from '/@/store/modules/system/dict';
import { dictApi } from '/@/api/support/dict-api';
//--------------------- 登录表单 ---------------------------------