centaline-data-driven 1.2.43 → 1.2.44

package/package.json

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

package/src/SearchList.vue

@@ -3,7 +3,9 @@
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist> -->
+    
+    <!-- <ct-searchlist :searchConditionApi="'/cache/getLayoutOfSearchForCache'" 
+    :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
 
     <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/common/index.js

@@ -205,7 +205,6 @@ const common = {
    * @desc 打开弹窗
    */
   openDialog(vmodel) {
-
     //this.dialogList.List.push(vmodel);
     this.dialogList.addDialog(vmodel);
   },
@@ -216,7 +215,6 @@ const common = {
    * @desc 关闭指定弹窗
    */
   closeDialog(vmodel) {
-
     if (vmodel) {
       if (vmodel.name === 'ct-comfirm' || vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
         //vmodel.dialogTableVisible = false;

package/src/centaline/css/common.css

@@ -95,6 +95,9 @@ html {
  .ct-close{
    cursor: pointer;
  }
+ .cursor{
+  cursor: pointer !important;
+}
  .ct-so .ct-close > .el-select__caret.is-show-close:hover, .ct-tags .ct-close > .el-select__caret.is-show-close:hover {
    color: #909399;
  }

package/src/centaline/dialogList/src/dialogList.vue

@@ -45,7 +45,7 @@
           document.addEventListener("touchmove", mo, false);//禁止页面滑动
         }
       },
-      deleteDialog(model) {       
+      deleteDialog(model) {
         model.dialogTableVisible = false;
         //改成删除
         let index = this.List.findIndex(v => {

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

@@ -1,19 +1,24 @@
 <template>
-  <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
-    <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
-          <span style="font-weight:bold">{{title}}</span>
-    </div>
-    <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
-    @changeCategory="categorychange" ></ct-searchcategory>
+  <div style="width: 100%;height: 100%;position: inherit;">
+    <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
+      <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
+            <span style="font-weight:bold">{{title}}</span>
+      </div>
+      <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
+      @changeCategory="categorychange" ></ct-searchcategory>
+
+      <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
+      @loaded="screenLoaded" :screenPara="screenPara" 
+      :categoryLoaded="loaded.categoryLoaded" @search="search()" 
+      @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-    <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
-    @loaded="screenLoaded" :screenPara="screenPara" 
-    :categoryLoaded="loaded.categoryLoaded" @search="search()" 
-    @showTitle="showTitleScreenHandler"></ct-searchscreen>
+      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
+      @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
+      @showTitle="showTitleHandler"></ct-searchtable>
+    </div>
+    <div v-if="flagSideBar">
 
-    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
-    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
-    @showTitle="showTitleHandler"></ct-searchtable>
+    </div>
   </div>
 </template>
 <script>
@@ -77,6 +82,9 @@
         reloadKeyTable:'t0',
         isReload:false,
         pageDisabled:false,
+        flagSideBar:false,
+        flagDefaultDisplaySideBar:false,
+        sideBarWidth:360,
       }
     },
     methods: {

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

@@ -80,6 +80,7 @@
                   :rowspan="tdRowspan(column, row)"
                   class="ct-td"
                   :class="[colHasWidth[colIndex],model.tdClass,
+                  column.router?'cursor':null,
                   colIndex === leftShadow?'shadowLeft':null,
                   colIndex === rightShadow?'shadowRight':null,
                   column.fixed === 'left'?'left-fixation':null,

package/src/centaline/loader/src/ctl/SearchTable.js

@@ -843,6 +843,15 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get rowMenuDisplayCount() {
         return source.content.rowMenuDisplayCount && source.content.rowMenuDisplayCount>0?source.content.rowMenuDisplayCount : 4;
       },
+      get flagSideBar() {
+        return source.content.flagSideBar || false;
+      },
+      get flagDefaultDisplaySideBar() {
+        return source.content.flagDefaultDisplaySideBar || false;
+      },
+      get sideBarWidth() {
+        return source.content.sideBarWidth || 360;
+      },
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;

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

@@ -1,7 +1,7 @@
 <template>
   <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel" @click="clickHandler($event)">
-    <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" @click="clickHandler($event);" />
-    <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" @click="clickHandler($event)">
+    <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" />
+    <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" >
       {{label}}
     </a>
   </div>