centaline-data-driven 1.2.78 → 1.2.81

package/build/centaline/centaline.path.js

@@ -3,7 +3,6 @@ const paths = {
     "dynamicD": "./src/centaline/dynamicD/index.js",//日期组件
     "dynamicGp": "./src/centaline/dynamicGp/index.js",//分组标签组件
     "dynamicIti": "./src/centaline/dynamicIti/index.js",//数字区域组件
-    "dynamicLs": "./src/centaline/dynamicLs/index.js",//表单列表组件
     "dynamicMt": "./src/centaline/dynamicMt/index.js",//多行文本组件
     "dynamicSo": "./src/centaline/dynamicSo/index.js",//单选下拉菜单
     "dynamicSos": "./src/centaline/dynamicSos/index.js",//单选搜索下拉菜单
@@ -11,7 +10,6 @@ const paths = {
     "dynamicT": "./src/centaline/dynamicT/index.js",//文本input组件
     "dynamicL": "./src/centaline/dynamicL/index.js",//文本label组件
     "dynamicTags": "./src/centaline/dynamicTags/index.js",//多选搜索下拉菜单组件
-    "dynamicLabel": "./src/centaline/dynamicLabel/index.js",//标签组件
     "dynamicForm": "./src/centaline/dynamicForm/index.js",//表单组件
     "dynamicDrop": "./src/centaline/dynamicDrop/index.js",//快捷下拉输入组件
     "dynamicSearchList": "./src/centaline/dynamicSearchList/index.js",//查询表单组件  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.78",
+  "version": "1.2.81",
   "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/css/max.css

@@ -248,4 +248,7 @@
 .max.el-button.el-button--mini{
     height: 26px;
 }
-
+.ct-text .showLabel label{
+    display: inline-block;
+    line-height: 27px!important;
+  }

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/index.js

@@ -1,7 +1,5 @@
 import dynamicForm from './src/dynamicForm'
 import dynamicInput from '../dynamicInput/index'
-import dynamicLabel from '../dynamicLabel/index'
-import dynamicLs from '../dynamicLs/index'
 import api from '../api/index'
 import common from '../common/index'
 import validate from '../validate/index'
@@ -9,8 +7,6 @@ import validate from '../validate/index'
 dynamicForm.install = function (Vue) {
   Vue.component(dynamicForm.name, dynamicForm);
   Vue.component(dynamicInput.name, dynamicInput);
-  Vue.component(dynamicLabel.name, dynamicLabel);
-  Vue.component(dynamicLs.name, dynamicLs);
 
   Vue.use(api);
   Vue.use(common);

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/dynamicForm/src/dynamicFormListTable.vue

@@ -30,6 +30,13 @@
                 <span v-else-if="v.is=='ct-sensitiveeye'">
                   <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
                 </span>
+                <!--可点击的列-->
+                <!-- <span v-else-if="v.routers" :class="'cell'" style="display: flex;">
+                  <component v-for="(router, routerIndex) in v.routers" :key="routerIndex" :ref="'router'+router.id+scope.$index" :rowData="scope.row" :rowindex="scope.$index"
+                    v-if="!router.rightField || !scope.row[router.rightField] || scope.row[router.rightField] == 1" 
+                    :is="router.is" :vmodel="router" :api="model.optionApi" @click="rolRouterClickHandler">
+                  </component>
+                </span> -->
                 <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>

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

@@ -1,292 +1,41 @@
 <template>
-    <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
-      <ct-layoutchildren :rowindex="rowindex"  :vmodel="Layout" @click="rolRouterClickHandler"></ct-layoutchildren>
-    </div>
+  <el-container :direction="model.orientation" :style="model.styleObject" ref="layoutchildren">
+    <component v-for="(item, index) in model.fields" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" @click="clickHandler"></component>
+  </el-container>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
+  import dynamicLayoutLabel from './dynamicLayoutLabel.vue';
+  import dynamicLayoutLine from './dynamicLayoutLine.vue';
+  import dynamicLayoutImage from './dynamicLayoutImage.vue';
   import dynamicLayoutChildren from './dynamicLayoutChildren.vue';
-  import common from '../../common';
   export default {
     name: 'ct-layout',
     mixins: [dynamicElement],
     components: {
+      'ct-layoutlabel': dynamicLayoutLabel,
+      'ct-layoutline': dynamicLayoutLine,
+      'ct-layoutimage': dynamicLayoutImage,
       'ct-layoutchildren': dynamicLayoutChildren
     },
     props: {
-      api: String,
-      cellLayout: String,
       vmodel: Object,
       rowindex: Number,
-      actionRouter: Array,
-      listData: Array,
-      apiParam: Object
+      forname: String,
+      forrowindex: String
     },
     data() {
       return {
-        Layout:[]
+        forindex: 0
       };
     },
     created() {
-      this.init();
+      this.model = this.loaderObj.CellLayout(this.vmodel);
     },
     methods: {
-      init() {
-        var self = this;
-        //初始化
-        this.loading = true;
-        this.$nextTick(function () {
-          if (typeof self.api !== 'undefined') {
-            self.loaderObj.CellLayout(self.api, self.load, this.apiParam, self.failLoad);
-          }
-          else if (typeof self.vmodel !== 'undefined') {
-            self.load(self.vmodel, self.cellLayout);
-          }
-        });
-      },
-      failLoad() {
-        this.$emit('failLoad', this.model);
-      },
-      load(data, cellLayout) {
-        var str = '';
-        if (typeof data !== 'undefined') {
-          str = cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
-            return this.getValue(data, args[1])
-          });
-        }
-        var xmlDOM = this.loadXML(str);
-        this.Layout = this.xmlToJson(xmlDOM.childNodes[0]);
-        this.loading = false;
-      },
-      getValue(data,val) {
-        return val.split('.').reduce((data, currentVal) => {
-          return data[currentVal]
-        }, data)
-      },
-      loadXML(xmlString) {
-        if (document.all) {
-          var xmlDom = new ActiveXObject("Microsoft.XMLDOM");
-          xmlDom.loadXML(xmlString)
-          return xmlDom
-        }
-        else {
-          return new DOMParser().parseFromString(xmlString, "text/xml");
-        }
-      },
-
-      xmlToJson(xml) {
-        // Create the return object
-        var obj = {};
-        if (xml.nodeType == 1) { // element
-          // do attributes
-          if (xml.attributes.length > 0) {
-            for (var j = 0; j < xml.attributes.length; j++) {
-              var attribute = xml.attributes.item(j);
-              obj[attribute.nodeName] = attribute.nodeValue;
-            }
-          }
-        }
-        if (xml.nodeName.toLowerCase() == "Layout".toLowerCase() || xml.nodeName.toLowerCase() == "StackLayout".toLowerCase()) {
-          obj["is"] = "ct-layoutchildren";
-        }
-        else if (xml.nodeName.toLowerCase() == "Label".toLowerCase()) {
-          obj["is"] = "ct-layoutlabel";
-        }
-        else if (xml.nodeName.toLowerCase() == "Line".toLowerCase()) {
-          obj["is"] = "ct-layoutline";
-        }
-        else if (xml.nodeName.toLowerCase() == "Image".toLowerCase()) {
-          obj["is"] = "ct-layoutimage";
-        }
-        obj["type"] = xml.nodeName;
-        // do children
-        if (xml.hasChildNodes()) {
-          for (var i = 0; i < xml.childNodes.length; i++) {
-            var item = xml.childNodes.item(i);
-            var nodeName = item.nodeName;
-            if (typeof (obj["fields"]) == "undefined") {
-              obj["fields"] = [];
-              obj["fields"].push(this.xmlToJson(item));
-            } else {
-              if (typeof (obj["fields"].push) == "undefined") {
-                var old = obj["fields"];
-                obj["fields"] = [];
-                obj["fields"].push(old);
-              }
-              obj["fields"].push(this.xmlToJson(item));
-            }
-          }
-        }
-        return obj;
-      },
-      rolRouterClickHandler(routerKey, rowindex) {
-        var self = this;
-        var submitData = {};
-        var rowData = self.vmodel;
-        var actionRouter = self.actionRouter;
-        debugger
-        let field = actionRouter.find(b => {
-          return b.id === routerKey;
-        });
-        field.submitListField.forEach((k) => {
-          submitData[k] = rowData[k];
-        });
-
-        let action = field.action;
-        if (field.actionField) {
-          action = rowData[field.actionField];
-        }
-        this.routerClickHandler(field, submitData, action);
-      },
-      routerClickHandler(field, submitData, action) {
-        let self = this;
-        action = action || field.action;
-       
-        var clickAcion = function () {
-          //若不是客户端方法，则直接访问接口
-          if (!field.isClientFuntion) {
-            // 外部框架tab页打开
-            if (field.isFormPageInTab || field.isSearchPageInTab) {
-              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.isBrowserNewTab) {// 浏览器打开
-              submitData = field.getActionPara(submitData).para;
-              let query = self.$common.objectToQueryStr(submitData);
-              window.open(action + query, "_blank");
-            }
-            else {
-              //self.operationLoading = true;
-
-              //Form
-              if (field.isOpenForm) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      //source: data.content,
-                      api: action,
-                      apiParam: field.getActionPara(submitData).para,
-                      showTitle: false,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                      submit(ev) {
-                        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
-                          self.model.doAction(ev);
-                        }
-                        self.$forceUpdate();
-                        self.$refs.footer.$forceUpdate();
-                        self.$common.closeDialog(dialogOption.dialog);
-                        self.updateCurrentRow(field, ev);
-                      },
-                      refreshParent() {
-                        self.getPage(1);
-                        self.$common.closeDialog(dialogOption.dialog);
-                      },
-                      closeDialog() {
-                        self.updateCurrentRow(field);
-                      }
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              //SearchList
-              else if (field.isOpenList) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      searchConditionApi: field.actionForSearchLayout,
-                      searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                      refreshParent() {
-                        self.getPage(1);
-                        self.$common.closeDialog(dialogOption.dialog);
-                      },
-                      closeDialog() {
-                        self.updateCurrentRow(field);
-                      }
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              //Tabs
-              else if (field.isOpenTabs) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      searchConditionApi: field.actionForSearchLayout,
-                      searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              else {
-                self.operationLoading = true;
-                field.doAction(submitData, (data) => {
-                  self.operationLoading = false;
-                  if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
-                    self.model.doAction({ responseData: data });
-                  }
-                  self.$forceUpdate();
-                  self.$refs.footer.$forceUpdate();
-                  self.updateCurrentRow(field, data);
-                })
-              }
-            }
-          }
-          //执行客户端脚本
-          else {
-            // let parm={submitData:submitData,field:field}
-            // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
-            let title = field.pageTitle == undefined ? field.label : field.pageTitle;
-            submitData.actionType = field.actionType;
-            var fun = self.$common.getDataDrivenOpts().handler[action];
-            fun(submitData, title, self.model);
-            // var fun = self.model.scripts.formData[action];
-            // fun(submitData,field);
-          }
-        }
-
-        if (field.alert) {
-          self.$common.confirm(field.alertMsg, field.alertCaption, {
-            confirmButtonText: field.alertOKButtonText,
-            cancelButtonText: field.alertCancelButtonText,
-            //type: 'warning'
-            center: field.alertCenter
-          }).then(() => {
-            clickAcion();
-          }).catch(() => {
-          });
-        }
-        else {
-          clickAcion();
-        }
-      },
+      clickHandler(routerKey, rowindex, forname, forrowindex) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex);
+      }
     },
     mounted() {
 
@@ -294,7 +43,4 @@
   }
 </script>
 <style>
-  .ct-Layout {
-    font-size: 12px;
-  }
 </style>

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

@@ -1,20 +1,15 @@
 <template>
   <el-container :direction="model.orientation" :style="model.styleObject">
-    <component v-for="(item, index) in model.fields" :key="index" :is="item.is" :vmodel="item" :rowindex="rowindex"  @click="clickHandler"></component>
+    <ct-layout v-for="(item, index) in model.fields" :key="index" :rowindex="rowindex" :forrowindex="model.forrowindex" :vmodel="item" :forname="model.forname" @click="clickHandler"></ct-layout>
   </el-container>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement'
-  import dynamicLayoutLabel from './dynamicLayoutLabel.vue';
-  import dynamicLayoutLine from './dynamicLayoutLine.vue';
-  import dynamicLayoutImage from './dynamicLayoutImage.vue';
   export default {
     name: 'ct-layoutchildren',
     mixins: [dynamicElement],
     components: {
-      'ct-layoutlabel': dynamicLayoutLabel,
-      'ct-layoutline': dynamicLayoutLine,
-      'ct-layoutimage': dynamicLayoutImage
+      'ct-layout': () => import('./dynamicLayout.vue'),
     },
     props: {
       vmodel: Object,
@@ -22,16 +17,16 @@
     },
     data() {
       return {
-
+        forname: '',
+        forwindex: 0
       };
     },
     created() {
       this.model = this.loaderObj.CellLayout(this.vmodel);
-     
     },
     methods: {
-      clickHandler(routerKey, rowindex) {
-        this.$emit('click', routerKey, rowindex);
+      clickHandler(routerKey, rowindex, forname, forrowindex) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex);
       }
     },
     mounted() {
@@ -40,5 +35,4 @@
   }
 </script>
 <style>
- 
 </style>