centaline-data-driven 1.2.78 → 1.2.79

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/second-hand-transaction/add-detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -17,11 +17,12 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
-        apiParam:{actionType: 2,
-externalPropertyId: "54802",
+        apiParam:{
+actionType: 3,
+originalTraId: "1526048947277938690",
 pageOnly: true,
 pageStyle: 2,
-propertyNo: "SHHKS000032362"
+pageTitle: "成交报告"
           }
       }
     },

package/src/SearchList.vue

@@ -4,8 +4,8 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/salemattersmanage/squareuploadlist/getLayoutOfSearch'" 
-    :searchDataApi="'/salemattersmanage/squareuploadlist/getList'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/api/distribution/agentRelationProperty/getLayoutOfSearch'" 
+    :searchDataApi="'/api/distribution/agentRelationProperty/list'" :apiParam="para"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -25,7 +25,13 @@
     name: 'DataDrivenSearch',
     data() {
       return {
-        para:{},
+        para:{
+agentId: "1491335181504401409",
+delegateType: "1",
+estateId: "18721",
+estateName: "凯旋路1798号"
+
+        },
         // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}
         // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -245,10 +245,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -359,6 +359,7 @@
               self.$common.openDialog(dialogOption);
             }
             else if (field.isOpenList) {
+              submitData = field.getActionPara(submitData).para;
               var dialogOption = {
                 title: field.pageTitle,
                 pane: self.$common.getParentPane(self),
@@ -385,10 +386,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

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

@@ -556,10 +556,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -365,10 +365,14 @@
               };
               self.$common.openDialog(dialogOption);
             }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+            else if (field.isFormPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -386,10 +386,14 @@
                 };
                 self.$common.openDialog(dialogOption);
               }
-              else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+              else if (field.isFormPageInTab) {// 外部框架tab页打开
                 submitData = field.getActionPara(submitData).para;
                 self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle,self.model,field.dialogWidth);
               }
+              else if (field.isSearchPageInTab) {// 外部框架tab页打开
+                submitData = field.getActionPara(submitData).para;
+                self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+              }
               else if (field.isBrowserNewTab) {// 浏览器打开
                 submitData = field.getActionPara(submitData).para;
                 let query = self.$common.objectToQueryStr(submitData);
@@ -401,8 +405,13 @@
               }
               else {
                 submitData = field.getActionPara(submitData).para;
-                field.doAction(submitData, (data) => {                  
-                  self.model.doAction(data);
+                field.doAction(submitData, (data) => {
+                  if(field && field.changeCallBackFunName){
+                    self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                  }
+                  else{
+                    self.model.doAction(data);
+                  }
                 })
               }
             }

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -146,13 +146,17 @@
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             // 外部框架tab页打开
-            if (field.isFormPageInTab || field.isSearchPageInTab) {
+            if (field.isFormPageInTab) {
               submitData = field.getActionPara(submitData).para;
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
               }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model, field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

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

@@ -728,13 +728,17 @@
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             // 外部框架tab页打开
-            if (field.isFormPageInTab || field.isSearchPageInTab) {
+            if (field.isFormPageInTab) {
               submitData = field.getActionPara(submitData).para;
               if (field.pageStyle) {
                 submitData.pageStyle = field.pageStyle;
               }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
+            else if (field.isSearchPageInTab) {// 外部框架tab页打开
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);

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

@@ -392,10 +392,17 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //新增或替换表格数据
         insertOrUpdateRow(tableId,row) {    
-            let listData = this.excuteListData.find((v) => {
-                return v.id === tableId;
-            });
-            listData.insertOrUpdateRow(row);
+          let listData = this.excuteListData.find((v) => {
+              return v.id === tableId;
+          });
+          listData.insertOrUpdateRow(row);
+        },
+        //删除表格数据
+        deleteRow(tableId,row) {    
+          let listData = this.excuteListData.find((v) => {
+              return v.id === tableId;
+          });
+          listData.delRow(row);
         },
         //清空表格数据
         clear(tableId) {

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

@@ -465,19 +465,29 @@ const FormList = function (source, master) {
     },
     insertOrUpdateRow(row) {
       if(row){
-        source.rows.push(r);
-        let iRow = this.initRow(r);
-        iRow.isNewFlag = true;
-        rtn._rows.push(iRow);
-        Vue.set(r, 'edit', iRow.edit);
-        Vue.set(r, 'delete', iRow.delete);
-        r.$sourceIndex = rtn._rows.length - 1;
+        // source.rows.push(r);
+        // let iRow = this.initRow(r);
+        // iRow.isNewFlag = true;
+        // rtn._rows.push(iRow);
+        // Vue.set(r, 'edit', iRow.edit);
+        // Vue.set(r, 'delete', iRow.delete);
+        // r.$sourceIndex = rtn._rows.length - 1;
 
-        let rowData = rtn.rowsItemToTableData(iRow)
-        rowData.$sourceIndex = rtn._rows.length - 1;      
-        rowData.edit = iRow.edit;
-        rowData.delete = iRow.delete;
-        rtn._tableData.push(rowData);
+        // let rowData = rtn.rowsItemToTableData(iRow)
+        // rowData.$sourceIndex = rtn._rows.length - 1;      
+        // rowData.edit = iRow.edit;
+        // rowData.delete = iRow.delete;
+        // rtn._tableData.push(rowData);
+      }
+    },
+    delRow(row) {
+      debugger
+      if(row && rtn.primaryKeys && rtn.primaryKeys.length>0){
+        rtn.rows.forEach((row,i) => {
+          debugger
+          console.log(row)
+
+        });
       }
     },
   };

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

@@ -16,6 +16,9 @@ const RichText = function (source, router) {
     get action() {
       return router &&router.action ? router.action : "";//上传完整地址
     },
+    set action(v) {
+      source.action = v;
+    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -204,28 +204,28 @@ const SearchScreen = function (source, callBack, screenPara) {
         }
         return result;
       },
-       // 1 是字符串 2是数字
-       getDataType(searchDataType)
-       {
-         let dataType=1;
-         switch(searchDataType)
-         {
-           case 2:
-           case 6:
-            dataType=2;
-             break;
-            case 1:
-            case 3:
-            case 4:
-            case 5:
-               dataType=1;
-                break;
-           default:
-                dataType=1;
-               break; 
-         }
-         return dataType;
-       },
+      // 1 是字符串 2是数字
+      getDataType(searchDataType)
+      {
+        let dataType=1;
+        switch(searchDataType)
+        {
+          case 2:
+          case 6:
+          dataType=2;
+            break;
+          case 1:
+          case 3:
+          case 4:
+          case 5:
+              dataType=1;
+              break;
+          default:
+              dataType=1;
+              break; 
+        }
+        return dataType;
+      },
       initScreen(screens) {
         var rtnscreens = [];
 

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -315,9 +315,12 @@ const LibFunction = {
         item.is = 'ct-text';
         break;
       case Enum.ControlType.RichText://富文本框
-        var router = source.actionRouters.find((v1) => {
-          return v1.key === field.fieldName1;
-        });
+        var router ={};
+        if(source.actionRouters){
+          router = source.actionRouters.find((v1) => {
+            return v1.key === field.fieldName1;
+          });
+        }
         item = RichText(field, router);
         item.is = 'ct-rich-text';
         break;

package/src/main.js

@@ -23,6 +23,9 @@ Vue.use(centaline, {
     openTab: function (action) {
       alert("打开tab页:" + action)
     },
+    openTabSearch: function (field, submitData) {
+      alert("打开tab页Search:" + field.action)
+    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },