centaline-data-driven 1.4.79 → 1.4.81

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/system/menuright/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/PropertyKey/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "menuRightId":"1642779661559795712","actionType":3
+          chanceID: "1560550751669981184", actionType: 2
         },
         topHeight:10,
       }

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

@@ -93,8 +93,7 @@
                   column.fixed === 'right' ? 'right-fixation' : null,
                 ]" v-bind="column.attrs">
                 <!--操作列-->
-                <div v-if="column.id === 'operation'" class="div_allinline"
-                     :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'">
+                <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'">
                   <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex"
                                     :ref="'router' + router.id + rowindex" v-if="!router.rightField || row[router.rightField] == 1"
                                     :isOperationalColumn="true" :rowindex="rowindex" :router="router" :colValue="router.label"
@@ -256,7 +255,8 @@ export default {
       },
       downloadUrl:"",
       disabledStats:false,
-
+      searchStrat:0,
+      searchEnd:0,
     };
   },
   deactivated(){
@@ -335,6 +335,7 @@ export default {
                   self.model.nextPage(next);
                 }
                 else {
+                  self.searchEnd=Date.now();
                   self.tableLoading = false;
                   self.rowColorChange();
                   self.calculatingRowHeight();
@@ -343,6 +344,7 @@ export default {
             });
           }
           else {
+            self.searchEnd=Date.now();
             self.tableLoading = false;
           }
         };
@@ -426,8 +428,7 @@ export default {
         document.addEventListener("mousemove", MouseMoveHandle, false);
       }
     },
-    getPage(index) {
-      
+    getPage(index) {      
       var self = this;
       if (typeof self.$refs.tableParent !== "undefined") {
         self.$refs.tableParent.scrollTop = 0;
@@ -461,7 +462,7 @@ export default {
         self.$emit("searchComplate", index);
       };
       self.tableLoading = true;
-
+      
       this.model.getPage(index, next);
       self.$nextTick(() => {
         self.loadStats();
@@ -796,7 +797,9 @@ export default {
 
       this.$nextTick(function () {
         if (typeof this.api !== "undefined") {
+          self.searchStrat=Date.now();
           self.loaderObj.SearchTable(self.api, self.load, m, defaultSearch, null, function () {
+            self.searchEnd=Date.now();
             self.isLoading = false;
             self.tableLoading = false;
           });
@@ -1212,13 +1215,23 @@ export default {
               self.operationLoading = true;
               field.doAction(submitData, (data) => {
                 self.operationLoading = false;
-                if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
-                  self.model.doAction({ responseData: data });
-                  self.$emit("refreshRowHandle");
+                if (field.isCallTel) {
+                  // self.model.doAction(data, field);
+                  if(self.model.currentCallTel){
+                    self.$refs[self.model.currentCallTel][0].closeCallTel()
+                  }
+                  self.model.currentCallTel='router'+field.id+field.rowindex;
+                  self.$refs['router'+field.id+field.rowindex][0].callTelClick(data);
+                }
+                else{
+                  if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                    self.model.doAction({ responseData: data });
+                    self.$emit("refreshRowHandle");
+                  }
+                  self.$forceUpdate();
+                  self.$refs.footer.$forceUpdate();
+                  self.updateCurrentRow(field, data);
                 }
-                self.$forceUpdate();
-                self.$refs.footer.$forceUpdate();
-                self.updateCurrentRow(field, data);
               });
             }
           }

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

@@ -458,8 +458,15 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               data = data.replace(v1, self[v1.replace('{{', '').replace('}}', '')]);
             });
           }
+          if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
+            let searchTotal=self.$vue.searchEnd-self.$vue.searchStrat;
+            if(searchTotal>0){
+              data=data+" 总耗时 "+searchTotal+" 毫秒";
+            }
+          }
           return data;
-        } else {
+        } 
+        else {
           return '';
         }
       },
@@ -480,6 +487,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       },
       apiData(callback) {
         var self = this;
+        self.$vue.searchStrat=Date.now();
         this.isLoading = true;
         if (self.searchModel) {
           //不需要禁用查询按钮
@@ -497,6 +505,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           })
           .then(function (response) {
+            self.$vue.searchEnd=Date.now();
             self.isLoading = false;
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {

package/src/main.js

@@ -48,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksKwjAURfeScR8kL3mfdJY27cRFlGoj6EhsC4q4dyMuwunhcs59mXU_mtZEFNYQPPRD5yHkJNCxs9BzTJQ0IXc08UgZUQS8jAq9sx4QUwarWUaffWSxUw4xKVZTRdWEbgDtfAKkoMGPFKKQaUx53EzrWC0LIWNjLvP2A6SqX7Cv5X4oz3-cu26XmuX5jEqzgBW0EBYVUJ4Zllh3XIo7cTHvDwAAAP__.4lx6u0EiJkrxVVQIfeqtEHEFeZFzgJEr_ixHVXLr_jM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uGYkZz6eGTonJg2LQA5xARUiIIEQeyeIRdCe4r73Cst9CtvgqMmYCYZdT8AlK_SpizAkz5ItY-rlkEYpiKpAOhoMXSRAzAWiFR2pkCeNh8KeDdfSSmsJux1YTxlQ2JhGYVcJm9Ael7DtkkUntyibcKq3H5gQf-G-tOu-Pf9x7nw7fWcJvbZ5Bm9zA56cwGViaGa1qmK1dgzvDwAAAP__.muXO336Qhg1m00cMVrDKHQ7wgHJ_w7JbngtJt-K2r84',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',