mirror of
https://github.com/nsnail/NetAdmin.git
synced 2025-07-04 01:28:15 +08:00
chore: 🔨 子模块更新
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
"devDependencies": {
|
||||
"cz-git": "^1.11.2",
|
||||
"commitizen": "^4.3.1",
|
||||
"prettier": "^3.6.1",
|
||||
"prettier": "^3.6.2",
|
||||
"standard-version": "^9.5.0"
|
||||
},
|
||||
"config": {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<ProjectReference Include="../NetAdmin.Cache/NetAdmin.Cache.csproj"/>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NetAdmin.ApiSkin" Condition="'$(Configuration)' == 'Debug'" Version="1.0.0"/>
|
||||
<PackageReference Include="NetAdmin.ApiSkin" Condition="'$(Configuration)' == 'Debug'" Version="1.0.1"/>
|
||||
<PackageReference Include="NetAdmin.Spectre.Console.Cli" Version="1.0.1"/>
|
||||
<PackageReference Include="prometheus-net.AspNetCore" Condition="'$(Configuration)' != 'Debug'" Version="8.2.1"/>
|
||||
</ItemGroup>
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
<Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
|
||||
<Import Project="$(SolutionDir)/build/prebuild.targets"/>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.6" Label="refs"/>
|
||||
<PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.6" Label="refs"/>
|
||||
<PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.7" Label="refs"/>
|
||||
<PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.7" Label="refs"/>
|
||||
<PackageReference Include="Gurion" Version="1.2.15" Label="refs"/>
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6"/>
|
||||
<PackageReference Include="Minio" Version="6.0.5"/>
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
<script>
|
||||
import colorTool from '@/utils/color'
|
||||
import naVersionUpdater from '@/components/na-version-updater'
|
||||
import UseTabs from '@/utils/use-tabs'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
const naVersionUpdater = defineAsyncComponent(() => import('@/components/na-version-updater'))
|
||||
import useTabs from '@/utils/use-tabs'
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
components: { naVersionUpdater },
|
||||
provide() {
|
||||
return {
|
||||
@ -121,9 +121,9 @@ export default {
|
||||
} else if (e.altKey) {
|
||||
if (e.keyCode === 81) {
|
||||
if (e.ctrlKey) {
|
||||
UseTabs.closeOther()
|
||||
useTabs.closeOther()
|
||||
} else {
|
||||
UseTabs.close()
|
||||
useTabs.close()
|
||||
}
|
||||
} else if (e.keyCode === 65) {
|
||||
document.getElementsByClassName('user-bar-btn-search')[0]?.dispatchEvent(
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
import tool from '../../utils/tool'
|
||||
import tool from '@/utils/tool'
|
||||
|
||||
export default {
|
||||
emits: [],
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
</el-table-column>
|
||||
</template>
|
||||
<script>
|
||||
import naIndicator from '@/components/na-indicator'
|
||||
export default {
|
||||
emits: [],
|
||||
props: {
|
||||
@ -18,7 +17,7 @@ export default {
|
||||
},
|
||||
mounted() {},
|
||||
created() {},
|
||||
components: { naIndicator },
|
||||
components: {},
|
||||
computed: {},
|
||||
methods: {},
|
||||
}
|
||||
|
||||
@ -16,7 +16,8 @@
|
||||
</el-table-column>
|
||||
</template>
|
||||
<script>
|
||||
import saveDialog from '@/views/sys/user/save'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
const saveDialog = defineAsyncComponent(() => import('@/views/sys/user/save'))
|
||||
|
||||
export default {
|
||||
components: { saveDialog },
|
||||
|
||||
@ -33,7 +33,8 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import naVerify from '@/components/na-verifition'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
const naVerify = defineAsyncComponent(() => import('@/components/na-verifition'))
|
||||
|
||||
export default {
|
||||
emits: [],
|
||||
|
||||
@ -35,7 +35,8 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import naVerify from '@/components/na-verifition'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
const naVerify = defineAsyncComponent(() => import('@/components/na-verifition'))
|
||||
|
||||
export default {
|
||||
emits: [],
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* Verify 验证码组件
|
||||
* @description 分发验证码使用
|
||||
* */
|
||||
import slide from './slide'
|
||||
import slide from '@/components/na-verifition/slide'
|
||||
import { computed, ref, toRefs, watchEffect } from 'vue'
|
||||
|
||||
export default {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
<script>
|
||||
import * as echarts from 'echarts'
|
||||
import t from './echarts-theme-t.js'
|
||||
import t from '@/components/sc-echarts/echarts-theme-t.js'
|
||||
const unwarp = (obj) => obj && (obj.__v_raw || obj.valueOf() || obj)
|
||||
|
||||
export default {
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Sortable from 'sortablejs'
|
||||
import sortable from 'sortablejs'
|
||||
|
||||
export default {
|
||||
emits: ['success'],
|
||||
@ -40,7 +40,7 @@ export default {
|
||||
rowDrop() {
|
||||
const _this = this
|
||||
const tbody = this.$refs.table.$el.querySelector('.el-table__body-wrapper tbody')
|
||||
Sortable.create(tbody, {
|
||||
sortable.create(tbody, {
|
||||
handle: '.move',
|
||||
animation: 200,
|
||||
ghostClass: 'ghost',
|
||||
|
||||
@ -52,7 +52,8 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import columnSet from './column'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
const columnSet = defineAsyncComponent(() => import('@/components/sc-file-export/column'))
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Sortable from 'sortablejs'
|
||||
import sortable from 'sortablejs'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
@ -75,7 +75,7 @@ export default {
|
||||
rowDrop() {
|
||||
const _this = this
|
||||
const tbody = this.$refs.table.$el.querySelector('.el-table__body-wrapper tbody')
|
||||
Sortable.create(tbody, {
|
||||
sortable.create(tbody, {
|
||||
handle: '.move',
|
||||
animation: 300,
|
||||
ghostClass: 'ghost',
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
<script>
|
||||
import config from '@/config/icon-select'
|
||||
import { error } from '../../assets/icons'
|
||||
import { error } from '@/assets/icon'
|
||||
|
||||
export default {
|
||||
computed: {
|
||||
|
||||
@ -39,11 +39,11 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Sortable from 'sortablejs'
|
||||
import sortable from 'sortablejs'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
Sortable,
|
||||
sortable,
|
||||
},
|
||||
props: {
|
||||
column: {
|
||||
@ -72,7 +72,7 @@ export default {
|
||||
rowDrop() {
|
||||
const _this = this
|
||||
const tbody = this.$refs.list.querySelector('ul')
|
||||
Sortable.create(tbody, {
|
||||
sortable.create(tbody, {
|
||||
handle: '.move',
|
||||
animation: 300,
|
||||
ghostClass: 'ghost',
|
||||
|
||||
@ -170,10 +170,13 @@
|
||||
</template>
|
||||
<script>
|
||||
import config from '@/config/table'
|
||||
import columnSetting from './column-setting'
|
||||
import scContextmenuItem from '@/components/sc-context-menu/item'
|
||||
import scContextmenu from '@/components/sc-context-menu'
|
||||
import fieldFilter from './field-filter'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
|
||||
const columnSetting = defineAsyncComponent(() => import('./column-setting'))
|
||||
const scContextmenuItem = defineAsyncComponent(() => import('@/components/sc-context-menu/item'))
|
||||
const scContextmenu = defineAsyncComponent(() => import('@/components/sc-context-menu'))
|
||||
const fieldFilter = defineAsyncComponent(() => import('./field-filter'))
|
||||
|
||||
import { h } from 'vue'
|
||||
import tool from '@/utils/tool'
|
||||
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
|
||||
<script>
|
||||
import config from '@/config/upload'
|
||||
import Sortable from 'sortablejs'
|
||||
import sortable from 'sortablejs'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
@ -170,7 +170,7 @@ export default {
|
||||
rowDrop() {
|
||||
const _this = this
|
||||
const itemBox = this.$refs.uploader.$el.querySelector('.el-upload-list')
|
||||
Sortable.create(itemBox, {
|
||||
sortable.create(itemBox, {
|
||||
handle: '.el-upload-list__item',
|
||||
animation: 200,
|
||||
ghostClass: 'ghost',
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
import API from '@/api'
|
||||
import DEFAULT_CONFIG from '@/config'
|
||||
import api from '@/api'
|
||||
import defaultConfig from '@/config'
|
||||
//文件选择器配置
|
||||
|
||||
export default {
|
||||
apiObj: API.common.upload,
|
||||
menuApiObj: API.common.file.menu,
|
||||
listApiObj: API.common.file.list,
|
||||
apiObj: api.common.upload,
|
||||
menuApiObj: api.common.file.menu,
|
||||
listApiObj: api.common.file.list,
|
||||
successCode: 200,
|
||||
maxSize: 30,
|
||||
max: 99,
|
||||
@ -43,11 +43,11 @@ export default {
|
||||
files: {
|
||||
doc: {
|
||||
icon: 'sc-icon-file-word-2-fill',
|
||||
color: DEFAULT_CONFIG.APP_SET_COLOR,
|
||||
color: defaultConfig.APP_SET_COLOR,
|
||||
},
|
||||
docx: {
|
||||
icon: 'sc-icon-file-word-2-fill',
|
||||
color: DEFAULT_CONFIG.APP_SET_COLOR,
|
||||
color: defaultConfig.APP_SET_COLOR,
|
||||
},
|
||||
xls: {
|
||||
icon: 'sc-icon-file-excel-2-fill',
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user