功能变化: 优化组件

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 {

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 = {
+        if (this.elProps.isInitRows) {
-          _id: this.value?.length || 0
+          const fields = {
-        }
+            _id: this.value?.length || 0
-        for (const key in this.elProps.fields) {
+          }
-          fields[key] = this.elProps.fields[key].default || null
+          for (const key in this.elProps.fields) {
-        }
+            fields[key] = this.elProps.fields[key].default || null
-        this.$emit('change', [fields])
+          }
-        this.$emit('input', [fields])
+          this.$emit('change', [fields])
-        return {
+          this.$emit('input', [fields])
-          data: [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)

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

web/src/components/values-popover/values-popover.vue

@@ -26,6 +26,16 @@
         }} {{ elProps.unit }}</span>
       </el-button>
     </div>
+    <div v-if="elProps.type === 'strList'">
+      <el-descriptions class="margin-top" :column="1" size="mini" border>
+        <el-descriptions-item v-for="(item,index) in value" :key="index" labelStyle="width: 60px;">
+          <template slot="label">
+            选项{{ index + 1 }}
+          </template>
+          {{ item[dict.label] }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
     <div v-else-if="elProps.type === 'ueditor'">
       <el-popover
         placement="right"
@@ -122,7 +132,6 @@ export default {
         params[this.dict.value] = this.value
       }
       params.query = `{${this.dict.value},${this.dict.label}}`
-      console.log(12, params)
       request({ url: this.dict.url, params: params }).then(ret => {
         this.data = ret.data.data || ret.data
       })

web/src/router/routes.js

@@ -70,12 +70,23 @@ const frameOut = [
 /**
  * 第三方登录
  */
-const pluginsType = checkPlugins('dvadmin-oauth2-web')
+const oauth2PluginsType = checkPlugins('dvadmin-oauth2-web')
-if (pluginsType) {
+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')
   })
 }
 /**

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;

web/src/views/system/login/page.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="w3l-signinform"
-    :style="{background:'url(' +(loginBackground || require('./image/bg.jpg')) +') no-repeat center', backgroundSize: '100% 100%' }"
+    :style="{background:'url(' +(loginBackground || require('@/assets/image/bg.jpg')) +') no-repeat center', backgroundSize: '100% 100%' }"
   >
     <!-- container -->
     <div class="wrapper">