centaline-data-driven 1.1.63 → 1.1.64

package/build/centaline/webpack.centaline.conf.js

@@ -79,7 +79,7 @@ module.exports = {
       amd: 'vue'
     },
     'element-ui': 'Element',
-    'element-ui/packages/image/src/image-viewer': 'image-viewer'
+    // 'element-ui/packages/image/src/image-viewer': 'image-viewer'
   },
   devtool: '#eval-source-map'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.1.63",
+  "version": "1.1.64",
   "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,39 +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="'/employee/getLayoutOfPwd'" :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: '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: {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",
-        // }
+        apiParam: {
+        actionType: 3,
+        empId:"202105071745197FAD2771D2D7A6A667"
+        },
       }
     },
     methods: {

package/src/SearchList.vue

@@ -1,8 +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="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
+     <ct-searchlist :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'" :searchDataApi="'/estatemanage/estatlist/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/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/getLayoutOfSearch'"
+                 :searchConditionApi="'/SystemParameterCatalogList/getListOfSearchModel'"
                  :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -14,7 +14,11 @@
     data() {
       return {
         isShowSearchlist: false,
-        apiParam: {}
+        apiParam: {
+          flagSearch: true,
+          searchFields: {},
+          pageAttribute: {pageIndex: 1}
+        }
       }
     },
     methods: {

package/src/centaline/css/max.css

@@ -212,3 +212,13 @@
     color: #666;
     border-color:#cecece;
   }
+  .details-content .ct-search-list .ct-ptb5{
+      padding: 0 0 10px 0;
+  }
+  .details-content .ct-search-list .ct-searchtable{
+    margin-top: 0;
+    padding-top: 0px;
+  }
+  .details-content .ct-search-list .ct-searchtable .ct-table-content{
+      padding: 0;
+  }

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

@@ -948,7 +948,16 @@
             }
           }
         }
+        
         .tablist-info {
+          .details-tabs-box{
+            
+            .el-menu--horizontal > .el-menu-item{
+              height: 30px;
+              line-height: 30px;
+              border-radius: none;
+            }
+          }
         }
 
         .contribute-info {
@@ -1266,6 +1275,7 @@
 .r{
   float: right;
 }
+
 </style>
 
 

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

@@ -11,7 +11,7 @@
                 @keyup.enter.native="search()">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
 
-        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
+        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
           <span class="el-input__suffix-inner ct-close">
             <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
           </span>

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

@@ -130,24 +130,102 @@ const SearchScreen = function (source, callBack, screenPara) {
           btn.disabled = loading;
         });
       },
+      //如果是复选框则searchValue1格式为 1,2
       get searchData() {
+      
+        let that=this;
         var rtn = {
           fields: []
         };
         this.screen.forEach((v) => {
-          var tempObj = v.searchObj;
+          var tempObj = common.deepClone(v.searchObj);          
           if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+            if(that.isHandle(v.type))
+            {
+              tempObj.searchValue1=that.getNewSearchValue(tempObj); 
+            }
             rtn.fields.push(tempObj);
+           
           }
         });
         this.highScreen.forEach((v) => {
-          var tempObj = v.searchObj;
+          var tempObj = common.deepClone(v.searchObj);
           if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+            if(that.isHandle(v.type))
+            {
+              tempObj.searchValue1=that.getNewSearchValue(tempObj); 
+            }
             rtn.fields.push(tempObj);
           }
         });
         return rtn;
       },
+      getNewSearchValue(tempObj)
+      {
+          let codeList=JSON.parse(tempObj.searchValue1);
+          let dataType=this.getDataType(tempObj.searchDataType);
+          let code='';
+          let symbol=',';
+          if(dataType==1)
+          {
+            codeList.forEach((v) => {
+              if(!v.flagDeleted&&v.code)
+              {
+                code+= `'${v.code}'${symbol}`;
+              }
+            });
+          }else
+          {
+            codeList.forEach((v) => {
+              if(!v.flagDeleted&&v.code)
+              {
+                code+= `${v.code}${symbol}`;
+              }
+            });
+          }
+          if(code.endsWith(`${symbol}`))
+          {
+            code=code.substring(0,code.length-1);
+          }
+         return code;
+      },
+      //判断控件是否需要单独处理searchValue1
+      isHandle(type)
+      {
+        let result=false;
+        switch (type) 
+        {
+          case Enum.ControlType.CheckBoxList://复选列表
+          result=true;
+          break;
+          default:
+            result=false;
+            break;
+        }
+        return result;
+      },
+       // 1 是字符串 2是数字
+       getDataType(searchDataType)
+       {
+         let dataType=1;
+         switch(searchDataType)
+         {
+           case 2:
+           case 6:
+            dataType=2;
+             break;
+            case 1:
+            case 3:
+            case 4:
+            case 5:
+               dataType=1;
+                break;
+           default:
+                dataType=1;
+               break; 
+         }
+         return dataType;
+       },
       initScreen(screens) {
         var rtnscreens = [];
 

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.67:9999/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,9 @@ 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.eyJsb2dpbl91c2VyX2tleSI6IjdjOWM1ZmE0LWIxM2MtNDQwMC1iYmIzLTYwY2RmY2FhZjNhMyJ9.G5G5kp8BkIhxbXkcWFIEf_2qNQE6N7XQ0hxY34M5FifPsM-X23FVGA6D-zlDWjTO6mo28QY3_3Bb7N6NW2yzjg',
+        originalRequestURL: 'http://10.88.23.22:9999',
+        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作