centaline-data-driven 1.4.93 → 1.4.94

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -4,30 +4,13 @@
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
         <span style="font-weight:bold">{{title}}</span>
       </div>
-      <el-tabs v-if="categorySource" :value="activeIndex" @tab-click="handleClick">
+      <el-tabs v-if="categorySource" :value="activeIndex" @tab-click="handleClick" class="searchlistTab">
         <el-tab-pane v-for="(col, index) in categorySource.selectItems1" :key="col.code"
           :index="index.toString()" :name="index.toString()" :label="col.name">
           <div>
-            <ct-searchscreen :ref="'screen'+activeIndex" :api="searchConditionApi" :key="reloadKeyScreen"
-            @loaded="screenLoaded" :screenPara="screenPara" 
-            :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
-            @showTitle="showTitleScreenHandler"></ct-searchscreen>
-
-            <ct-searchtable :ref="'table'+activeIndex" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight" 
-            @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
-            @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
-            @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
-            @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
-          </div>
-          <div :ref="'sidebar'+activeIndex" v-if="flagSideBar && flagSideBarOfData" 
-          :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
-          class="sidebar">
-            <ct-Detail :ref="'detail'+activeIndex" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
-            :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose"
-            @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
-            @closeSideHandler="closeSideHandler"></ct-Detail>
-            <ct-SearchSideMenu ref="sideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
-            @sideMenuClickHandler="sideMenuClickHandler"></ct-SearchSideMenu>
+            <ct-searchlistOne :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
+              :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
+            </ct-searchlistOne>            
           </div>
         </el-tab-pane>
       </el-tabs>      
@@ -36,19 +19,12 @@
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
-  import dynamicSearchScreen from '../../dynamicSearchList/src/dynamicSearchScreen.vue';
-  import dynamicSearchTable from '../../dynamicSearchList/src/dynamicSearchTable.vue';
-  import dynamicSearchSideMenu from '../../dynamicSearchList/src/dynamicSearchSideMenu.vue';
-  import progress from '../../progress/src/progress.vue';
+  import dynamicSearchListOne from './dynamicSearchListOne.vue';
   export default {
     name: 'ct-searchlistTab',
     mixins: [dynamicElement],
     components: {
-      'ct-searchscreen': dynamicSearchScreen,
-      'ct-searchtable': dynamicSearchTable,
-      'ct-progress': progress,
-      'ct-SearchSideMenu': dynamicSearchSideMenu,
-      'ct-Detail': ()=>import('../../dynamicDetail/src/dynamicDetail.vue'),
+      'ct-searchlistOne': dynamicSearchListOne,
     },
     props: {
       vmodel: Object,
@@ -82,13 +58,9 @@
     created() {
       this.model = this.vmodel;
       this.screenPara=this.apiParam;
-      if(this.searchCategoryApi){
-        this.loaded.categoryLoaded=false;
-      }
       if(this.apiParam && this.apiParam.isIframe && this.apiParam.isIframe=='true'){
         this.isIframe=true;
       }
-      this.categoryLoad();
     },
     activated() {
       this.$nextTick(() => {
@@ -101,46 +73,24 @@
     },
     data() {
       return {
-        loaded: {
-          screenLoaded: false,
-          tableLoaded: false,
-          categoryLoaded: true,
-        },
         title:'',
         showTitle:false,
         screenPara:null,
         screenTop:0,
-        reloadKey:0,
-        reloadKeyScreen:'s0',
-        reloadKeyTable:'t0',
-        isReload:false,
         pageDisabled:false,
         drowerClose:'',
         activeIndex:0,
         categorySource:null,
-
-        flagSideBar:false,
-        flagSideBarOfData:true,
-        flagDefaultDisplaySideBar:false,
-        sideBarWidth:0,
-        searchWidth:0,
-        sideBarRight:0,
-        sideBarMenuRight:0,
-        sideBarStatus:'',
-        sideBarApi:'',
-        sideBarApiParam:null,
-        sideBarPageType:'',
-        selectIndex:-1,
-        rowCount:0,
-        detailKey:0,
         isIframe: false,
+        searchWidth:0,
+        listHeight:'',
       }
     },
     computed: {
     },
     mounted(){
       this.$nextTick(function () {
-        // this.categoryLoad();
+        this.categoryLoad();
       }); 
     },
     methods: {
@@ -151,9 +101,11 @@
             if (response.rtnCode === 200) {
               self.categorySource=response.content.fields[0];
               console.log(self.categorySource)
-              // let parm={};
-              // parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
-              // self.categoryLoaded(parm);
+              let parm={};
+              parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
+              self.$nextTick(function () {
+                self.categoryLoaded(parm);
+              });
             }
             else{
               self.categoryLoadedError();
@@ -163,214 +115,49 @@
       },
       handleClick(tab, event) {
         let i = tab.index;
-        // if (this.model.tags2 && this.model.tags2[i]) {
-        //   this.model.getTags2List(i);
-        // }
-      },
-      screenLoaded(defaultSearch) {
-        this.loaded.screenLoaded = true;
-        if(this.from && this.from=='detail'){
-          this.screenTop=this.$refs['screen'+this.activeIndex].$el.offsetTop;
-        }
-        this.$refs['table'+this.activeIndex].searchComplate(this.$refs['screen'+this.activeIndex].model, defaultSearch);
- 
-        this.$emit('loaded', this.$refs['screen'+this.activeIndex].model);
+        let parm={};
+        parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;
+        this.$nextTick(function () {
+          if(!this.$refs['searchlist'+i][0].loaded.categoryTabLoaded){
+            this.$refs['searchlist'+i][0].categoryLoaded(parm);
+          }
+        });
       },
       categoryLoaded(param) {
-        this.loaded.categoryLoaded = true;
-        if(param)this.screenPara=param;
-        console.log(this.$refs['screen'+this.activeIndex])
-        this.$refs['screen'+this.activeIndex].searchComplate();
+        this.listHeight=(this.$refs.main.offsetHeight-40)+'px';
+        this.$refs['searchlist'+this.activeIndex][0].categoryLoaded(param);
       },
       categoryLoadedError() {
-        this.$refs['screen'+this.activeIndex].isLoading=false;
-        this.$refs['table'+this.activeIndex].isLoading=false;
-      },
-      categorychange(param) {
-        if(param)this.screenPara=param;
-        this.reloadKey = this.reloadKey+1;
-        this.reloadKeyScreen='s'+this.reloadKey;
-        this.reloadKeyTable='t'+this.reloadKey;
-      },
-      search() {
-        this.selectIndex=-1;
-        if (this.$refs['table'+this.activeIndex].model) {
-          this.pageDisabled=true;
-          this.$refs['table'+this.activeIndex].getPage(1);          
-        }
-        else {
-          this.$refs['table'+this.activeIndex].searchComplate(this.$refs['screen'+this.activeIndex].model,this.$refs['screen'+this.activeIndex].model.defaultSearch);
-        }
-      },
-      searchComplate(index) {
-        this.pageDisabled=false;
-        if(this.flagSideBar && this.$refs['table'+this.activeIndex].model.listData.length>0){
-          if(!this.flagSideBarOfData || index===1){
-            this.flagSideBarOfData=true;
-            this.sideMenuClickHandler(this.sideBarStatus =='close'?'open':'close');
-          }
-        }
-        else{
-          this.flagSideBarOfData=false;
-          this.searchWidth=0;
-        }
+        this.$refs['searchlist'+this.activeIndex][0].categoryLoadedError();
       },
-      toolbarClickHandler(field, submitData) {
-        if (field.isExport) {
-          this.$refs['screen'+this.activeIndex].model.export(field, submitData);
-        }
-        else if (field.isRefreshParent) {
-          this.isRefreshParent();
-        }
+      tableLoaded(){
+        this.iisLoading=false;
       },
       refreshParentHandler() {
         this.$emit('refreshParent');
       },
       resize() {
-        if(this.$refs['table'+this.activeIndex]){
-          this.$refs['table'+this.activeIndex].setTableHeight();
-        }
-      },
-      resizeSearchList() {
-        if(this.flagSideBar && this.flagSideBarOfData){
-          if(this.sideBarStatus=='open' && this.$refs.main){
-            this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
-          }
+        if(this.$refs['searchlist'+this.activeIndex][0]){
+          this.$refs['searchlist'+this.activeIndex][0].resize();
         }
       },
       showTitleHandler() {
-        if (this.$refs['table'+this.activeIndex].model && this.$refs['table'+this.activeIndex].model.flagShowTitle) {
-          this.title=this.$refs['table'+this.activeIndex].model.title;
-          this.showTitle=this.$refs['table'+this.activeIndex].model.flagShowTitle;
+        if (this.$refs['table'+this.activeIndex][0].model && this.$refs['table'+this.activeIndex][0].model.flagShowTitle) {
+          this.title=this.$refs['table'+this.activeIndex][0].model.title;
+          this.showTitle=this.$refs['table'+this.activeIndex][0].model.flagShowTitle;
         }
       },
       showTitleScreenHandler() {
-        if (this.$refs['screen'+this.activeIndex].model && this.$refs['screen'+this.activeIndex].model.flagShowTitle) {
-          this.title=this.$refs['screen'+this.activeIndex].model.title;
-          this.showTitle=this.$refs['screen'+this.activeIndex].model.flagShowTitle;
-        }
-      },
-      tableLoaded() {
-        var self = this;
-        if (typeof this.$refs['table'+this.activeIndex].model.cellLayout !== "undefined") {
-          this.$refs['screen'+this.activeIndex].LoadLayout();
-        }
-        if(this.$refs['table'+this.activeIndex].model.listData.length>0){
-          this.flagSideBarOfData=true;
-          this.flagSideBar=this.$refs['table'+this.activeIndex].model.flagSideBar;
-          this.flagDefaultDisplaySideBar=this.$refs['table'+this.activeIndex].model.flagDefaultDisplaySideBar;
-
-          if(this.$refs['table'+this.activeIndex].model.rowSelectRouter){
-            this.sideBarApi=this.$refs['table'+this.activeIndex].model.rowSelectRouter.action;
-            this.sideBarPageType=this.$refs['table'+this.activeIndex].model.rowSelectRouter.actionSource;
-          }
-          else{
-            this.flagSideBar=false;
-          }
-
-          if(document.body.clientWidth && document.body.clientWidth<1024){
-            this.flagSideBar=false;
-          }
-
-          if(this.flagSideBar){
-            this.selectIndex=-1;
-            if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){
-              this.sideMenuClickHandler('close');
-            }
-            else{
-              let status='open';
-              if(this.sideBarStatus=='open')status='close';
-              else if(this.sideBarStatus=='close')status='open';
-              this.sideMenuClickHandler(status);
-            }
-          }
-
-          window.addEventListener("resize", (ev) => {
-            self.resizeSearchList();
-          });
-        }
-        else{
-          this.flagSideBarOfData=false;
-          this.searchWidth=0;
-        }
-        this.$emit('tableLoaded', this.$refs['table'+this.activeIndex].model);
-      },
-      rowClickHandle() {
-        var self = this;
-        if(self.selectIndex!==self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter){
-          self.selectIndex=self.$refs.table.model.selectIndex;
-          self.rowCount=self.$refs.table.model.listData.length;
-          self.sideBarApiParam = {};
-          if(self.$refs.table.model.rowSelectRouter.submitListField){
-            self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
-              self.sideBarApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
-            });
-          }
-          self.sideBarApiParam.actionType = self.$refs.table.model.rowSelectRouter.actionType;
-          self.detailKey = self.detailKey+1;
-        }
-      },
-      refreshRowHandle(){
-        this.selectIndex=-1;
-        this.rowClickHandle();
-      },
-      sideMenuClickHandler(v) {
-        this.drowerClose = v;
-        let popoverCallTels=document.getElementsByClassName('el-popoverCallTel');
-        if(v=='open'){
-          this.sideBarStatus ='close';
-          this.sideBarRight=-this.sideBarWidth;
-          this.sideBarWidth=0;
-          this.searchWidth=0;
-          this.sideBarMenuRight=0;
-          for(var i=0;i<popoverCallTels.length;i++){
-            popoverCallTels[i].style.display='none';
-          }
-        }
-        else if(v=='close'){
-          this.sideBarStatus ='open';
-          this.sideBarRight=0;
-          this.sideBarWidth=this.$refs['table'+this.activeIndex].model.sideBarWidth;
-          this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
-          this.sideBarMenuRight=this.sideBarWidth-2;
-          this.rowClickHandle();          
-          for(var i=0;i<popoverCallTels.length;i++){
-            popoverCallTels[i].style.display='block';
-          }
-          if(this.$refs.detail){
-            if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
-              this.$refs.detail.$children[0].refreshPage();
-            }
-          }
+        if (this.$refs['screen'+this.activeIndex][0].model && this.$refs['screen'+this.activeIndex][0].model.flagShowTitle) {
+          this.title=this.$refs['screen'+this.activeIndex][0].model.title;
+          this.showTitle=this.$refs['screen'+this.activeIndex][0].model.flagShowTitle;
         }
-        this.$refs['table'+this.activeIndex].setTableHeight();
-      },
-      closeSideHandler() {
-        this.$refs.sideMenu.clickHandler();
       },
       clickNextHandler() {
-        this.$refs['table'+this.activeIndex].rowKeyDownHandle(null,1);
+        this.$refs['table'+this.activeIndex][0].rowKeyDownHandle(null,1);
       },
       clickPrevHandler() {
-        this.$refs['table'+this.activeIndex].rowKeyDownHandle(null,-1);
-      },
-      simpleRouterclickHandler(field,data) {
-        this.$refs['table'+this.activeIndex].refreshFromSimple(field,data);
-        this.selectIndex=-1;
-        this.rowClickHandle();
-      },
-      saveShortcut(){
-        this.$refs['table'+this.activeIndex].getPage(1);
-      },
-      scrollHandle(scrollTop,scrollLeft){
-        this.$emit('scrollHandle',scrollTop,scrollLeft)
-      },
-      doClosePopoverHandle(){
-        this.$refs['screen'+this.activeIndex].$refs.doClosePopover.click();
-      },
-      popupClickHandler(tempListData){
-        this.$emit('submit', tempListData);
-        this.$common.closeDialog(this);
+        this.$refs['table'+this.activeIndex][0].rowKeyDownHandle(null,-1);
       },
     },
     beforeDestroy() {

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -257,7 +257,7 @@
       background-color: #fff;
       background-image: none;
       border-radius: 4px;
-      border: 1px solid #dcdfe6;
+      border: 1px solid #C6C6C6;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
       color: #606266;
@@ -291,11 +291,11 @@
       }
 
     .ct-so.isfocus .ct-input_inner:hover {
-      border-color: #409EFF; /*border-color:#c0c4cc*/
+      border-color: var(--centalineBlue); /*border-color:#c0c4cc*/
     }
 
     .ct-so.isfocus .ct-input_inner {
-      border-color: #409EFF;
+      border-color: var(--centalineBlue);
     }
 
     .ct-so .el-input__suffix {
@@ -304,7 +304,7 @@
     }
 
     .ct-so .el-select__caret {
-      color: #c0c4cc;
+      color: #BBBBBB;
       font-size: inherit;
       -webkit-transition: -webkit-transform .3s;
       transition: -webkit-transform .3s;

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -260,7 +260,7 @@
   margin-left: 108px;
 }
 .hoverColor:hover {
-  border-color: #409EFF;
+  border-color: var(--centalineBlue);
 }
 .is-show-Span {
   display: none;

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -397,11 +397,11 @@
       }
 
     .ct-tags.isfocus .ct-input_inner:hover {
-      border-color: #409EFF; /*border-color:#c0c4cc*/
+      border-color: var(--centalineBlue); /*border-color:#c0c4cc*/
     }
 
     .ct-tags.isfocus .ct-input_inner {
-      border-color: #409EFF;
+      border-color: var(--centalineBlue);
     }
 
     .ct-tags .el-input__suffix {
@@ -410,7 +410,7 @@
     }
 
     .ct-tags .el-select__caret {
-      color: #c0c4cc;
+      color: #BBBBBB;
       font-size: inherit;
       -webkit-transition: -webkit-transform .3s;
       transition: -webkit-transform .3s;

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -118,7 +118,7 @@ export default {
   height: 100%;
 }
 .mytree .is-select {
-  color: #409eff !important;
+  color: var(--centalineBlue) !important;
 }
 
 .tree-line:first-child div {

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -280,7 +280,7 @@ const LibFunction = {
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'showHigh';
-        item.attrs.class = item.attrs.class + ' max-search-btn ';
+        item.attrs.class = item.attrs.class + ' max-more-btn ';
         item.icon = 'max-open';
         break;
       case Enum.ControlType.ButtonReset: //重置查询按钮

package/src/centaline/quickInput/src/quickInput.vue

@@ -59,6 +59,6 @@
 <style>
   .ct-quickInput .el-icon-more:hover {
     cursor: pointer;
-    color: #409EFF;
+    color: var(--centalineBlue);
   }
 </style>

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -107,7 +107,7 @@ export default {
 <style scoped>
 .ct-quickInput .el-icon-more:hover {
   cursor: pointer;
-  color: #409eff;
+  color: var(--centalineBlue);
 }
 
 .more-dropdown {

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -87,7 +87,7 @@
     background-color: #ecf5ff;
   }
       .ct-selectOptionVertical li.select {
-        color: #409EFF;
+        color: var(--centalineBlue);
         font-weight: bold;
       }
         .ct-selectOptionVertical li.select span::after{

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -131,7 +131,7 @@
     padding-left: 0px;
     padding-right: 4px;
     cursor: pointer;
-    color: #388cd3;
+    color: #2E58E6;
   }
   .ct-tablecurrencyItem:hover{
     color: #23527c;

package/src/main.js

@@ -14,9 +14,9 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.6.1.162:17070/max-uplink-api/v1/form/router",
-  baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
+  // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
@@ -50,7 +50,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '0bbcf3e8-cf7e-42de-adef-af54e2158fe4',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgzAQBP_impNs7nz20YGxmzwCEeOCVFEAKVGUv4dIpEufKbYYrbT7VMt2Vo1CdtJGNhAseSA2FoRSgqCZBZNG7PtBDuBHfBnIBWnb6IB0x0DJRpA6JECxXU-xdX1kValyv6rGsDdeqNamUvO4HkI7_xHbUm6n8vjHucs677OZ0PM4WahN3suMAqMQwjTlcSqUsWSvXm8AAAD__w.kFBCAZ9jB8xw93_pkbsd_1r0CHHlvQNQSPdhEiPqfhQ',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2fVunC7xp-EQkSGOFCpEEgmEuDsgoKNnildMM--mlm2vWoUsrotswFtqgNhYcJQSeM3sMGnEEAb3AX7Ml4HEu66LAqR7Bko2gqt9AnS2DxQ7CZFVpcrlpFrDTW1qEYuVmvP6FpoMvsS2lPOuXP9x7rjOz-yUM-WxTCDUEBDxBJmYYETtBPUBpWR1fwAAAP__.nDlevz6dgoon0m0QNTtCCdty2vcy7c1FCRaTG8AyUGU',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',