centaline-data-driven 1.1.52 → 1.1.53

package/package.json

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

package/src/Edit.vue

@@ -1,7 +1,6 @@
 <template>
   <div id="app">
-    <!-- <formListTable></formListTable> -->
-    <el-button @click="copyField">test</el-button>
+    <formListTable></formListTable>
   </div>
   
 </template>
@@ -22,40 +21,7 @@
       TestEdit() {
         this.$api.post('http://10.88.22.52:2828//api/values/edit', { content: this.template }, (data) => {
         });
-      },
-        copyField()
-    {
-      debugger;
-       var self = this;
-       var dialogOption = {
-        title: "复制控件",
-        content: [
-          {
-            component: "ct-form",
-            attrs: {
-              showTitle: false,
-              api: "/forminfo/readTargetDetail",
-              apiParam: {
-                formId: "1ae27876-a938-4ea5-aeab-fb2a7b067a2f",
-                actionType: 3,
-              },
-              width: "1300px",
-              height: "650px",
-            },
-            on: {
-              submit(ev) {
-                self.$common.closeDialog(dialogOption.dialog);
-              },
-              closeDialog() {
-                
-              },
-            },
-          },
-        ],
-      };
-      self.$common.openDialog(dialogOption);
-
-    },
+      }
     },
     created() {
       //this.$api.get('http://10.88.22.52:2828//api/values/test', null, (data) => {

package/src/Form.vue

@@ -1,24 +1,39 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
+    <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
+    <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'Worklist/getLayoutOfAudit'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
 
 <script>
   export default {
-    name: 'App',
+    name: 'DataDrivenForm',
     data() {
       return {
-        apiParam: {
-        actionType: 2,
-        propertyID: "1"
-        } ,
+        // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
+        // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
+        // apiParam: {SN: "13557_132", UserID: "wuhan3"},
+        // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
+        // apiParam: {chanceID: "1", actionType: 2} ,
+        apiParam: {worklistID: "1491261975253094400", actionType: 2}
+        // apiParam: {
+        //   actionType: 2,
+        //   agentId: "1450283160825425922",
+        //   estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
+        //   pageOnly: true,
+        //   pageStyle: 2,
+        //   propertyId: "14102015-0736-9265-205A-451687BF7062",
+        //   relProId: "1475708315466829833",
+        // }
       }
     },
     methods: {

package/src/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
-     <ct-searchlist :searchConditionApi="'/system/menulist/getLayoutOfSearch'" :searchDataApi="'/system/menulist/getList'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/SearchTree.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam"
-                 :searchConditionApi="'/SystemParameterCatalogList/getListOfSearchModel'"
+                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
                  :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -14,11 +14,7 @@
     data() {
       return {
         isShowSearchlist: false,
-        apiParam: {
-          flagSearch: true,
-          searchFields: {},
-          pageAttribute: {pageIndex: 1}
-        }
+        apiParam: {}
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -736,3 +736,8 @@ html {
 .ct-dialog_body .el-card__body{
   padding: 0px 3px 10px 10px!important;
 }
+.ct-text .ct-font-size-mini span{
+  display: inline-block;
+  margin-top: 1px;
+  color: #388cd3;
+}

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

@@ -144,9 +144,7 @@
                     <div class="row-i"><span>装修：</span><span>豪装</span></div>
                     <div class="row-i"><span>租赁期：</span><span>半年</span></div>
                     <div class="row-i"><span>付款方式：</span><span>一次性全款</span></div>
-                    <div class="row-i">
-                      <span>可否注册公司：</span><span>是</span>
-                    </div>
+                    <div class="row-i"><span>可否注册公司：</span><span>是</span></div>
                   </div>
               </div>
               <div class="info-conten-b" v-show="allInfo">

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

@@ -217,6 +217,16 @@
         var router = this.model.buttons.find((v) => {
           return v.id === field.id;
         });
+        if(router==undefined){
+            router = this.model.links.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if(router==undefined){
+            router = this.model.actionRouters.find((v) => {
+            return v.id === field.id;
+          });
+        }
         this.clickHandler(router);
       },
       clickHandler(field, submitData) {
@@ -224,61 +234,139 @@
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
         
-        var clickAcion = function (field) {  
-          if (field.isSubmit) {
-            let verified = true;
-            if (self.validExcute()) {
+        var clickAcion = function (field) {
+          //若不是客户端方法，则直接访问接口
+          if (!field.isClientFuntion) {
+            if (field.isSubmit) {
+              let verified = true;
+              if (self.validExcute()) {
+                if (typeof field.onClick !== 'undefined') {
+                  verified = self.$common.excute.call(self.model.scripts, field.onClick);
+                }
+
+                if (verified) {
+                  //action有值，提交到后台
+                  if (field.action) {
+                    field.disabled = true;//提交按钮禁用
+                    self.model.pageDisabled= true;
+                    field.doAction(self.getFormObj(), (data) => {
+                      if (data.rtnCode === 200) {
+                        if (self.model.flagAlertClose) {
+                          self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                          }).then(() => {
+                            //如果没有弹框 则关闭tab页
+                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
+                              if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                                self.$common.getDataDrivenOpts().handler.closeTab();
+                              }
+                            }
+                            self.$emit('submit', { formData: self.model, responseData: data });
+                          }).catch(() => {
+                            self.init();
+                          });
+                        }
+                        else {
+                          self.$emit('submit', { formData: self.model, responseData: data });
+                        }
+                        if (self.parentModel) {
+                          self.parentModel.$vue.closeTabThen(data);
+                        }
+                      }
+                      field.disabled = false;                    
+                      self.model.pageDisabled= false;
+                    });
+                  }
+                  //无值，触发submit事件
+                  else {
+                    self.$emit('submit', { formData: self.model, responseData: {} });
+                  }
+                }
+              }
+            }
+            else {
               if (typeof field.onClick !== 'undefined') {
                 verified = self.$common.excute.call(self.model.scripts, field.onClick);
               }
 
-              if (verified) {
-                //action有值，提交到后台
-                if (field.action) {
-                  field.disabled = true;//提交按钮禁用
-                  self.model.pageDisabled= true;
-                  field.doAction(self.getFormObj(), (data) => {
-                    if (data.rtnCode === 200) {
-                      if (self.model.flagAlertClose) {
-                        self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
-                          confirmButtonText: '确定',
-                          cancelButtonText: '取消',
-                          type: 'warning'
-                        }).then(() => {
-                          //如果没有弹框 则关闭tab页
-                          if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
-                            if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
-                              self.$common.getDataDrivenOpts().handler.closeTab();
-                            }
-                          }
-                          self.$emit('submit', { formData: self.model, responseData: data });
-                        }).catch(() => {
-                          self.init();
+              if (!submitData) {
+                submitData = {};
+                var tempFormData = self.model.getFormObj();
+                field.submitFormField.forEach((v) => {
+                  submitData[v] = tempFormData[v];
+                });
+              }
+
+              if (field.isOpenForm) {
+                var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [{
+                    component: 'ct-form',
+                    attrs: {
+                      //ssource: data.content,
+                      api: field.action,
+                      apiParam: field.getActionPara(submitData).para,
+                      showTitle: false,
+                      width: field.dialogWidth + 'px',
+                      height: field.dialogHeight + 'px'
+                    },
+                    on: {
+                      submit(ev) {
+                        self.model.updateFields(ev, () => {
+                          self.$refs.Fields.forEach((fd) => {
+                            fd.$forceUpdate();
+                          });
                         });
+                        self.$common.closeDialog(dialogOption.dialog);
                       }
-                      else {
-                        self.$emit('submit', { formData: self.model, responseData: data });
-                      }
-                      if (self.parentModel) {
-                        self.parentModel.$vue.closeTabThen(data);
+                    }
+                  }]
+                };
+                self.$common.openDialog(dialogOption);
+              }
+              else if (field.isOpenList) {
+                var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [{
+                    component: 'ct-searchlist',
+                    attrs: {
+                      searchConditionApi: field.actionForSearchLayout,
+                      searchDataApi: field.actionForSearch,
+                      apiParam: submitData,
+                      width: field.dialogWidth + 'px',
+                      height: field.dialogHeight + 'px'
+                    },
+                    on: {
+                      submit(ev) {
+                        self.model.updateFields(ev, () => {
+                          self.$refs.Fields.forEach((fd) => {
+                            fd.$forceUpdate();
+                          });
+                        });
+                        self.$common.closeDialog(dialogOption.dialog);
                       }
                     }
-                    field.disabled = false;                    
-                    self.model.pageDisabled= false;
-                  });
-                }
-                //无值，触发submit事件
-                else {
-                  self.$emit('submit', { formData: self.model, responseData: {} });
-                }
+                  }]
+                };
+                self.$common.openDialog(dialogOption);
+              }
+              else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+                submitData = field.getActionPara(submitData).para;
+                self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+              }
+              else if (field.isBrowserNewTab) {// 浏览器打开
+                submitData = field.getActionPara(submitData).para;
+                let query = self.$common.objectToQueryStr(submitData);
+                window.open(field.action + query, "_blank");
               }
             }
           }
+          //执行客户端脚本
           else {
-            if (typeof field.onClick !== 'undefined') {
-              verified = self.$common.excute.call(self.model.scripts, field.onClick);
-            }
-
             if (!submitData) {
               submitData = {};
               var tempFormData = self.model.getFormObj();
@@ -286,71 +374,11 @@
                 submitData[v] = tempFormData[v];
               });
             }
-
-            if (field.isOpenForm) {
-              var dialogOption = {
-                title: field.pageTitle,
-                pane: self.$common.getParentPane(self),
-                content: [{
-                  component: 'ct-form',
-                  attrs: {
-                    //ssource: data.content,
-                    api: field.action,
-                    apiParam: field.getActionPara(submitData).para,
-                    showTitle: false,
-                    width: field.dialogWidth + 'px',
-                    height: field.dialogHeight + 'px'
-                  },
-                  on: {
-                    submit(ev) {
-                      self.model.updateFields(ev, () => {
-                        self.$refs.Fields.forEach((fd) => {
-                          fd.$forceUpdate();
-                        });
-                      });
-                      self.$common.closeDialog(dialogOption.dialog);
-                    }
-                  }
-                }]
-              };
-              self.$common.openDialog(dialogOption);
-            }
-            else if (field.isOpenList) {
-              var dialogOption = {
-                title: field.pageTitle,
-                pane: self.$common.getParentPane(self),
-                content: [{
-                  component: 'ct-searchlist',
-                  attrs: {
-                    searchConditionApi: field.actionForSearchLayout,
-                    searchDataApi: field.actionForSearch,
-                    apiParam: submitData,
-                    width: field.dialogWidth + 'px',
-                    height: field.dialogHeight + 'px'
-                  },
-                  on: {
-                    submit(ev) {
-                      self.model.updateFields(ev, () => {
-                        self.$refs.Fields.forEach((fd) => {
-                          fd.$forceUpdate();
-                        });
-                      });
-                      self.$common.closeDialog(dialogOption.dialog);
-                    }
-                  }
-                }]
-              };
-              self.$common.openDialog(dialogOption);
-            }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
-              submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
-            }
-            else if (field.isBrowserNewTab) {// 浏览器打开
-              submitData = field.getActionPara(submitData).para;
-              let query = self.$common.objectToQueryStr(submitData);
-              window.open(field.action + query, "_blank");
-            }
+            submitData = field.getActionPara(submitData).para;
+            let title=field.pageTitle==undefined ?field.label:field.pageTitle;
+            submitData.actionType=field.actionType;
+            var fun =self.$common.getDataDrivenOpts().handler[field.action];
+            fun(submitData,title,self.model);
           }
         }
 

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

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

@@ -16,17 +16,17 @@
     data() {
       return {
         activeName: '1',
-        editableTabs: [
-          { name: '1', title: '用户管理' },
-          { name: '2', title: '配置管理' },
-          { name: '3', title: '角色管理' },
-          { name: '4', title: '定时任务补偿' },
-          { name: '5', title: '定时任务补偿2' },
-          { name: '6', title: '定时任务补偿3' },
-          { name: '7', title: '定时任务补偿4' },
-          { name: '8', title: '定时任务补偿5' },
-          { name: '9', title: '定时任务补偿6' },
-          { name: '10', title: '定时任务补偿7' }
+        editableTabs: [
+          { name: '1', title: '用户管理' },
+          { name: '2', title: '配置管理' },
+          { name: '3', title: '角色管理' },
+          { name: '4', title: '定时任务补偿' },
+          { name: '5', title: '定时任务补偿2' },
+          { name: '6', title: '定时任务补偿3' },
+          { name: '7', title: '定时任务补偿4' },
+          { name: '8', title: '定时任务补偿5' },
+          { name: '9', title: '定时任务补偿6' },
+          { name: '10', title: '定时任务补偿7' }
         ],
       }
     },

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

@@ -118,6 +118,23 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           return rtn._links;
         }
       },
+      _actionRouters: null,
+      get actionRouters() {
+        if (rtn._actionRouters !== null) {
+          return rtn._actionRouters;
+        }
+        else {
+          rtn._actionRouters = [];
+          if (source.actionRouters) {
+            source.actionRouters.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              rtn._actionRouters.push(button);
+            });
+          }
+          return rtn._actionRouters;
+        }
+      },
       get optionApi() {
         return source.parameterAction;
       },

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

package/src/main.js

@@ -12,7 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.22.13:7070/v1/form/router',
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -20,6 +21,12 @@ Vue.use(centaline, {
     openTab: function (action) {
       alert("打开tab页:" + action)
     },
+    openDetail: function (action) {
+      alert("打开tab页:" + action)
+    },
+    openPropertyDetailRET: function (submitData, pageTitle, parentModel) {
+      alert("打开tab页:" + pageTitle)
+    },
     // 关闭当前tab
     closeTab: function () {
       alert("关闭当前tab")
@@ -27,10 +34,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI4Mzg3ZjkwLTI3YWItNDA4Yy1hNjRjLTE3ODIxNDM1M2FiNyJ9.4EFMLNBVU1ZCoJ5o-CjXum7IC-Lb2ljZsi-qCNAQcfdw8NIYp7Ul93in3iZCI69sLZz2N6F7Gnxh6Hbj5JLEJg',
-        oldToken: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQwY2ExYmMyLWNiNzMtNDI2Mi05NmM0LThiYjg0NDBkODE3ZCJ9.AIXWKaRyCwxYiPAqGhT0A01YN7tpX_nW9oU5YDwuC3GIRSn5DQS82Kh1Q7u6eHIz1BySWc-SOEqSTB3283_Z7A',
-        estateId: '201509230915485D942241BBA30FF49F',
-        originalRequestURL: 'http://localhost:8080'
+        oldToken: '3007e478-86db-4d5a-8ce0-7253afb746b2',
+        estateId: '20210729104021C49F04B55C50F6AF58',
+        originalRequestURL: 'http://10.88.22.67:8080',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作