centaline-data-driven 1.1.50 → 1.1.51

package/package.json

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

package/src/Edit.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="app">
-    <formListTable></formListTable>
+    <!-- <formListTable></formListTable> -->
+    <el-button @click="copyField">test</el-button>
   </div>
   
 </template>
@@ -21,7 +22,40 @@
       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,37 +1,24 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'PropertyKey/getLayoutOfNew'" :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="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
 
 <script>
   export default {
-    name: 'DataDrivenForm',
+    name: 'App',
     data() {
       return {
-        // 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: {
-        //   actionType: 2,
-        //   agentId: "1450283160825425922",
-        //   estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
-        //   pageOnly: true,
-        //   pageStyle: 2,
-        //   propertyId: "14102015-0736-9265-205A-451687BF7062",
-        //   relProId: "1475708315466829833",
-        // }
+        apiParam: {
+        actionType: 2,
+        propertyID: "1"
+        } ,
       }
     },
     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="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
+     <ct-searchlist :searchConditionApi="'/system/menulist/getLayoutOfSearch'" :searchDataApi="'/system/menulist/getList'"></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/centaline/dynamicForm/src/dynamicForm.vue

@@ -410,12 +410,12 @@
         var self = this;
         var submitData = {};
         var tempFormData = self.model.getFormObj();
+
         var check = true;
         var checkMsg;
         router.submitFormField.forEach((v) => {
           submitData[v] = tempFormData[v];
-
-          if (typeof tempFormData[v] === "undefined" || tempFormData[v] === '') {
+          if (typeof tempFormData[v] === "undefined") {
             if (self.model.fieldsDic[v]) {
               checkMsg = "请先录入" + self.model.fieldsDic[v].label;
             }

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

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import common from '../common';
+import Enum from '../loader/src/ctl/lib/Enum';
 import Axios from 'axios';
 const formData = {
     install(Vue) {
@@ -230,7 +231,7 @@ const formData = {
     //获取后台数据，并返回脚本。
     execServerScript(action, object, successCallback) {
         let formData = this;//作用域保存
-
+debugger;
         //是否是行内触发的
         let data = this.getListField(this.form.scripts.$fd, null, null);
         object.editMode = data ? 1 : 0;

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const HyperLink = function (source) {
   var 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/Router.js

@@ -146,7 +146,8 @@ const Router = function (source) {
       return source.rightField;
     },
     get submitFormField() {
-      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null) {
+     
+      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
         return [];
       }
       var submitArr = [];
@@ -156,7 +157,7 @@ const Router = function (source) {
       return submitArr;
     },
     get submitListField() {
-      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null) {
+      if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
         return [];
       }
       var submitArr = [];

package/src/main.js

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