centaline-data-driven 1.4.94 → 1.4.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.94",
+  "version": "1.4.96",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/system/menulist/getTreeLayoutOfSearch'"
-                 :searchDataApi="'/system/menulist/getTreeList'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/orgtree/getLayoutOfSearch'"
+                 :searchDataApi="'/orgtree/getList'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/centaline/css/common.css

@@ -26,7 +26,6 @@ html {
   --centalineGray:#666666;
   --centalineMediumGray:#888888;
   --centalinePlaceholder:#AAAAAA;
-
 }
 .ct-so {
   font-size: 14px;
@@ -861,7 +860,51 @@ color: var(--centalinePlaceholder);
 .ml10{
   margin-left: 10px;
 }
-.searchlistTab .el-tabs__header{
-  margin-bottom: 0px;
-}
 
+.ct-searchcategory {
+  margin-bottom: 10px !important;
+  line-height: 30px;
+}
+  .ct-searchcategory .el-input-group__prepend{
+    text-align: left;
+    padding-left: 0px!important;
+    color: var(--chinaRed) !important;
+    font-weight: Bold;
+    text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
+    font-size: 16px;
+    vertical-align: middle;
+  }
+  .ct-searchcategory .ct-radios {
+    color: #606266;
+    border-radius: 4px;
+    /*border: 1px solid #dcdfe6;*/
+    line-height: 30px;
+    padding-left: 15px;
+    text-align: right;
+  }
+    .ct-searchcategory .ct-radios:hover {
+      border-color: #c0c4cc;
+    }
+    .ct-searchcategory .ct-radios .el-radio {
+      margin-left: 0px;
+      margin-right: 10px;
+    }
+  .ct-searchcategory .ct-radios .ct-Seg-label {
+    margin-right: 15px;
+  }
+.ct-searchcategory .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+  color: #FFF;
+  background-color: var(--chinaRed);
+  border-color: var(--chinaRed);
+  -webkit-box-shadow: -1px 0 0 0 var(--chinaRed);
+  box-shadow: -1px 0 0 0 var(--chinaRed);
+  font-weight: 700;
+  font-size: 14px;
+}
+.ct-searchcategory .el-radio-button__inner{
+  font-size: 14px;
+  color: var(--centalineBlack); 
+}
+.ct-searchcategory .el-radio-button__inner:hover {
+  color: var(--chinaRed);
+}

package/src/centaline/css/max.css

@@ -1,6 +1,6 @@
 
 /* 查询搜索 */
-.max-search-btn{
+.max-search-btn,.max-more-btn{
     height: 26px;
     background: var(--chinaRed) !important;
     border-color: var(--chinaRed) !important;
@@ -9,7 +9,7 @@
     color: #fff !important;
 }
 /* 重置按钮 更多按钮*/
-.max-reset-btn,.max-more-btn{
+.max-reset-btn{
     height: 26px;
     background: #FFFFFF !important;
     border-color: var(--chinaRed) !important;
@@ -200,6 +200,7 @@
   .ct-so .ct-input_inner,.ct-text .showLabel input,.ct-text .showLabel label{
     color: var(--centalineBlue) !important;
   }
+  /* 多选框 */
   .cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
       color: var(--centalineBlue) !important;
   }
@@ -214,7 +215,12 @@
   .cover-list-item .el-checkbox__input.is-focus .el-checkbox__inner,.cover-list-item .el-checkbox__inner:hover{
     border-color:var(--centalineBlue) !important;
     }
-   
+    .cover-list-item .el-checkbox:hover .el-checkbox__inner{
+        border-color:var(--centalineBlue) !important;
+    } 
+    .cover-list-item .el-checkbox:hover .el-checkbox__label{
+        color: var(--centalineBlue) !important;
+    } 
   .st-serach-screen .el-input-group__append, .st-serach-screen .el-input-group__prepend{
     color: var(--centalineBlack)!important;
   }
@@ -253,12 +259,34 @@
  .hyperLinkList .el-button + .el-button{
       margin-left: 0!important;
   }
+  /* 弹窗 单选按钮鼠标移上 */
+ .field-top .ct-radios .el-radio__inner:hover{
+    border-color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio:hover .el-radio__input .el-radio__inner{
+    border-color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio:hover .el-radio__label{
+    color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio.is-disabled:hover .el-radio__label{
+    color: #c0c4cc !important;
+}
+.field-top .ct-radios .el-radio.is-disabled:hover .el-radio__input .el-radio__inner{
+  border-color: #d6d6d6 !important;
+}
+.field-top .ct-radios .el-radio.is-checked:hover .el-radio__label{
+    color: var(--centalineBlue) !important;
+}
+.field-top .ct-radios .el-radio.is-checked:hover .el-radio__input .el-radio__inner{
+    border-color: var(--centalineBlue) !important;
+}
   .el-radio__input.is-checked .el-radio__inner {
-    border-color: var(--centalineBlue);
-    background: var(--centalineBlue);
+    border-color: var(--centalineBlue) !important;
+    background: var(--centalineBlue) !important;
 }
 .el-radio__input.is-checked + .el-radio__label {
-    color: var(--centalineBlue);
+    color: var(--centalineBlue) !important;
 }
 .ct-table-content .ct-table .ct-tr .cell img{
     display: inherit;
@@ -318,3 +346,27 @@
     background-color: var(--chinaRed) !important;
     border-color: var(--chinaRed) !important;
     }
+    /* 弹窗多选框 */
+    .field-top .el-checkbox__input.is-focus .el-checkbox__inner,.field-top .el-checkbox__inner:hover{
+        border-color:var(--centalineBlue) !important;
+        }
+    .field-top .el-checkbox__input.is-checked .el-checkbox__inner {
+        background-color:var(--centalineBlue) !important;;
+        border-color: var(--centalineBlue) !important;;
+    } 
+    .field-top .el-checkbox:hover .el-checkbox__inner{
+        border-color:var(--centalineBlue) !important;
+    } 
+    .field-top .ct-checkbox .el-checkbox.is-disabled:hover .el-checkbox__label{
+        color: #c0c4cc !important;
+    }
+    .field-top  .ct-checkbox .el-checkbox.is-disabled:hover .el-checkbox__input .el-checkbox__inner{
+      border-color: #d6d6d6 !important;
+    }
+    .field-top .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__label{
+        color: var(--centalineBlue) !important;
+    }
+    .field-top  .ct-checkbox .el-checkbox.is-checked:hover .el-checkbox__input .el-checkbox__inner{
+        border-color: var(--centalineBlue) !important;
+    }
+

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -60,9 +60,9 @@
               @click="fieldClickHandler(model.actionRouters[2], $event)">
             </component>
             <img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
-              src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;cursor: pointer;"/>
+              src="../../../assets/T1.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;cursor: pointer;"/>
             <img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
-              src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;margin-right: 13px;cursor: pointer;"/>
+              src="../../../assets/B1.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;margin-right: 13px;cursor: pointer;"/>
           </div>
         </div>
       </div>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -58,10 +58,10 @@
               @click="fieldClickHandler(model.actionRouters[2], $event)">
             </component>
             <img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
-              src="../../../assets/T.png" alt=""
+              src="../../../assets/T1.png" alt=""
               style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px;cursor: pointer;"/>
             <img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
-              src="../../../assets/B.png" alt=""
+              src="../../../assets/B1.png" alt=""
               style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px; margin-right: 13px; cursor: pointer;"/>
           </div>
         </div>

package/src/centaline/dynamicSearchList/src/dynamicSearchCategory.vue

@@ -1,16 +1,14 @@
 <template>
-  <div style="width:100%;display:flex" v-if="model !== null" class="ct-searchcategory" :class="[model.attrs.size?'ct-searchcategory-'+model.attrs.size:''
-      ]">
+  <div style="width:100%;display:flex" v-if="model !== null" class="ct-searchcategory" :class="[model.attrs.size?'ct-searchcategory-'+model.attrs.size:'']">
     <div style="flex:1;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">        
-        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1.3em;height: 1.3em;fill: currentColor;
-    overflow: hidden;vertical-align: middle;"/>
+        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1.3em;height: 1.3em;fill: currentColor;overflow: hidden;vertical-align: middle;"/>
         {{model.label}}
       </div>
       <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
         <el-radio-group v-model="model.value" @change="changeHandler1($event)">
           <el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
-                    :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
+            :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
             {{value[model.optionAttrs.label]}}
           </el-radio-button >
         </el-radio-group>
@@ -85,51 +83,4 @@
   }
 </script>
 <style>
-.ct-searchcategory {
-  margin-bottom: 10px;
-    line-height: 30px;
-}
-  .ct-searchcategory .el-input-group__prepend{
-    text-align: left;
-    padding-left: 0px!important;
-    color: var(--chinaRed) !important;
-    font-weight: Bold;
-    text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
-    font-size: 16px;
-    vertical-align: middle;
-  }
-  .ct-searchcategory .ct-radios {
-    color: #606266;
-    border-radius: 4px;
-    /*border: 1px solid #dcdfe6;*/
-    line-height: 30px;
-    padding-left: 15px;
-    text-align: right;
-  }
-    .ct-searchcategory .ct-radios:hover {
-      border-color: #c0c4cc;
-    }
-    .ct-searchcategory .ct-radios .el-radio {
-      margin-left: 0px;
-      margin-right: 10px;
-    }
-  .ct-searchcategory .ct-radios .ct-Seg-label {
-    margin-right: 15px;
-  }
-.ct-searchcategory .el-radio-button__orig-radio:checked+.el-radio-button__inner {
-  color: #FFF;
-  background-color: var(--chinaRed);
-  border-color: var(--chinaRed);
-  -webkit-box-shadow: -1px 0 0 0 var(--chinaRed);
-  box-shadow: -1px 0 0 0 var(--chinaRed);
-font-weight: 700;
-font-size: 14px;
-}
-.ct-searchcategory .el-radio-button__inner{
-font-size: 14px;
-color: var(--centalineBlack); 
-}
-.ct-searchcategory .el-radio-button__inner:hover {
-    color: var(--chinaRed);
-}
 </style>

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -144,9 +144,8 @@
 
                 <!--可点击的列-->
                 <template v-else-if="column.router">                  
-                  <div v-if="column.router.rightField && row[column.router.rightField] === 0"></div>
-                  <ct-tablecurrency v-else 
-                    :ref="'router' + column.router.id + rowindex"
+                  <div v-if="column.router.rightField && row[column.router.rightField] === 0" v-html="row[column.id]"></div>
+                  <ct-tablecurrency v-else :ref="'router' + column.router.id + rowindex"
                     :rowindex="rowindex" :align="column.attrs.align"
                     :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" :router="column.router"
                     :colValue="row[column.id]" :rowData="row" @click="rolRouterClickHandler">

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

@@ -31,7 +31,7 @@
   import dynamicSearchSideMenu from '../../dynamicSearchList/src/dynamicSearchSideMenu.vue';
   import progress from '../../progress/src/progress.vue';
   export default {
-    name: 'ct-searchlist',
+    name: 'ct-searchlistOne',
     mixins: [dynamicElement],
     components: {
       'ct-searchscreen': dynamicSearchScreen,

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

@@ -4,16 +4,28 @@
       <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" 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-searchlistOne :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
-              :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
-            </ct-searchlistOne>            
+      <div v-if="categorySource" class="el-tabs__header ct-searchcategory" style="width:100%;display:flex">
+        <div style="flex:1;" class="el-input-group">
+          <div v-if="showLabel && label" class="el-input-group__prepend">        
+            <img v-if="categorySource.preLabel1" :src="categorySource.preLabel1" style="width: 1.3em;height: 1.3em;fill: currentColor;overflow: hidden;vertical-align: middle;"/>
+            {{label}}
           </div>
-        </el-tab-pane>
-      </el-tabs>      
+          <div class="ct-radios">
+            <el-radio-group v-model="activeIndex" @change="categorychangeHandler($event)">
+              <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index">
+                {{col.name}}
+              </el-radio-button >
+            </el-radio-group>
+          </div>
+        </div>
+      </div>
+      <div v-if="categorySource" class="el-tabs__content">
+        <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
+          <ct-searchlistOne :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
+            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
+          </ct-searchlistOne>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -84,6 +96,10 @@
         isIframe: false,
         searchWidth:0,
         listHeight:'',
+        isLoading:true,
+
+        showLabel:true,
+        label:'',
       }
     },
     computed: {
@@ -100,9 +116,10 @@
           function (response) {
             if (response.rtnCode === 200) {
               self.categorySource=response.content.fields[0];
-              console.log(self.categorySource)
+              console.log('categorySource',self.categorySource)
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
+              self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
               self.$nextTick(function () {
                 self.categoryLoaded(parm);
               });
@@ -113,25 +130,28 @@
           }
         );
       },
-      handleClick(tab, event) {
-        let i = tab.index;
+      categorychangeHandler() {
+        console.log('activeIndex',this.activeIndex)
+        let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;
+        this.label=this.categorySource.selectItems1[i].displayName;
         this.$nextTick(function () {
           if(!this.$refs['searchlist'+i][0].loaded.categoryTabLoaded){
+            this.isLoading=true;
             this.$refs['searchlist'+i][0].categoryLoaded(parm);
           }
         });
       },
       categoryLoaded(param) {
-        this.listHeight=(this.$refs.main.offsetHeight-40)+'px';
+        this.listHeight=(this.$refs.main.offsetHeight-42)+'px';
         this.$refs['searchlist'+this.activeIndex][0].categoryLoaded(param);
       },
       categoryLoadedError() {
         this.$refs['searchlist'+this.activeIndex][0].categoryLoadedError();
       },
       tableLoaded(){
-        this.iisLoading=false;
+        this.isLoading=false;
       },
       refreshParentHandler() {
         this.$emit('refreshParent');

package/src/main.js

@@ -50,14 +50,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '0bbcf3e8-cf7e-42de-adef-af54e2158fe4',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2fVunC7xp-EQkSGOFCpEEgmEuDsgoKNnildMM--mlm2vWoUsrotswFtqgNhYcJQSeM3sMGnEEAb3AX7Ml4HEu66LAqR7Bko2gqt9AnS2DxQ7CZFVpcrlpFrDTW1qEYuVmvP6FpoMvsS2lPOuXP9x7rjOz-yUM-WxTCDUEBDxBJmYYETtBPUBpWR1fwAAAP__.nDlevz6dgoon0m0QNTtCCdty2vcy7c1FCRaTG8AyUGU',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOivZ2fXamy7xp-EQURJShAqRRAIh7o4R0NEzxRRPI725q3UfVaOQnbSJDQRLHoiNBaGcIWhmwawRY-zlE_hR3_TkgrRtckC6Y6BsE0gdMqDYLlJqXUysKjVfz6ox7GvUxciVWobtDWoj-gX2db4c5ts_zp22pWjJyIQDGhgJy5iMBz9pB3z02pGjchXV4wkAAP__.UJfbXztMu3Mir8CBo48y20zouMa8jMar9OMNWQtQBbA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
-        authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"665b7cc4bcb0c902a054498fdf23fab7","token":"","random":"mnYxP9","time":1681872807128,"sign":"c18df776fbc6d82dec86c62be946634a"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImQ3MGE2ZDJiLTliZDYtNDZmZS1hZDgzLTA1MzA4ZjUzOTBjOSJ9.ozfqV1P46pWUzyDSwnKnSqlV1L8PySL9NE51WYFCGx9xnutI4ip8Bw3yU7X2oPoA6BG7NPZ5S9sE57ZcYd-VRg',
+        authObject: '{"currentEstate":{"estateId":"20170524095458338E35F467429530B4","estateName":"A%E5%AE%89%E5%B3%A6%E5%85%AC%E9%A6%86"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"665b7cc4bcb0c902a054498fdf23fab7","token":"","random":"dMxZQ","time":1682069635547,"sign":"a0604f3d4aa249de11ba42a563698b72"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImUyMTkyOTJiLTFjZDQtNGRiOS04YjQ1LWFjMDA2Y2Q3ZWFjMSJ9.Ki5iSJ1hoVpdZ_K9NRScKe7IwXKk3JOGx-a02XWPPL1914jpPZQmS6S-DQ752zepOqKOTELTtznMHGjw4cUUcw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作