Merge remote-tracking branch 'origin/optimize' into optimize

2 years ago · fb80350de2
parent 0201dcbdf1 58f2a0872c
commit fb80350de2
13 changed files with 76 additions and 95 deletions
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@ -1,6 +1,6 @@
 {
  "name": "@gcpaas/data-room-ui",
-  "version": "0.0.1-2023070303-Alpha",
+  "version": "0.0.1-2023070401-Alpha",
  "description": "自定义大屏",
  "author": "gc-starter",
  "license": "MIT",
--- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue
@ -51,7 +51,6 @@ export default {
  methods: {
    // 表格点击事件
    rowClick (row) {
-      console.log('点击')
      this.linkage(row)
    },
    dataFormatting (config, data) {
--- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue
@ -52,7 +52,6 @@ export default {
  methods: {
    // 点击事件
    rowClick (row) {
-      console.log(row)
      this.linkage(row)
    },
    dataFormatting (config, data) {
--- a/data-room-ui/packages/BigScreenComponentMag/index.js
+++ b/data-room-ui/packages/BigScreenComponentMag/index.js
@ -1,7 +1,7 @@
-import BigScreenManagement from './index.vue'
+import BigScreenComponentMag from './index.vue'

-BigScreenManagement.install = function (Vue) {
-  Vue.component(BigScreenManagement.name, BigScreenManagement)
+BigScreenComponentMag.install = function (Vue) {
+  Vue.component(BigScreenComponentMag.name, BigScreenComponentMag)
 }

-export default BigScreenManagement
+export default BigScreenComponentMag
--- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
@ -468,8 +468,9 @@ export default {
  .big-screen-list-wrap {
    position: relative;
    height: 100%;
-    margin:0 16px;
-    padding: 16px;
+    // margin:0 16px;
+    // padding: 16px;
+    margin-bottom: 56px;
    color: #9ea9b2;
    background-color: var(--bs-background-2) !important;

@ -637,14 +638,9 @@ export default {
    }

    .footer-pagination-wrap {
+      margin-top: 16px;
      position: absolute;
-      // display: flex;
-      // align-items: center;
-      // justify-content: flex-end;
      width: 100%;
-      bottom: 16px;
-      right: 12px;
-      // padding: 0 16px;
    }
  }
  .bs-pagination {
--- a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
@ -218,8 +218,8 @@ export default {
 .big-screen-list-wrap {
  position: relative;
  height: 100%;
-  margin:0 16px;
-  padding: 16px;
+  // margin:0 16px;
+  // padding: 16px;
  color: #9ea9b2;
  background-color: var(--bs-background-2) !important;

@ -389,15 +389,9 @@ export default {
  }

  .footer-pagination-wrap {
-    // display: flex;
-    // align-items: center;
-    // justify-content: flex-end;
    width: 100%;
-    // margin-top: 16px;
-    // padding: 0 16px;
    position: absolute;
-    bottom: 16px;
-    right: 12px;
+    margin-top: 16px;
  }
 }
 .bs-pagination {
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@ -1258,7 +1258,6 @@ export default {
        }
        this.saveLoading = false
      }).catch((e) => {
-        console.log('测试失败', e)
        this.passTest = false
        this.saveLoading = false
      })
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@ -967,7 +967,6 @@ export default {
        }
        this.saveLoading = false
      }).catch((e) => {
-        console.log('测试失败', e)
        this.passTest = false
        this.saveLoading = false
      })
--- a/data-room-ui/packages/DataSourceManagement/src/index.vue
+++ b/data-room-ui/packages/DataSourceManagement/src/index.vue
@ -4,7 +4,7 @@
    <div class="inner-container">
      <el-form
        :inline="true"
-        class="filter-container bs-el-form"
+        class="filter-container"
      >
        <el-form-item class="filter-input filter-item">
          <el-input
@ -171,8 +171,8 @@ export default {
        sourceName: '',
        sourceType: ''
      },
-      size: 10, // 初始pagesize
-      current: 1, // 初始currentpage
+      size: 10,
+      current: 1,
      curRow: null
    }
  },
@ -280,7 +280,7 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '../../assets/style/bsTheme.scss';
+@import '~packages/assets/style/bsTheme.scss';

 .bs-pagination {
  ::v-deep .el-input__inner {
--- a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
+++ b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
@ -20,7 +20,6 @@
        size="small"
        label-position="right"
        :label-width="dataForm.advanceSettingFlag ? '200px' : '150px'"
-        class="bs-el-form"
      >
        <el-form-item
          label="类型"
@ -209,7 +208,7 @@
 </template>

 <script>
-import { checkRepeat, sourceLinkTest, addOrUpdateDataSource } from 'packages/js/utils/dataSourceService'
+import { checkRepeat, sourceLinkTest, add, update } from 'packages/js/utils/dataSourceService'
 export default {
  props: {
    appCode: {
@ -245,21 +244,7 @@ export default {
        driverClassName: 'com.mysql.jdbc.Driver',
        username: '',
        password: '',
-        coding: '自动',
        url: 'jdbc:mysql://localhost:3306/db_name?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&useOldAliasMetadataBehavior=true',
-        advanceSettingFlag: 0,
-        initConnNum: 0,
-        maxActiveConnNum: 0,
-        maxIdleConnNum: 0,
-        minIdleConnNum: 0,
-        maxWaitConnNum: 0,
-        sqlCheck: '',
-        getconnCheckFlag: 0,
-        returnCheckFlag: 0,
-        startIdleCheckFlag: 0,
-        idleConnDormantTime: 0,
-        idleConnCheckNum: 0,
-        keepIdleMinTime: 0,
        remark: ''
      },
      rules: {
@ -366,7 +351,7 @@ export default {
        moduleCode: this.appCode
      }).then(r => {
        if (r) {
-          callback(new Error(r))
+          callback(new Error('数据源名称已存在'))
        } else {
          callback()
        }
@ -435,21 +420,7 @@ export default {
        driverClassName: 'com.mysql.jdbc.Driver',
        username: '',
        password: '',
-        coding: '自动',
        url: 'jdbc:mysql://localhost:3306/db_name?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&useOldAliasMetadataBehavior=true',
-        advanceSettingFlag: 0,
-        initConnNum: 0,
-        maxActiveConnNum: 0,
-        maxIdleConnNum: 0,
-        minIdleConnNum: 0,
-        maxWaitConnNum: 0,
-        sqlCheck: '',
-        getconnCheckFlag: 0,
-        returnCheckFlag: 0,
-        startIdleCheckFlag: 0,
-        idleConnDormantTime: 0,
-        idleConnCheckNum: 0,
-        keepIdleMinTime: 0,
        remark: ''
      }
      this.setDatasourceVisible = false
@ -468,16 +439,29 @@ export default {
      // }
      this.$refs.dataForm.validate((valid) => {
        if (valid) {
-          addOrUpdateDataSource({
-            ...this.dataForm,
-            moduleCode: this.appCode,
-            editable: this.appCode ? 1 : 0
-          }).then(() => {
-            this.$message.success('保存成功')
-            // 刷新表格
-            this.$emit('refreshTable')
-            this.handleClose()
-          })
+          if (this.dataForm.id) {
+            update({
+              ...this.dataForm,
+              moduleCode: this.appCode,
+              editable: this.appCode ? 1 : 0
+            }).then(() => {
+              this.$message.success('保存成功')
+              // 刷新表格
+              this.$emit('refreshTable')
+              this.handleClose()
+            })
+          } else {
+            add({
+              ...this.dataForm,
+              moduleCode: this.appCode,
+              editable: this.appCode ? 1 : 0
+            }).then(() => {
+              this.$message.success('保存成功')
+              // 刷新表格
+              this.$emit('refreshTable')
+              this.handleClose()
+            })
+          }
        } else {
          return false
        }
@ -488,5 +472,5 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '../../assets/style/bsTheme.scss';
+@import '~packages/assets/style/bsTheme.scss';
 </style>
--- a/data-room-ui/packages/SourceMag/index.js
+++ b/data-room-ui/packages/SourceMag/index.js
@ -1,7 +1,7 @@
-import BigScreenManagement from './index.vue'
+import BgiScreenSourceMag from './index.vue'

-BigScreenManagement.install = function (Vue) {
-  Vue.component(BigScreenManagement.name, BigScreenManagement)
+BgiScreenSourceMag.install = function (Vue) {
+  Vue.component(BgiScreenSourceMag.name, BgiScreenSourceMag)
 }

-export default BigScreenManagement
+export default BgiScreenSourceMag
--- a/data-room-ui/packages/index.js
+++ b/data-room-ui/packages/index.js
@ -1,17 +1,7 @@
+
+// 大屏列表管理页面
 import 'packages/assets/style/common/index.scss'
 import 'packages/assets/style/bsTheme.scss'
-// 大屏管理页面
-import BigScreenManagement from 'packages/BigScreenMag'
-// 渲染整个bigScreen的渲染引擎
-import BigScreenRun from 'packages/BigScreenRun'
-// 大屏设计引擎
-import BigScreenDesign from 'packages/BigScreenDesign'
-// 数据源管理
-import DataSourceManagement from 'packages/DataSourceManagement'
-// 数据集管理
-import DataSetManagement from 'packages/DataSetManagement'
-// 大屏管理-数据集管理的顶部路由框架
-// import BigScreenTopLayout from 'packages/Layout'

 // 大屏 vuex store数据
 import bigScreenStore from 'packages/js/store'
@ -20,14 +10,33 @@ import registerConfig from 'packages/js/utils/registerConfig'
 // 更新主题
 import updateTheme from 'packages/js/utils/updateTheme'

+// 布局组件
+const BigScreenTopLayout = () => import('./Layout/ApplicationCreateTop/index.vue')
+// 大屏列表管理页面
+const BigScreenManagement = () => import('./BigScreenMag')
+// 大屏资源管理页面
+const BgiScreenSourceMag = () => import('./SourceMag')
+// 大屏组件管理页面
+const BigScreenComponentMag = () => import('./BigScreenComponentMag')
+// 大屏预览页面
+const BigScreenRun = () => import('./BigScreenRun')
+// 大屏设计页面
+const BigScreenDesign = () => import('./BigScreenDesign')
+// 数据集管理页面
+const DataSetManagement = () => import('./DataSetManagement')
+// 数据源管理页面
+const DataSourceManagement = () => import('./DataSourceManagement')
+
 // 存储组件列表
 const components = [
+  BigScreenTopLayout,
  BigScreenManagement,
+  BgiScreenSourceMag,
+  BigScreenComponentMag,
  BigScreenRun,
  BigScreenDesign,
  DataSetManagement,
  DataSourceManagement
-  // BigScreenTopLayout
 ]

 const $bigScreen = {
@ -42,13 +51,14 @@ function install (Vue) {

 export {
  install,
+  BigScreenTopLayout,
  BigScreenManagement,
+  BgiScreenSourceMag,
+  BigScreenComponentMag,
  BigScreenRun,
  BigScreenDesign,
  DataSetManagement,
  DataSourceManagement,
-  // BigScreenTopLayout,
-
  $bigScreen,
  registerConfig,
  updateTheme
@ -56,12 +66,14 @@ export {

 export default {
  install,
+  BigScreenTopLayout,
+  BgiScreenSourceMag,
+  BigScreenComponentMag,
  BigScreenManagement,
  BigScreenRun,
  BigScreenDesign,
  DataSetManagement,
  DataSourceManagement,
-
  $bigScreen,
  registerConfig,
  updateTheme
--- a/data-room-ui/packages/js/utils/dataSourceService.js
+++ b/data-room-ui/packages/js/utils/dataSourceService.js
@ -82,7 +82,7 @@ const getSourceView = (id = '-1', flag = false) => get(`/datasource/getViewList/
 * @param flag
 * @returns {Promise<*>}
 */
-const getTableFieldList = (sourceId = '-1', tableName = '', flag = false) => get(`/datasource//getFieldList/table/${sourceId}/${tableName}`, {}, flag)
+const getTableFieldList = (sourceId = '-1', tableName = '', flag = false) => get(`/datasource/getFieldList/table/${sourceId}/${tableName}`, {}, flag)

 /**
 * 获取数据源下视图字段列表
@ -91,8 +91,7 @@ const getTableFieldList = (sourceId = '-1', tableName = '', flag = false) => get
 * @param flag
 * @returns {Promise<*>}
 */
-const getViewFieldList = (sourceId = '-1', viewName = '', flag = false) => get(`/datasource//getFieldList/view/${sourceId}/${viewName}`, {}, flag)
-
+const getViewFieldList = (sourceId = '-1', viewName = '', flag = false) => get(`/datasource/getFieldList/view/${sourceId}/${viewName}`, {}, flag)

 export {
  add,