Compare commits

...

5 Commits

Author SHA1 Message Date
fit2bot
c822988509 feat: Update v3.9.3 2023-11-28 17:35:34 +08:00
“huailei000”
4b93cf298c perf: 限制上传logo图片的格式;优化打开文件速度 2023-11-27 18:05:56 +08:00
wangruidong
3bd0f045c8 fix: SFTP对象存储,禁用设为默认存储 2023-11-24 10:33:19 +08:00
吴小白
a75b68f713 Merge pull request #3548 from jumpserver/pr@v3.9@fix_actions_version
fix: 修正 actions version 获取错误
2023-11-17 09:42:24 +08:00
吴小白
84180c7f14 fix: 修正 actions version 获取错误 2023-11-17 08:21:57 +08:00
7 changed files with 1633 additions and 1633 deletions

View File

@@ -19,9 +19,7 @@ jobs:
id: get_version
run: |
TAG=$(basename ${GITHUB_REF})
VERSION=${TAG/v/}
echo "::set-output name=TAG::$TAG"
echo "::set-output name=VERSION::$VERSION"
- name: Create Release
id: create_release
uses: release-drafter/release-drafter@v5
@@ -43,10 +41,10 @@ jobs:
- name: Create Upload Assets
run: |
rm -rf build/*
mv lina lina-${{ steps.get_version.outputs.VERSION }}
tar -czf lina-${{ steps.get_version.outputs.VERSION }}.tar.gz lina-${{ steps.get_version.outputs.VERSION }}
echo $(md5sum lina-${{ steps.get_version.outputs.VERSION }}.tar.gz | awk '{print $1}') > build/lina-${{ steps.get_version.outputs.VERSION }}.tar.gz.md5
mv lina-${{ steps.get_version.outputs.VERSION }}.tar.gz build/
mv lina lina-${{ steps.get_version.outputs.TAG }}
tar -czf lina-${{ steps.get_version.outputs.TAG }}.tar.gz lina-${{ steps.get_version.outputs.TAG }}
echo $(md5sum lina-${{ steps.get_version.outputs.TAG }}.tar.gz | awk '{print $1}') > build/lina-${{ steps.get_version.outputs.TAG }}.tar.gz.md5
mv lina-${{ steps.get_version.outputs.TAG }}.tar.gz build/
- name: Release Upload Assets
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')

1
GITSHA Normal file
View File

@@ -0,0 +1 @@
4b93cf298ceb337dd3082cf408c1b70c6e0d79b9

View File

@@ -81,7 +81,7 @@ export default {
},
{
label: this.$t('common.Version'),
value: 'version-dev'
value: 'v3.9.3'
},
{
label: this.$t('common.PermissionCompany'),

View File

@@ -108,7 +108,7 @@ export default {
el: {
width: '10%',
height: '10%',
accept: 'image/*',
accept: 'image/jpg, image/png, image/jpeg',
tip: this.$t('xpack.loginImageTip')
},
on: {
@@ -123,7 +123,7 @@ export default {
el: {
width: '5%',
height: '5%',
accept: 'image/*',
accept: 'image/jpg, image/png, image/jpeg',
tip: this.$t('xpack.faviconTip')
},
on: {
@@ -138,7 +138,7 @@ export default {
el: {
width: '10%',
height: '10%',
accept: 'image/*',
accept: 'image/jpg, image/png, image/jpeg',
tip: this.$t('xpack.logoIndexTip')
},
on: {
@@ -153,7 +153,7 @@ export default {
el: {
width: '5%',
height: '5%',
accept: 'image/*',
accept: 'image/jpg, image/png, image/jpeg',
tip: this.$t('xpack.logoLogoutTip')
},
on: {

View File

@@ -91,7 +91,7 @@ export default {
{
name: 'set_to_default',
title: this.$t('sessions.SetToDefault'),
can: this.$hasPerm('terminal.change_replaystorage'),
can: (value) => this.$hasPerm('terminal.change_replaystorage') && value.row.type.value !== 'sftp',
type: 'primary',
callback: function({ row, col, cellValue, reload }) {
SetToDefaultReplayStorage(row.id).then(data => {

View File

@@ -63,7 +63,8 @@ export default {
}
},
is_default: {
helpText: this.$t('sessions.SetToDefaultStorage')
helpText: this.$t('sessions.SetToDefaultStorage'),
hidden: (formValue) => formValue.type === 'sftp'
}
},
cleanFormValue(values) {

3240
yarn.lock

File diff suppressed because it is too large Load Diff