centaline-data-driven 1.1.60 → 1.1.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.1.60",
+  "version": "1.1.61",
   "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="'/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="'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,
-        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: "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,8 @@
 <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="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/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/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -180,7 +180,7 @@
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
-                  <el-menu :default-active="model.activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+                  <el-menu :default-active="model.activeIndex" class="el-menu-demo el-menu-detail" mode="horizontal" @select="handleSelect">
                     <el-menu-item v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()">
                       {{col.appName}}
                     </el-menu-item>
@@ -604,6 +604,7 @@
       load(data) {
         this.model = data; 
         this.loadFields();
+        this.setDetailHeight();
       },
       loadFields() {
         var self = this;
@@ -657,14 +658,11 @@
       },
       setDetailHeight() {
         this.$nextTick(() => {
-          if (this.$refs.detail) {
+          if (this.$refs.detail && this.$refs.main) {
             var h1 = this.$refs.main.offsetHeight | 0;
-            var h2 = this.$refs.detail.offsetTop | 0;
-            let detailHeight = h1 - h2 - 5;
+            var h3 = this.$refs.detail.offsetTop | 0;
+            let detailHeight = h1 - h3 - 65;
             this.model.detailHeight = detailHeight < 40 ? 350 : detailHeight;
-            console.log(h1);
-            console.log(h2);
-            console.log(this.model.detailHeight);
           }
         });
       }, 

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/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

@@ -494,7 +494,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
         if (self.primaryKey) {
           searchFields.fields.push({
-            fieldName1: self.primaryKey,
+            fieldName1: self.primaryFieldMappingDBName?self.primaryFieldMappingDBName:self.primaryKey,
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
@@ -563,6 +563,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get primaryKey() {
         return common.initialsToUpperCase(source.content.primaryFieldName);
       },
+      get primaryFieldMappingDBName() {
+        return source.content.primaryFieldMappingDBName;
+      },
       get $index() {
         if (this.$rowCount > 0) {
           return this.selectIndex + 1;

package/src/main.js

@@ -12,7 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.23.22: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: {
@@ -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,9 +34,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijg4MjUzNTNmLTQwY2QtNDk0OS1iMmFiLTNkYmZkM2VhOGY5YyJ9.vST557XxrpihiQfogTXgGmcfvAHprul0hGGME864lEIvU51ZBEEns-kUjUj0FsH_YTEb98CZPwD5-_3jDE7w8g',
-        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',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作