首页 发现 帮助
登录
yangfan
/
workflow
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

优化子表显隐

yangfan 5 月之前
父节点
7e830791a5
当前提交
07fbf1bf2b
共有 12 个文件被更改，包括 43 次插入 和 21 次删除
分列视图 显示文件统计
  1. 7 7
      public/index.html
  2. 1 1
      src/components/ColumnFilter/index.vue
  3. 2 2
      src/components/Dataset-filter/dataset-filter.vue
  4. 7 0
      src/styles/element-ui.scss
  5. 9 0
      src/styles/element-variables.scss
  6. 1 1
      src/utils/define.js
  7. 1 1
      src/utils/request.js
  8. 6 2
      src/views/basic/dynamicModel/list/index.vue
  9. 2 2
      src/views/dataset/comps/datasetFilterItem.vue
  10. 2 2
      src/views/dataset/comps/globalFilter.vue
  11. 4 2
      src/views/form/webDesign/Form.vue
  12. 1 1
      vue.config.js

+ 7 - 7
public/index.html
查看文件 

@@ -7,15 +7,15 @@
 
   <meta name="renderer" content="webkit">
 
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
   <title><%= webpackConfig.name %></title>
 
-  <script src="/cdn/echarts/4.2.1/echarts.min.js"></script>
 
-  <script src="/cdn/xe-utils.umd.min.js"></script>
 
-  <script src="/cdn/utilFn.min.js"></script>
 
-  <script src="/cdn/sdk/sdk.js" async></script>
 
+  <script src="cdn/echarts/4.2.1/echarts.min.js"></script>
 
+  <script src="cdn/xe-utils.umd.min.js"></script>
 
+  <script src="cdn/utilFn.min.js"></script>
 
+  <script src="cdn/sdk/sdk.js" async></script>
 
   <script type="text/javascript">
 
-    document.write("<script src='/config.js?" + new Date().getTime() + "'><\/script>");
 
+    document.write("<script src='config.js?" + new Date().getTime() + "'><\/script>");
 
   </script>
 
-  <link rel="stylesheet" href="/cdn/sdk/sdk.css">
 
-  <link rel="stylesheet" href="/cdn/sdk/iconfont.css">
 
+  <link rel="stylesheet" href="cdn/sdk/sdk.css">
 
+  <link rel="stylesheet" href="cdn/sdk/iconfont.css">
 
 </head>
 
 
 <body>

+ 1 - 1
src/components/ColumnFilter/index.vue
查看文件 

@@ -14,7 +14,7 @@
 
                 <el-radio label="2">api</el-radio>
 
                 <el-radio label="3">自定义字典</el-radio>
 
               </el-radio-group>
 
-              <el-button size="mini" icon="el-icon-share" plain type="success" @click="getEnumData(filterForm, true)" style="margin-left: 20px"> 获取 </el-button>
 
+              <el-button size="mini" type="primary" @click="getEnumData(filterForm, true)" style="margin-left: 20px"> 获取 </el-button>
 
             </el-form-item>
 
             <el-form-item label="选择api" v-if="countEnumShow() && filterForm.enumSource === '2'">
 
               <el-cascader

+ 2 - 2
src/components/Dataset-filter/dataset-filter.vue
查看文件 

@@ -170,7 +170,7 @@
 
               <el-radio label="2">api</el-radio>
 
               <el-radio label="3">自定义字典</el-radio>
 
             </el-radio-group>
 
-            <el-button size="mini" icon="el-icon-share" plain type="success" @click="onGetEnumData" style="margin-left: 20px"> 获取 </el-button>
 
+            <el-button size="mini" type="primary" @click="onGetEnumData" style="margin-left: 20px"> 获取 </el-button>
 
           </el-form-item>
 
           <el-form-item label="选择api" v-if="countEnumShow() && nowCondition.enumSource === '2'">
 
             <el-cascader
 
@@ -280,7 +280,7 @@
 
             </div>
 
             <el-button size="mini" type="success" plain @click="onConditionAdd" v-show="canAddCondition"> 添加条件 </el-button>
 
           </el-form-item>
 
-          <div class="btns" style="display: flex; justify-content: space-evenly; margin-top: 30px">
 
+          <div class="btns" style="display: flex; justify-content: end; margin-top: 30px">
 
             <el-button type="primary" size="small" @click="showCondition = false" style="width: 100px"> 确定</el-button>
 
             <el-button size="small" @click="showCondition = false" style="width: 100px"> 取消</el-button>
 
           </div>

+ 7 - 0
src/styles/element-ui.scss
查看文件 

@@ -96,3 +96,10 @@
 
 .el-input.is-disabled .el-input__inner{
 
   background-color: #FEF5F1 !important;
 
 }
 
+.el-popper[x-placement^=bottom] {
 
+  margin-top: -15px;
 
+}
 
+.el-popper[x-placement^=bottom] .popper__arrow{
 
+  top: 10px;
 
+  z-index: -1;
 
+}

+ 9 - 0
src/styles/element-variables.scss
查看文件 

@@ -63,3 +63,12 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 
 .el-message--success .el-message__content{
 
   color: $--color-primary;
 
 }
 
+.el-loading-spinner i{
 
+  color: $--color-primary !important;
 
+}
 
+.vxe-loading>.vxe-loading--chunk, .vxe-loading>.vxe-loading--wrapper{
 
+  color: $--color-primary;
 
+}
 
+#nprogress .bar {
 
+  background: $--color-primary !important;
 
+}

+ 1 - 1
src/utils/define.js
查看文件 

@@ -25,7 +25,7 @@ module.exports = {
 
   HashUrl: process.env.NODE_ENV === 'development' ? 'http://localhost:1889/#/' : 'http://windatawk.platomix.net/#/',
 
   timeout: process.env.NODE_ENV === 'development' ? 10000 : 1000000,
 
   // WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
 
-  comUploadUrl: process.env.NODE_ENV === 'development' ? APIURl + '/file/uploadFile/record' : APIURl + '/api/file/uploadFile/record',
 
+  comUploadUrl: process.env.NODE_ENV === 'development' ? APIURl + '/file/uploadFile/record' : APIURl + '/file/uploadFile/record',
 
   comUrl: process.env.NODE_ENV === 'development' ? url : process.env.VUE_APP_BASE_API,
 
   // 本地文件预览
 
   filePreviewServer: process.env.NODE_ENV === 'development' ? 'http://116.196.94.12:30090' : process.env.VUE_APP_BASE_API + '/FileServer',

+ 1 - 1
src/utils/request.js
查看文件 

@@ -33,7 +33,7 @@ let paramsObj = queryURLParams(url)
 
 if (process.env.NODE_ENV === 'development') {
 
   baseURL = process.env.VUE_APP_BASE_API
 
   paramsObj.token =
 
-    'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJCSTEwMDEiLCJpbnN0SWQiOiIxNzQ3Nzg5ODU1MjgwMTg5NTM5Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3Mjg0MTMwMzUsImlhdCI6MTcyNDgxMzAzNSwidXNlcklkIjoiMTc3MjUzMTcxMDcyNDQ5NzQxMCIsImp0aSI6IjEwMjYxMjIwODM2ODUzNjc4MDgifQ.bepzoBsVr18zYyt1VQXm3ug3n9bIem5UITUTAceS9U0Jr14222JV2Nml0VCe5SEsbbkOdmbubXg5u_YWx0EAgw'
 
+    'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJCSTEwMDEiLCJpbnN0SWQiOiIxNzQ3Nzg5ODU1MjgwMTg5NTM5Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3Mjg2OTY1OTAsImlhdCI6MTcyNTA5NjU5MCwidXNlcklkIjoiMTc3MjUzMTcxMDcyNDQ5NzQxMCIsImp0aSI6IjEwMjczMTE0MDMzMDU3OTU1ODQifQ.7lzjMIs4w_9uq_03sL27CLPhbLZZmd3p5e4u2BRxeXUlPRZUVvlBgu5Qpzh9dekBeUFFxp5CZwoc5pvarBy5Nw'
 
   if (!getToken() || getToken() !== paramsObj.token) {
 
     setToken(paramsObj.token)
 
   }

+ 6 - 2
src/views/basic/dynamicModel/list/index.vue
查看文件 

@@ -35,6 +35,7 @@
 
     </template>
 
     <div class="JNPF-common-layout-center">
 
       <topForm ref="topForm" v-if="columnData.type === 4" />
 
+      <Search ref="Search" :list="columnData.searchList" :columnData="columnData" :treeBoxSearch="treeBoxSearch" @reset="reset" @search="search" />
 
       <div class="JNPF-common-layout-main JNPF-flex-main" style="height: calc(100% - 55px)">
 
         <!--        @row-dblclick="dbclick"-->
 
         <vxe-grid
 
@@ -290,8 +291,7 @@
 
             <!--                </el-dropdown-menu>-->
 
             <!--              </el-dropdown>-->
 
             <!--            </template>-->
 
-            <Search ref="Search" :list="columnData.searchList" :columnData="columnData" :treeBoxSearch="treeBoxSearch" @reset="reset" @search="search" />
 
-            <div style="height: 5px; background: #ebeef5; width: 100%"></div>
 
+            <!--            <div style="height: 5px; background: #ebeef5; width: 100%"></div>-->
 
           </template>
 
           <template v-slot:pager>
 
             <vxe-pager
 
@@ -2766,4 +2766,8 @@ export default {
 
 :deep(.vxe-tools--wrapper) {
 
   width: 100%;
 
 }
 
+:deep(.vxe-table-custom-wrapper) {
 
+  right: 148px;
 
+  top: -19px;
 
+}
 
 </style>

+ 2 - 2
src/views/dataset/comps/datasetFilterItem.vue
查看文件 

@@ -69,7 +69,7 @@
 
               <el-radio label="2">api</el-radio>
 
               <el-radio label="3">自定义字典</el-radio>
 
             </el-radio-group>
 
-            <el-button size="mini" icon="el-icon-share" plain type="success" @click="onGetEnumData" style="margin-left: 20px"> 获取 </el-button>
 
+            <el-button size="mini" type="primary" @click="onGetEnumData" style="margin-left: 20px"> 获取 </el-button>
 
           </el-form-item>
 
           <el-form-item label="选择api" v-if="countEnumShow() && nowCondition.enumSource === '2'">
 
             <el-cascader
 
@@ -164,7 +164,7 @@
 
             </div>
 
             <el-button size="mini" type="success" plain @click="onConditionAdd" v-show="canAddCondition"> 添加条件 </el-button>
 
           </el-form-item>
 
-          <div class="btns" style="display: flex; justify-content: space-evenly; margin-top: 30px">
 
+          <div class="btns" style="display: flex; justify-content: end; margin-top: 30px">
 
             <el-button type="primary" size="small" @click="showCondition = false" style="width: 100px"> 确定</el-button>
 
             <el-button size="small" @click="showCondition = false" style="width: 100px"> 取消</el-button>
 
           </div>

+ 2 - 2
src/views/dataset/comps/globalFilter.vue
查看文件 

@@ -49,7 +49,7 @@
 
               <el-radio label="2">api</el-radio>
 
               <el-radio label="3">自定义字典</el-radio>
 
             </el-radio-group>
 
-            <el-button size="mini" icon="el-icon-share" plain type="success" @click="onGetEnumData" style="margin-left: 20px"> 获取 </el-button>
 
+            <el-button size="mini" plain type="primary" @click="onGetEnumData" style="margin-left: 20px"> 获取 </el-button>
 
           </el-form-item>
 
           <el-form-item label="选择api" v-if="countEnumShow() && nowCondition.enumSource === '2'">
 
             <el-cascader
 
@@ -178,7 +178,7 @@
 
             </div>
 
             <el-button size="mini" type="success" plain @click="onConditionAdd" v-show="canAddCondition"> 添加条件 </el-button>
 
           </el-form-item>
 
-          <div class="btns" style="display: flex; justify-content: space-evenly; margin-top: 30px">
 
+          <div class="btns" style="display: flex; justify-content: end; margin-top: 30px">
 
             <el-button type="primary" size="small" @click="showCondition = false" style="width: 100px"> 确定</el-button>
 
             <el-button size="small" @click="showCondition = false" style="width: 100px"> 取消</el-button>
 
           </div>

+ 4 - 2
src/views/form/webDesign/Form.vue
查看文件 

@@ -59,12 +59,12 @@
 
             <!--              </el-cascader>-->
 
             <!--            </el-form-item>-->
 
             <!--            数据源-->
 
-            <el-form-item label="数据源连接" required>
 
+            <el-form-item label="数据源连接" required prop="dbSourceId">
 
               <el-select v-model="dataForm.dbSourceId" filterable placeholder="请选择数据源" @change="onDbSource" :disabled="dataForm.id !== ''">
 
                 <el-option :key="item.id" :label="item.dsDb + '-' + item.remark" :value="item.id" v-for="item in datasourceList" />
 
               </el-select>
 
             </el-form-item>
 
-            <el-form-item v-if="dataForm.dbSourceId" label="物理表连接" required>
 
+            <el-form-item v-if="dataForm.dbSourceId" label="物理表连接" required prop="primaryTableName">
 
               <div class="flex-between flex gap-10">
 
                 <el-select v-model="dataForm.primaryTableName" filterable placeholder="请选择物理表" @change="onTableViewName" :disabled="dataForm.id !== ''">
 
                   <el-option :key="item.tableViewName" :label="item.tableComments + ' ' + item.tableViewName" :value="item.tableViewName" v-for="item in tableList" />
 
@@ -216,6 +216,8 @@ export default {
 
           { validator: this.formValidate('enCode'), trigger: 'blur' }
 
         ],
 
         category: [{ required: true, message: '功能分类不能为空', trigger: 'change' }],
 
+        dbSourceId: [{ required: true, message: '数据源链接不能为空', trigger: 'change' }],
 
+        primaryTableName: [{ required: true, message: '物理表连接不能为空', trigger: 'change' }],
 
         state: [{ required: true, message: '功能状态不能为空', trigger: 'blur' }]
 
       },

+ 1 - 1
vue.config.js
查看文件 

@@ -26,7 +26,7 @@ module.exports = {
 
    * In most cases please use '/' !!!
 
    * Detail: https://cli.vuejs.org/config/#publicpath
 
    */
 
-  publicPath: '/work',
 
+  publicPath: './',
 
   outputDir: 'dist/work',
 
   assetsDir: 'static',
 
   lintOnSave: process.env.NODE_ENV === 'development',