centaline-data-driven 1.3.67 → 1.3.68

package/package.json

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

package/src/SearchList.vue

@@ -11,8 +11,8 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/api/workflow/layout'" 
-      :searchDataApi="'/api/workflow/list'">
+    <ct-searchlist :searchConditionApi="'/PropertyDutyList/getLayoutOfSearch'" 
+      :searchDataApi="'/PropertyDutyList/getListOfSearchModelForRET'">
     </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"

package/src/centaline/dynamicCb/src/dynamicCb.vue

@@ -76,4 +76,8 @@
 .ct-checkbox .ct-radios .el-checkbox {
     min-width: 0px;
 }
+.ct-form .ct-checkbox {
+  height: 1px;
+  min-height: 28px;
+}
 </style>

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -9,7 +9,7 @@
              v-bind:class="[model.attrs.size?'el-range-editor--'+model.attrs.size:'',
          model.showLabel?'ct-iti-editor':'',isFocus?'isfocus':'',model.lock ? 'ct-is-disabled' : '']">
 
-         <div :style="{'width':model.unitName.length == 1 ? '38%':(model.unitName.length == 3) ?'32%':(model.unitName.length == 5) ?'28%': ''}"
+         <div :style="{'width':model.unitName && model.unitName.length == 1 ? '38%':(model.unitName && model.unitName.length == 3) ?'32%':(model.unitName && model.unitName.length == 5) ?'28%': ''}"
            class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%" class="el-range-input" :placeholder="model.attrs.placeholder1"
                  v-model="model.value" @change="changeHandler($event)" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value','decimals')"
@@ -22,7 +22,7 @@
          </span> -->
           </div>
           <span style="width:5%" class="el-range-separator">-</span>
-          <div :style="{'width':model.unitName.length == 1 ? '45%':( model.unitName.length == 3) ?'50%':(model.unitName.length == 5) ?'60%': ''}" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
+          <div :style="{'width':model.unitName && model.unitName.length == 1 ? '45%':(model.unitName &&  model.unitName.length == 3) ?'50%':(model.unitName && model.unitName.length == 5) ?'60%': ''}" class="ct-position-relative" @mouseout="mouseOutHandle('input2')">
           <input style="text-align:left;width:100%;" class="el-range-input" :placeholder="model.attrs.placeholder2"
                  v-model="model.value1" @change="changeHandler($event);" @input="onInputHandler($event);isShowClear('input2')" @focus="focusHandler" @blur="blurHandler('value1','decimals1')"
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>

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

@@ -141,14 +141,14 @@
         this.reloadKeyScreen='s'+this.reloadKey;
         this.reloadKeyTable='t'+this.reloadKey;
       },
-      search(btn) {
+      search() {
         this.selectIndex=-1;
         if (this.$refs.table.model) {
           this.pageDisabled=true;
           this.$refs.table.getPage(1);          
         }
         else {
-          this.$refs.table.searchComplate(this.$refs.screen.model);
+          this.$refs.table.searchComplate(this.$refs.screen.model,this.$refs.screen.model.defaultSearch);
         }
 
         this.$refs.table.loadStats();

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

@@ -1,22 +1,22 @@
 <template>
-  <div  style="width: 100%" class="ct-searchtable" ref="searchTable" :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }">
+  <div style="width: 100%" class="ct-searchtable" ref="searchTable" :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
       v-if="!isLoading && searchStatsApi" :api="searchStatsApi"
       @searchStats="searchStats"  @setTableHeight="setTableHeight" :searchModel="model.searchModel">
     </ct-tableStats>
 
-    <ct-tabletoolbar ref="toolbar" v-if="!isLoading"
+    <ct-tabletoolbar ref="toolbar" v-if="!isLoading && model && model.buttons"
       :buttons="model.buttons"
       @click="toolbarClickHandler($event)" @importComplete="importComplete"
       :optionApi="model.optionApi" :searchModel="model.searchModel">
     </ct-tabletoolbar>
 
-    <ct-tabletip ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader" v-if="!isLoading"></ct-tabletip>
+    <ct-tabletip ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader" v-if="!isLoading && model"></ct-tabletip>
 
-    <div v-loading="tableLoading" v-if="!isLoading" :style="{ height: '0px', top: model.tableHeight * 0.55 + 'px' }"></div>
+    <div v-loading="tableLoading" v-if="!isLoading && model" :style="{ height: '0px', top: model.tableHeight * 0.55 + 'px' }"></div>
     <div v-loading="operationLoading"></div>
 
-    <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
+    <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading && model"
       :style="{ height: from == 'form' ? '100%' : model.tableHeight + 'px','border-bottom': isLayout ? 'none' : '','border-top': isLayout ? 'none' : '',}"
       @scroll="scrollHandle($event)" :v-focus="model.flagFocus" 
       @keydown.up="rowKeyDownHandle($event, 0)" @keydown.down="rowKeyDownHandle($event, 1)"
@@ -159,8 +159,8 @@
       </div>
     </div>
 
-    <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading && !isLayout"></ct-tabletip>
-    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading && !isLayout"></ct-tabletip>
+    <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading && !isLayout && model"></ct-tabletip>
+    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading && !isLayout && model"></ct-tabletip>
     <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top: 30px"></div>
   </div>
 </template>
@@ -276,10 +276,7 @@ export default {
         self.model.searchModel = this.tempSearchModel;
       }
       //自动查询 调用合并列
-      if (
-        self.model.rowMergedColumns.length > 0 &&
-        self.model.listData.length > 0
-      ) {
+      if ( self.model.rowMergedColumns.length > 0 && self.model.listData.length > 0) {
         self.model.setRow(self.model.listData);
       }
       self.tableComplate = true;
@@ -758,7 +755,10 @@ export default {
 
       this.$nextTick(function () {
         if (typeof this.api !== "undefined") {
-          self.loaderObj.SearchTable(self.api, self.load, m, defaultSearch);
+          self.loaderObj.SearchTable(self.api, self.load, m, defaultSearch,null,function(){
+            self.isLoading = false;
+            self.tableLoading = false;
+          });
         }
         if (typeof this.source !== "undefined") {
           self.load(self.loaderObj.SearchTable(self.source));
@@ -998,10 +998,10 @@ export default {
                             }
                           }
                           if (typeof self.$refs.tableParent !== "undefined") {
-                        self.$refs.tableParent.scrollTop = 0;
-                        self.$refs.tableParent.scrollLeft = 0;
-                        self.scrollTop = 0;
-                        self.scrollLeft = 0;
+                            self.$refs.tableParent.scrollTop = 0;
+                            self.$refs.tableParent.scrollLeft = 0;
+                            self.scrollTop = 0;
+                            self.scrollLeft = 0;
                           }
                           self.$forceUpdate();
                           self.$nextTick(() => {

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

@@ -110,9 +110,10 @@
           <!-- <span slot="reference" class="icon-more"></span> -->
           <span
             slot="reference"
-            style="font-family: Comic Sans MS; font-size: 14px"
-            ><div class="my-icon-more"></div
-          ></span>
+            style="font-family: Comic Sans MS; font-size: 14px">
+			<!-- <div class="my-icon-more"></div> -->
+            <img :src="iconSort" alt="" width="100%" />
+			</span>
         </el-popover>
       </template>
     </div>
@@ -142,6 +143,7 @@ export default {
         trigger: "hover", //触发方式，传值可查看Popper UI组件trigger属性
         placement: "bottom-start", //方向，传值可查看Popper UI组件placement属性
       },
+	  iconSort: require("../../../assets/sort.png"),
     };
   },
   mounted() {
@@ -354,7 +356,11 @@ export default {
 }
 .more-dropdown {
   position: absolute;
+  width: 16px;
+  height: 20px;
+  text-align: left;
   top: 2px;
+  right: 0px;
 }
 .my-icon-more {
   width: 14px;

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

@@ -362,8 +362,8 @@ const Detail = function (source, para, callBack) {
         data.tags2 = v;
       },
       getTags2List(i) {
-        if (rtn.tags2 && rtn.tags2[i] && !rtn.tags2[i].list && rtn.tags2[i].searchDataApiUrl) {
-          let action = rtn.tags2[i].searchDataApiUrl;
+        if (rtn.tags2 && rtn.tags2[i] && !rtn.tags2[i].list && rtn.tags2[i].searchDataAction) {
+          let action = rtn.tags2[i].searchDataAction;
           let para = {};
           if (rtn.tags2[i].paramData) para = JSON.parse(rtn.tags2[i].paramData);
           Vue.prototype.$api.postHandler(common.globalUri(), { action: action, para: para }).then(

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

@@ -906,7 +906,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           if (callBack) {
             callBack(rtn);
           }
-        } else {
+        } 
+        else {
           if (postThenHandler) {
             postThenHandler();
           }

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

@@ -104,7 +104,7 @@ export default {
   width: 16px;
   height: 20px;
   text-align: left;
-  top: 3px;
+  top: 6px;
   right: 22px;
 }
 

package/src/main.js

@@ -12,11 +12,11 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.25:9999/v1/form/router",
   // baseUrl: "http://10.88.22.40:8080/", 
-  baseUrl: "http://tjcptest.centaline.com.cn/", 
-  flagRouterSelf: true,
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -42,7 +42,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe_iuZZwYtlJN0jLwiGquM1QJkRbCYS4OyC1W3fe8Ia3_P-CaTGoQVdwRxtdXMEdbXREHJWkxWPUhCzsMVAKmFgSn5vWp1MDFZTHDWoScRJUSSsY87yGA_lfWKZyv5TnP85d5_E76_rBheANsxWP3IugiRESDdGci4Ukw_sDAAD__w.3i21j7m3bYLyBiyw3yyRa30Ic2yb8HIJzfCicS6OXXM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9laza55fZ27-jkwMaPIIc5E6yMQKIx_rsYoaP3Fa-YYmZeMM49VKAruKONLqzgjjY6Ig5K0uIhaEQWtugpeowskY9Na2PdQAH5cYOKRGxpSmUpYEjTLyAS-w3mMd9P-fmPc9dpWGYlc--DJQxZDbJLbim7MNqg6pM7G-8Y3h8AAAD__w.8TSDAWjGFDnR0l_C7untDbZTxrfIYNVycj9F33X0v6E',
         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',