diff --git a/web/src/views/system/login/image/bg.jpg b/web/src/assets/image/bg.jpg similarity index 100% rename from web/src/views/system/login/image/bg.jpg rename to web/src/assets/image/bg.jpg diff --git a/web/src/assets/image/dvadmin-black.png b/web/src/assets/image/dvadmin-black.png new file mode 100644 index 0000000..cda13f5 Binary files /dev/null and b/web/src/assets/image/dvadmin-black.png differ diff --git a/web/src/assets/image/dvadmin.png b/web/src/assets/image/dvadmin.png new file mode 100644 index 0000000..bd1fa92 Binary files /dev/null and b/web/src/assets/image/dvadmin.png differ diff --git a/web/src/components/file-uploader/lib/file-uploader.vue b/web/src/components/file-uploader/lib/file-uploader.vue index 7a0c5ca..24ca4a6 100644 --- a/web/src/components/file-uploader/lib/file-uploader.vue +++ b/web/src/components/file-uploader/lib/file-uploader.vue @@ -310,7 +310,9 @@ export default { // log.debug('当前文件上传完成,等待剩下的文件全部上传成功后再更新value') // return // } - item.url = this.baseURL + url + if (item.url.indexOf('http') !== 0 && item.url.indexOf('https') !== 0 && item.url.indexOf(this.baseURL) !== 0) { + item.url = this.baseURL + item.url + } if (item.response != null && item.response.url != null) { list.push({ ...item.response }) } else { diff --git a/web/src/components/foreign-key-crud-form/foreign-key-crud-form.vue b/web/src/components/foreign-key-crud-form/foreign-key-crud-form.vue index 264aa5a..1c3d370 100644 --- a/web/src/components/foreign-key-crud-form/foreign-key-crud-form.vue +++ b/web/src/components/foreign-key-crud-form/foreign-key-crud-form.vue @@ -65,6 +65,7 @@ export default { type: Object, default () { return { + isInitRows: true, // 是否初始化一行 index: { name: '序号', span: 2 @@ -135,18 +136,23 @@ export default { return res }, currentForm () { - console.log(1212, this.value) if (!this.value || !this.value[0]) { - const fields = { - _id: this.value?.length || 0 - } - for (const key in this.elProps.fields) { - fields[key] = this.elProps.fields[key].default || null - } - this.$emit('change', [fields]) - this.$emit('input', [fields]) - return { - data: [fields] + if (this.elProps.isInitRows) { + const fields = { + _id: this.value?.length || 0 + } + for (const key in this.elProps.fields) { + fields[key] = this.elProps.fields[key].default || null + } + this.$emit('change', [fields]) + this.$emit('input', [fields]) + return { + data: [fields] + } + } else { + return { + data: [] + } } } return { @@ -185,12 +191,12 @@ export default { // 新增 addDomain () { const fields = { - _id: this.value.length + _id: this.value?.length || 0 } for (const key in this.elProps.fields) { fields[key] = this.elProps.fields[key].default || null } - console.log(12121212, this.currentForm.data, fields) + fields.sort = (this.value?.length || 0) + 1 this.currentForm.data.push(fields) this.$emit('change', this.currentForm.data) this.$emit('input', this.currentForm.data) diff --git a/web/src/components/selector-table/selector-table.vue b/web/src/components/selector-table/selector-table.vue index aa2c731..5a6287c 100644 --- a/web/src/components/selector-table/selector-table.vue +++ b/web/src/components/selector-table/selector-table.vue @@ -217,7 +217,7 @@ export default { params.page = this.pageConfig.page params.limit = this.pageConfig.limit } - if (val.toString().length > 0) { + if (val && val.toString().length > 0) { // 在这里对 传入的value值做处理 const { url, value, label } = this.dict params[value] = val diff --git a/web/src/components/values-popover/values-popover.vue b/web/src/components/values-popover/values-popover.vue index 78b7bef..0d8de37 100644 --- a/web/src/components/values-popover/values-popover.vue +++ b/web/src/components/values-popover/values-popover.vue @@ -26,6 +26,16 @@ }} {{ elProps.unit }} +
+ + + + {{ item[dict.label] }} + + +
{ this.data = ret.data.data || ret.data }) diff --git a/web/src/router/routes.js b/web/src/router/routes.js index 7e03791..83ef3eb 100644 --- a/web/src/router/routes.js +++ b/web/src/router/routes.js @@ -70,12 +70,23 @@ const frameOut = [ /** * 第三方登录 */ -const pluginsType = checkPlugins('dvadmin-oauth2-web') -if (pluginsType) { +const oauth2PluginsType = checkPlugins('dvadmin-oauth2-web') +if (oauth2PluginsType) { frameOut.push({ path: '/oauth2', name: 'login', - component: pluginsType === 'local' ? _import('plugins/dvadmin-oauth2-web/src/login/index') : pluginImport('dvadmin-oauth2-web/src/login/index') + component: oauth2PluginsType === 'local' ? _import('plugins/dvadmin-oauth2-web/src/login/index') : pluginImport('dvadmin-oauth2-web/src/login/index') + }) +} +/** + * 租户申请注册 + */ +const tenantsPluginsType = checkPlugins('dvadmin-tenants-web') +if (tenantsPluginsType) { + frameOut.push({ + path: '/register', + name: 'tenantsRegister', + component: tenantsPluginsType === 'local' ? _import('plugins/dvadmin-tenants-web/src/register/index') : pluginImport('dvadmin-tenants-web/src/register/index') }) } /** diff --git a/web/src/views/system/login/base.vue b/web/src/views/system/login/base.vue index 792a5b1..25bdc49 100644 --- a/web/src/views/system/login/base.vue +++ b/web/src/views/system/login/base.vue @@ -60,11 +60,11 @@ export default { }, computed: { ...mapState('d2admin', { - siteLogo: state => state.settings.data['login.site_logo'] || require('./image/dvadmin.png'), // 网站logo地址 + siteLogo: state => state.settings.data['login.site_logo'] || require('@/assets/image/dvadmin.png'), // 网站logo地址 keepRecord: state => state.settings.data['login.keep_record'], siteName: state => state.settings.data['login.site_name'], // 网站名称 copyright: state => state.settings.data['login.copyright'], - loginBackground: state => state.settings.data['login.login_background'] || require('./image/bg.jpg'), // 登录页背景图 + loginBackground: state => state.settings.data['login.login_background'] || require('@/assets/image/bg.jpg'), // 登录页背景图 helpUrl: state => state.settings.data['login.help_url'], // 帮助 privacyUrl: state => state.settings.data['login.privacy_url'], // 隐私 clauseUrl: state => state.settings.data['login.clause_url'], // 条款 @@ -145,7 +145,6 @@ export default { left: 0; height: 100%; width: 100%; - background-image: url(./image/bg.jpg); background-position: center 0; background-repeat: no-repeat; background-attachment: fixed; diff --git a/web/src/views/system/login/image/dvadmin.png b/web/src/views/system/login/image/dvadmin.png deleted file mode 100644 index 5d37786..0000000 Binary files a/web/src/views/system/login/image/dvadmin.png and /dev/null differ diff --git a/web/src/views/system/login/page.vue b/web/src/views/system/login/page.vue index deb8294..eb859b9 100644 --- a/web/src/views/system/login/page.vue +++ b/web/src/views/system/login/page.vue @@ -1,7 +1,7 @@