centaline-data-driven 1.4.80 → 1.4.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.80",
+  "version": "1.4.82",
   "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,23 +93,44 @@
                   column.fixed === 'right' ? 'right-fixation' : null,
                 ]" v-bind="column.attrs">
                 <!--操作列-->
-                <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"
-                                    :rowData="row" @click="rolRouterClickHandler">
-                  </ct-tablecurrency>
+                <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" style="float: left;">
+                  <template v-for="(router, rowRouterIndex) in getRowRouterShow(row)" >
+                    <template v-if="router.isCallTel">
+                      <component v-if="!router.rightField || !row[router.rightField] || row[router.rightField] == 1" 
+                        :key="rowRouterIndex" :ref="'router'+router.id+rowindex" :rowData="row" :rowindex="rowindex"
+                        :is="router.is" :vmodel="router" :api="model.optionApi" 
+                        @click="rolRouterClickHandler">
+                      </component>
+                    </template>
+                    <template v-else>
+                      <ct-tablecurrency v-if="!router.rightField || row[router.rightField] == 1"
+                        :key="rowRouterIndex" :ref="'router' + router.id + rowindex" :rowData="row" :rowindex="rowindex"
+                        :isOperationalColumn="true"  :router="router" :colValue="router.label"
+                        @click="rolRouterClickHandler">
+                      </ct-tablecurrency>
+                    </template>
+                  </template>
                   <el-popover v-if="getRowRouterDisplay(row).length > 0" :ref="'popover' + rowindex"
                               :append-to-table="option.appendId ? option.appendId : ''" class="Stats-popover"
                               popper-class="el-popover1" :placement="option.placement ? option.placement : 'left'"
                               :trigger="option.trigger ? option.trigger : ''">
-                    <div class="tab-list" style="border-bottom: none">
-                      <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterDisplay(row)"
-                                        :key="rowRouterIndex" v-if="!router.rightField || row[router.rightField] == 1"
-                                        :isOperationalColumn="true" :isShowImg="false" :rowindex="rowindex" :router="router"
-                                        :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
-                      </ct-tablecurrency>
+                    <div class="tab-list" style="border-bottom: none">                      
+                      <template v-for="(router, rowRouterIndex) in getRowRouterDisplay(row)" >
+                        <template v-if="router.isCallTel">
+                          <component v-if="!router.rightField || !row[router.rightField] || row[router.rightField] == 1" 
+                            :key="rowRouterIndex" :ref="'router'+router.id+rowindex" :rowData="row" :rowindex="rowindex"
+                            :is="router.is" :vmodel="router" :api="model.optionApi" 
+                            @click="rolRouterClickHandler">
+                          </component>
+                        </template>
+                        <template v-else>
+                          <ct-tablecurrency v-if="!router.rightField || row[router.rightField] == 1"
+                            :key="rowRouterIndex" :ref="'router' + router.id + rowindex" :rowData="row" :rowindex="rowindex"
+                            :isOperationalColumn="true"  :router="router" :colValue="router.label" :isShowImg="false"
+                            @click="rolRouterClickHandler">
+                          </ct-tablecurrency>
+                        </template>
+                      </template>
                     </div>
                     <span :slot="getRowRouterDisplay(row).length > 0 ? 'reference' : ''" class="icon-more"></span>
                   </el-popover>
@@ -843,6 +864,7 @@ export default {
       this.routerClickHandler(field, submitData, action);
     },
     rolRouterClickHandler(field, rowData, rowindex, visible) {
+      field.rowindex=rowindex;
       if (this.$refs["popover" + rowindex]) {
         this.$refs["popover" + rowindex][0].doClose();
       }
@@ -863,6 +885,10 @@ export default {
         submitData["searchFields"] = self.model.getSearchData();
       }
       
+      if(field.isCallTel){
+        submitData.flagHaveAlert=visible||false;
+      }
+
       let action = field.action;
       if (field.actionField) {
         action = rowData[field.actionField];
@@ -1216,13 +1242,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

@@ -347,12 +347,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get actionRouter() {
         if (rtn._actionRouter !== null) {
           return rtn._actionRouter;
-        } else {
+        } 
+        else {
           rtn._actionRouter = [];
           if (source.content.actionRouters) {
             source.content.actionRouters.forEach((v) => {
               var router = Router(v);
-              //router.is = "ct-btn";
+              router.is = "ct-btn";
               //router.attrs = { size: "mini" }
               rtn._actionRouter.push(router);
             });
@@ -458,7 +459,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               data = data.replace(v1, self[v1.replace('{{', '').replace('}}', '')]);
             });
           }
-          if(self.$vue.searchStrat && self.$vue.searchEnd){
+          if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
             let searchTotal=self.$vue.searchEnd-self.$vue.searchStrat;
             if(searchTotal>0){
               data=data+" 总耗时 "+searchTotal+" 毫秒";

package/src/main.js

@@ -48,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uM5I9sx4PnROTBoWESUkSFAhPhIIsXeCWATtKe57r3C9T2ETHFWMmaDbtgRci0IrKUInXnKxgtLmQfpcEVWBtDfoUiRALBWiVe2pkovGobIXw7W00lrCtAVrqQBmNqY-s2sOTVge57BJYtFyIvcmHMfbD1TYv3C_Lpfd8vzHudPtuM7ukTPZPIPgPAEfhGCc1SGOo0Y6LFOKU3h_AAAA__8.4YlxIx5iTyUWZz6HVudB_Leg7SNdXJlnOAySiulvnOg',
+        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"}',