Ver código fonte

优化子表显隐

yangfan 5 meses atrás
pai
commit
7e9efbfd5e

+ 10 - 2
src/assets/scss/common.scss

@@ -50,7 +50,15 @@
   display: flex;
   position: relative;
   background: #ebeef5;
-
+  flex-direction:column;
+  .header-title{
+    width: 100%;
+    background-color: #ffffff;
+    padding: 12px 12px 16px 32px;
+    border: 1px solid #ebeef5;
+    display: flex;
+    justify-content: space-between;
+  }
   .JNPF-common-layout-left {
     width: 220px;
     background-color: #fff;
@@ -117,7 +125,7 @@
 .JNPF-common-search-box {
   background: #fff;
   flex-shrink: 0;
-  margin-bottom: 10px;
+  margin-bottom: 5px;
   padding: 15px 10px 0;
   position: relative;
 

+ 10 - 1
src/views/basic/dynamicModel/list/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="JNPF-common-layout">
+    <div class="header-title">
+      <a plain size="small" icon="el-icon-arrow-left" @click="goTop()"><img src="logo.png" class="header-logo" /></a>
+      <el-button size="mini" style="padding: 5px 15px" @click="closeWin">取消</el-button>
+    </div>
     <template v-if="columnData.type === 2 && !isComponent">
       <div class="JNPF-common-layout-left">
         <template v-for="(item, index) in columnData.treeList">
@@ -2704,6 +2708,11 @@ export default {
     },
     openCustom() {
       this.$grid.openCustom()
+    },
+    closeWin() {
+      window.opener = null
+      window.open('', '_self')
+      window.close()
     }
   }
 }
@@ -2784,7 +2793,7 @@ export default {
 :deep(.vxe-tools--wrapper) {
   width: 100%;
 }
-:deep(.vxe-input--inner) {
+:deep(.vxe-select.is--active:not(.is--filter) > .vxe-input .vxe-input--inner) {
   border: 1px solid var(--color-primary) !important;
 }
 :deep(.vxe-select-option.is--selected) {

+ 3 - 1
vue.config.js

@@ -1,7 +1,9 @@
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
-const define = require('./src/utils/define.js')
+const define = {
+  APIURl: ''
+}
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
 
 function resolve(dir) {