centaline-data-driven 1.2.13 → 1.2.16

package/package.json

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

package/src/Detail.vue

@@ -7,10 +7,10 @@
 
 <script>
   export default {
-    name: 'App',
+    name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "2"} ,
       }
     },
     mounted() {

package/src/Edit.vue

@@ -1,71 +1,27 @@
 <template>
   <div id="app">
-       <viewer :images="pics">
-            <img v-for="src in pics" :src="src" :key="src">
-      </viewer>
+    <formListTable></formListTable>
   </div>
   
 </template>
 
 <script>
   import formListTable from './centaline/dynamicForm/src/dynamicFormListTable'
- import Viewer from 'v-viewer'
- import 'viewerjs/dist/viewer.css'
- import Vue from 'vue'
- Vue.use(Viewer)
   export default {
     name: 'App',
     components: {
-      'formListTable': formListTable,
+      'formListTable': formListTable
     },
     data() {
       return {
-        template: "",
-         pics:[
-           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
-           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
-           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
-       ],
+        template: ""
       }
     },
     methods: {
       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,40 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/roomtype/readDetail'" :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="'PropertyRealLook/getLayoutOfNew'" :apiParam="para"></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,
-        jsonData: {searchFields: {fields: []}}
-        },
+        // 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: "1494206747714392064", actionType: 2}
+        para: {chanceID: "1", 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

@@ -2,7 +2,7 @@
   <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="'/estatemanage/estatlist/getLayoutOfSearch'" :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
@@ -12,6 +12,7 @@
                    ></ct-searchlist> -->
 
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
+    <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -23,7 +24,8 @@
     data() {
       return {
         //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
-        para: {}
+        // para: {}
+        para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
       }
     },
     mounted() {

package/src/centaline/css/common.css

@@ -765,4 +765,7 @@ html {
 /* 重置弹层引用列表样式居上高度 */
 .ct-dialog_content .ct-searchtable{
   margin-top: 0px!important;
+}
+.ct-table-content .checkbox-td .el-checkbox{
+  min-width: initial;
 }

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -1028,7 +1028,6 @@
               margin-right: 10px;
             }
             .user-name {
-              margin-top: 5px;
               display: flex;
             }
             .text {

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

@@ -544,17 +544,17 @@
         var router = this.model.actionRouters.find((v) => {
           return v.id === field.id;
         });
-        if(router==undefined){
-            router = this.model.actionRoutersMoreList.find((v) => {
+        if(router==undefined && this.model.actionRoutersMoreList){
+          router = this.model.actionRoutersMoreList.find((v) => {
             return v.id === field.id;
           });
         }
-        if(router==undefined){
+        if(router==undefined && this.model.otherTradeActionRouter){
           if(field.id===this.model.otherTradeActionRouter.id){
             router = this.model.otherTradeActionRouter
           }
         }
-        if(router==undefined){
+        if(router==undefined && this.model.operationRouters){
             router = this.model.operationRouters.find((v) => {
               return v.id === field.id;
             });
@@ -656,7 +656,14 @@
               window.open(field.action + query, "_blank");
             }
             else{
-              
+              field.doAction(submitData, (data) => {
+                if (!field.flagFreshCurrentRow) {
+                  self.model.doAction({ responseData: data });
+                  if(callBack){
+                    callBack();
+                  }
+                }
+              })
             }
           }
           //执行客户端脚本
@@ -1114,7 +1121,6 @@
               margin-right: 10px;
             }
             .user-name {
-              margin-top: 5px;
               display: flex;
             }
             .text {

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

@@ -17,7 +17,12 @@
             {{model.label}}
           </div>
         </div>
-        <label class="ct-lable">
+        <span v-if="model.flagJson">
+          <span class="el-tag el-tag--info el-tag--mini" v-for="item in model.labelValue" :key="item" style="box-sizing: border-box;border-color: transparent;margin: 2px 0 2px 6px;">
+            <span class="el-select__tags-text">{{item}}</span>
+          </span>
+        </span>
+        <label v-else class="ct-lable">
           {{model.labelValue}}
         </label>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>

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/dynamicSearchTable.vue

@@ -28,7 +28,7 @@
           <thead ref="tableHead">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
-                <label class="el-checkbox"><span class="el-checkbox__input" :class="headAllCheckClass">
+                <label class="el-checkbox"><span class="el-checkbox__input" :class="model.selectAllType">
                   <span class="el-checkbox__inner"></span>
                   <!-- <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value=""> -->
                   <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="el-checkbox__original checkbox-td-1" aria-hidden="false" />
@@ -164,23 +164,7 @@
       }
     },
     computed: {
-       headAllCheckClass() {
 
-         if(this.selectAllType==1)
-         {
-           return '';
-         }
-         else if(this.selectAllType==2)
-         {
-           return 'is-indeterminate';
-         }
-         else if(this.selectAllType==3)
-         {
-           return 'is-checked';
-         }
-        return '';
-       },
-      
     },
     data() {
       return {

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

@@ -270,15 +270,17 @@ const Detail = function (source,para ,callBack) {
                       rtn._operationList=response.content;
                       if(rtn._operationList && rtn._operationList.length>0){
                         rtn._operationList.forEach((v,i) => {
-                          if (v.modelRouter) {                
-                            var router = Router(v.modelRouter);
-                            router.is = "ct-btn";
-                            router.attrs = { size: "mini" }
-                            if(router.rightField){
-                              router.show=v[router.rightField];
-                            } 
-                            rtn._operationList[i].router=router;
-                            rtn._operationRouters.push(router)
+                          if (v.modelRouters) {
+                            v.modelRouters.forEach((f,i2) => {
+                              var router = Router(f);
+                              router.is = "ct-btn";
+                              router.attrs = { size: "mini" }
+                              if(router.rightField){
+                                router.show=v[router.rightField];
+                              } 
+                              if(router.show)rtn._operationList[i].router=router;
+                              rtn._operationRouters.push(router);
+                            });
                           }
                         });
                       }
@@ -292,20 +294,25 @@ const Detail = function (source,para ,callBack) {
             response = response.responseData;
           }
           if(field.id=='Follow' 
-          || field.id=='Trust'
+          || field.id=='Trust' || field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'
           || field.id=='RealLook'
           || field.id=='StatusAdjust'
-          || field.id=='OperationKey'
+          || field.id=='OperationKey' || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'
           || field.id=='Key'){
             let id=field.id;
-            if(field.id=='OperationKey'){
+            if(field.id=='OperationKey'  || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'){
               id='Key';
             }
+            else if(field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'){
+              id='Trust';
+            }
             var advIndex = rtn.tags1.findIndex((v) => {
               return v.appID === id;
             });
             rtn.$vue.handleSelect({index:advIndex.toString()});
           }
+          else{
+          }
         },
         //检查是否关闭tab后触发来源页面操作
         checkCloseTabThen(notification) {

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

@@ -2,7 +2,24 @@ import base from '../../index';
 import Base from './Base';
 const T = function (source) {
   var rtn = {
+    flagJson:false,
     get labelValue() {
+      let value = [];
+      if(source.code1){
+        try{
+          let obj=JSON.parse(source.code1);
+          if (typeof obj == 'object' && obj) {
+            obj.forEach((v) => {
+              value.push(v.name);
+            });
+            rtn.flagJson=true;
+            return value;
+          }
+        } 
+        catch(e){
+        }
+      }
+
       var val = ""; 
       var lst = [];
       var joinChar = source.joinChar == undefined ? '' : source.joinChar;
@@ -27,8 +44,6 @@ const T = function (source) {
           lst.push(fieldVal);
         }
       }
-
-
     }
   };
   rtn = base.copy(Base(source), rtn);

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/centaline/loader/src/ctl/SearchTable.js

@@ -247,6 +247,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set flagMoreData(v1) {
         source.page.flagMoreData = v1;
       },
+      get selectAllType() {
+        return source.selectAllType||'';
+      },
+      set selectAllType(v1) {
+        source.selectAllType = v1;
+      },
+      
       getSelectRowData(router) {
         if (rtn.listData.length === 0) {
           return null;
@@ -268,7 +275,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       },
       setSelectAll() {
-        debugger
+       
         if (rtn.listData.length === 0) {
           return;
         }
@@ -280,6 +287,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if(!rtnData||rtnData.length>0)
             {
               this.selectAll = 0;
+            }else
+            {
+              this.selectAll = 1;
             }
           }
       },
@@ -287,7 +297,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       getSelectAll()
       {
         if (rtn.listData.length === 0) {
-          return 1;
+          rtn.selectAllType='is-disabled';
+          return;
         }
         if (rtn.isMulti) {
             //找出没有被选中的框
@@ -296,18 +307,20 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             });
             if(rtnData.length<=0)//没有找到未选中的复选框
             {
-              return 3;
+              rtn.selectAllType='is-checked';
+              return;
             }
             if(rtnData.length>0&&rtnData.length<rtn.listData.length)//部分选中
             {
-              return 2;
+              rtn.selectAllType='is-indeterminate';
+              return;
             }
             if(rtnData.length>0&&rtnData.length==rtn.listData.length)//没选中
             {
-              return 1;
+              rtn.selectAllType='';
+              return;
             }
         }
-        return 1;
       },
       _buttons: null,
       get buttons() {
@@ -492,6 +505,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 rtn.dataDictionary = response.content.rows;
                 //self.listData = self.listData.concat(response.content.Rows);
               }
+              rtn.getSelectAll();
               source.page.rows = response.page.rows;
               source.page.rowCount = response.page.rowCount;
               if (typeof response.content.foot !== 'undefined') {

package/src/main.js

@@ -8,12 +8,12 @@ import App from './App';
 import router from './router';
 import centaline from './centaline/index';
 
-
 Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.22.67:9999/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: {
@@ -21,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")
@@ -28,9 +34,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImJhMjA1MWJmLTM3MTQtNGQ2Yi1iMmMzLTM0YzBlOWE4ZjBiNSJ9.Aery7bMGAE_HTh1yX3vFFczELt0dB97ca5jwXXcp8hdhJ_2o8XTrQi314GVz4YoM2dfh8i9qFiU0FCr7TJgZyA',
-        originalRequestURL: 'http://10.88.23.22:9999',
-        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
+        oldToken: '3007e478-86db-4d5a-8ce0-7253afb746b2',
+        estateId: '20210729104021C49F04B55C50F6AF58',
+        originalRequestURL: 'http://10.88.22.67:8080',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作