centaline-data-driven 1.1.62 → 1.1.66

package/build/centaline/centaline.path.js

@@ -31,6 +31,7 @@ const paths = {
     "dynamicRichText": "./src/centaline/dynamicRichText/index.js",//纯文本
     "dynamicComboBoxWithTextBox": "./src/centaline/dynamicComboBoxWithTextBox/index.js",//下拉框+文本
     "dynamicHyperLink": "./src/centaline/dynamicHyperLink/index.js",//带标签的超链接
+    "dynamicHyperLinkList": "./src/centaline/dynamicHyperLinkList/index.js",//带标签的超链接List
     "dynamicPlaceHolder": "./src/centaline/dynamicPlaceHolder/index.js",//占位控件
     "dynamicDetail": "./src/centaline/dynamicDetail/index.js",//详情页控件
     "dynamicTree": "./src/centaline/dynamicTree/index.js",//树组件

package/package.json

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

package/src/Form.vue

@@ -24,7 +24,7 @@
         // 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: {worklistID: "1494206747714392064", actionType: 2}
         // apiParam: {
         //   actionType: 2,
         //   agentId: "1450283160825425922",

package/src/SearchList.vue

@@ -1,8 +1,16 @@
 <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="'/PropertyRETList/getLayoutOfSearch'"
+                   :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
+                   :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
+                    :searchStatsApi="'/exampleList/getListStats'"
+                   ></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,6 +1,6 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
-    <ct-treelist :flagsearch="true" :apiParam="apiParam"
+    <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'180'"
                  :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
                  :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>

package/src/centaline/css/common.css

@@ -566,11 +566,10 @@ html {
 
 .ct-searchtable{
   margin-top: 10px;
-  padding: 20px 10px 0 0px;
+  padding: 20px 10px 0 15px;
   background: #fff;
   -webkit-box-sizing: border-box;
   border-radius:6px;
-
 }
 
 .ct-unitname {
@@ -589,11 +588,13 @@ html {
     background-color: #bebebe;
     height: 5px;
     border-radius: 4px;
+    display: block;
 }
- ::-webkit-scrollbar {
+::-webkit-scrollbar {
   width: 6px;
   height:6px;
-  background-color: #f1f1f1
+  background-color: #f1f1f1;
+  display: block;
  }
 
 .el-input-group__append, .el-input-group__prepend {
@@ -712,7 +713,7 @@ html {
   right: 10px !important;
 }
 .ct-table-content{
-  padding: 0 15px;
+  padding: 0;
 }
 .el-card.is-always-shadow {
   border: none;

package/src/centaline/css/max.css

@@ -146,6 +146,12 @@
     width:4px;
     height:6px;
 }
+.ct-selectOptionVertical::-webkit-scrollbar {
+    width: 6px!important;
+    height:6px!important;
+    background-color: #f1f1f1!important;
+    display: block!important;
+   }
 .ct-table-auto{
     white-space: nowrap;
 }
@@ -206,3 +212,19 @@
     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: 0px;
+  }
+  .details-content .ct-search-list .ct-searchtable .ct-table-content{
+      padding: 0;
+  }
+  .ct-unitname {
+      display: contents;
+  }
+ .hyperLinkList .el-button + .el-button{
+      margin-left: 0!important;
+  }

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

@@ -235,14 +235,14 @@
                 <el-tabs :value="model.activeIndex2" @tab-click="handleClick">
                   <el-tab-pane v-for="(col, index) in model.tags2" :key="col.appID" 
                   :index="index.toString()" :name="index.toString()" :label="col.appName">
-                    <div class="el-tabs__content">
-                        <div v-if="col.appID==='Maintain'" role="tabpanel" id="pane-first" aria-labelledby="tab-first" class="el-tab-pane">
+                    <div v-if="col.appID==='Maintain'" class="el-tabs__content">
+                        <div v-if="col.list" role="tabpanel" aria-labelledby="tab-first" class="el-tab-pane">
                           <div class="tab-conten">
-                            <img src="/static/img/user-head.d2916812.png">
+                            <img :src="col.list[0].maintainEmpUrl">
                             <div class="user-name">
-                              <div class="text">柳晓青</div><span class="user-but">系统管理组</span>
+                              <div class="text">{{col.list[0].maintainEmpName}}</div><span class="user-but">{{col.list[0].maintainDeptName}}</span>
                             </div>
-                            <div class="text">13736376666</div>
+                            <div class="text">{{col.list[0].mobileNo}}</div>
                           </div>
                           <div v-show="allIn" class="tab-conten">
                             <img src="/static/img/user-head.d2916812.png">
@@ -255,9 +255,9 @@
                             <img src="../../../assets/mero.png" alt="" class="mero" >  <!--:class="allIn?'more-colose':'more-open'" -->
                           </div>
                         </div>
-                        <div v-else>
-                          22222222222222
-                        </div>
+                    </div>
+                    <div v-else class="el-tabs__content">
+                      <div v-for="(m, i) in col.list" class="text" :key="i">{{m.dutyEmpName}}</div>
                     </div>
                   </el-tab-pane>
                 </el-tabs>
@@ -524,6 +524,9 @@
         var self = this;
         this.model = data; 
         this.loadFields();
+        if(this.model.tags2 && this.model.tags2[0]){
+          this.model.getTags2List(0);
+        }
         this.setDetailHeight();
         this.$nextTick(() => {
           window.addEventListener("resize", (ev) => {
@@ -579,7 +582,10 @@
         console.log('submit!');
       },
       handleClick(tab, event) {
-          console.log(tab, event);
+        let i=tab.index;
+        if(this.model.tags2 && this.model.tags2[i]){
+          this.model.getTags2List(i);
+        }
       },
       setDetailHeight() {
         this.$nextTick(() => {
@@ -948,7 +954,16 @@
             }
           }
         }
+        
         .tablist-info {
+          .details-tabs-box{
+            
+            .el-menu--horizontal > .el-menu-item{
+              height: 30px;
+              line-height: 30px;
+              border-radius: none;
+            }
+          }
         }
 
         .contribute-info {
@@ -1266,6 +1281,7 @@
 .r{
   float: right;
 }
+
 </style>
 
 

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

@@ -214,6 +214,7 @@
         });
       },
       fieldClickHandler(field) {
+        let submitData=null;
         var router = this.model.buttons.find((v) => {
           return v.id === field.id;
         });
@@ -223,11 +224,17 @@
           });
         }
         if(router==undefined){
-            router = this.model.actionRouters.find((v) => {
+          router = this.model.actionRouters.find((v) => {
             return v.id === field.id;
           });
         }
-        this.clickHandler(router);
+        if(router && field.isSubmitDataFromSelf){
+          submitData={};
+          router.submitFormField.forEach((v) => {
+            submitData[v] = field.list[field.listIndex].code;
+          });
+        }
+        this.clickHandler(router,submitData);
       },
       clickHandler(field, submitData) {
         var self = this;
@@ -367,6 +374,7 @@
           }
           //执行客户端脚本
           else {
+            debugger
             if (!submitData) {
               submitData = {};
               var tempFormData = self.model.getFormObj();
@@ -393,12 +401,12 @@
             //type: 'warning'
             center: field.alertCenter
           }).then(() => {
-            clickAcion(field);
+            clickAcion(field,submitData);
           }).catch(() => {
           });
         }
         else {
-          clickAcion(field);
+          clickAcion(field,submitData);
         }
       },
       changeHandler(field) {

package/src/centaline/dynamicHyperLinkList/index.js

@@ -0,0 +1,11 @@
+import dynamicHyperLinkList from './src/dynamicHyperLinkList'
+
+dynamicHyperLinkList.install = function (Vue) {
+  Vue.component(dynamicHyperLinkList.name, dynamicHyperLinkList);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicHyperLinkList);
+}
+
+export default dynamicHyperLinkList

package/src/centaline/dynamicHyperLinkList/src/dynamicHyperLinkList.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-text ct-flex-div hyperLinkList" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
+        <span>{{model.label}}</span>
+      </div>
+      <el-button v-for="(r, i) in model.list" style="padding-left: 15px;"
+                :key="i"
+                 :type="r.isHyperLink ? 'text' : 'primary'"
+                 v-bind="r.attrs" @click="clickHandler(i)">
+        {{r.name}}
+      </el-button>
+    </div>
+  </div>
+  
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  export default {
+    name: 'ct-hyperLinkList',
+    props: {
+      vmodel: Object,
+      fileData: Object
+    },
+    mixins: [dynamicElement],
+    data: function () {
+      return {};
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.HyperLink(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+    },
+    computed: {
+      headers() {
+        return this.$common.getDataDrivenOpts().handler.getRequestHeaders();
+      }
+    },
+    methods: {
+      handleAvatarSuccess(res) {
+        let self = this;
+        this.$api.postThenHandler({ data: res}).then(function () {
+          self.$emit('importComplete', res);
+        });
+      },
+      handleAvatarError(info) {
+        this.$message.warning("失败,请重试");
+      },
+      clickHandler(i) {
+        this.model.listIndex=i;
+        this.$emit('click');
+      },
+    }
+  }
+</script>

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -4,7 +4,7 @@
       <el-input v-model="model.labelValue" v-bind="model.attrs"
                 :class="[model.showLabel?'showLabel':'',!valid?'inputError':'','lableinput']"
                 :type="model.showLabel? 'text':'textarea'"
-                style="flex:1" autosize :readonly="true" :disabled="model.lock" autocomplete="on">
+                style="flex:1" autosize :readonly="true" autocomplete="on">
         <div v-if="model.showLabel && model.label" slot="prepend" class="" :class="[model.labelClass]">
           {{model.label}}
         </div>

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

@@ -11,7 +11,7 @@
     :categoryLoaded="loaded.categoryLoaded" @search="search()" 
     @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-    <ct-searchtable ref="table" :api="searchDataApi" :searchDataStatisticsApi="searchDataStatisticsApi" 
+    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" 
     @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
@@ -36,7 +36,7 @@
       searchCategoryApi: String,
       searchConditionApi: String,
       searchDataApi: String,
-      searchDataStatisticsApi: String,
+      searchStatsApi: String,
       pageHeight: String,
       apiParam: {
         type: Object,
@@ -79,6 +79,7 @@
       screenLoaded(defaultSearch) {
         this.loaded.screenLoaded = true;
         this.$refs.table.searchComplate(this.$refs.screen.model, defaultSearch);
+ 
         this.$emit('loaded', this.$refs.screen.model);
       },
       categoryLoaded(param) {
@@ -100,6 +101,8 @@
         else {
           this.$refs.table.searchComplate(this.$refs.screen.model);
         }
+
+        this.$refs.table.loadStats();
       },
       searchComplate() {
         this.pageDisabled=false;

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -1,6 +1,11 @@
 <template>
   <div style="width:100%;" class="ct-searchtable" ref="searchTable">
-    <ct-tableStatistics ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader" v-if="!isLoading && searchDataStatisticsApi"></ct-tableStatistics>
+
+    <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
+                   v-if="!isLoading&&searchStatsApi"
+                   :api="searchStatsApi"
+                   @searchStats="searchStats"
+                   :searchModel="model.searchModel"></ct-tableStats>
     <ct-tabletoolbar ref="toolbar" v-if="!isLoading" :buttons="model.buttons"
                      @click="toolbarClickHandler($event)"
                      @importComplete="importComplete"
@@ -109,6 +114,8 @@
               </td>
             </tr>
 
+
+
             <!--适配滚动条-->
             <tr v-else v-bind:style="{ height: row.$heigth + 'px' }"></tr>
           </tbody>
@@ -126,19 +133,19 @@
   import dynamicElement from '../../mixins/dynamicElement';
   import dynamicTableTip from './dynamicTableTip.vue';
   import dynamicTableToolbar from './dynamicTableToolbar.vue';
-  import dynamicTableStatistics from './dynamicTableStatistics.vue';
+  import dynamicTableStats from './dynamicTableStats.vue';
   export default {
     name: 'ct-searchtable',
     mixins: [dynamicElement],
     components: {
       'ct-tabletip': dynamicTableTip,
       'ct-tabletoolbar': dynamicTableToolbar,
-      'ct-tableStatistics': dynamicTableStatistics
+      'ct-tableStats': dynamicTableStats
     },
     props: {
       vmodel: Object,
       api: String,
-      searchDataStatisticsApi: String
+      searchStatsApi: String
     },
     computed: {
     },
@@ -191,7 +198,7 @@
             self.colHasWidth[vi] = 'nowidth';
           }
         });
-        
+
         self.isLoading = false;
         self.$forceUpdate();
         this.model.scripts.formData = this.model.formData;
@@ -208,7 +215,10 @@
         }
         self.tableComplate = true;
         this.setTableHeight();
+
+
         this.$nextTick(() => {
+          self.loadStats();
           window.addEventListener("resize", (ev) => {
             self.setTableHeight();
           });
@@ -335,8 +345,10 @@
             self.rowColorChange();
           }
           self.$emit('searchComplate');
+
         }
         self.tableLoading = true;
+
         this.model.getPage(index, next);
       },
       toSort(ev, col, action) {
@@ -529,13 +541,12 @@
               this.currentRow.children[i].classList.remove('select');
             }
           }
-          if(this.$refs['rows.' + index][0])
-          {
+          if (this.$refs['rows.' + index][0]) {
             for (var j = 0; j < this.$refs['rows.' + index][0].children.length; j++) {
               this.$refs['rows.' + index][0].children[j].classList.add('select');
             }
           }
-          this.currentRow = this.$refs['rows.' + index][0]||null;
+          this.currentRow = this.$refs['rows.' + index][0] || null;
         }
       },
       resetScroll: function () {
@@ -581,7 +592,9 @@
       },
       searchComplate(m, defaultSearch) {
         var self = this;
+
         this.$nextTick(function () {
+
           if (typeof this.api !== 'undefined') {
             self.loaderObj.SearchTable(self.api, self.load, m, defaultSearch);
           }
@@ -754,9 +767,12 @@
                 self.operationLoading = true;
                 field.doAction(submitData, (data) => {
                   self.operationLoading = false;
-                  self.model.doAction({ responseData: data });
+                  if (!field.flagFreshCurrentRow) {
+                    self.model.doAction({ responseData: data });
+                  }
                   self.$forceUpdate();
                   self.$refs.footer.$forceUpdate();
+                  self.updateCurrentRow(field);
                 })
               }
             }
@@ -765,10 +781,10 @@
           else {
             // let parm={submitData:submitData,field:field}
             // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
-            let title=field.pageTitle==undefined ?field.label:field.pageTitle;
-            submitData.actionType=field.actionType;
-            var fun =self.$common.getDataDrivenOpts().handler[action];
-            fun(submitData,title,self.model);
+            let title = field.pageTitle == undefined ? field.label : field.pageTitle;
+            submitData.actionType = field.actionType;
+            var fun = self.$common.getDataDrivenOpts().handler[action];
+            fun(submitData, title, self.model);
             // var fun = self.model.scripts.formData[action];
             // fun(submitData,field);
           }
@@ -867,6 +883,16 @@
           self.$forceUpdate();
           self.$refs.footer.$forceUpdate();
         }
+      },
+      loadStats() {
+        if (this.searchStatsApi) {
+          this.$refs.tableStats.searchStatsComplate();
+        }
+      },
+      searchStats(m) {
+        let self = this;
+        self.model.searchStats = m;
+        self.getPage(1);
       }
     },
   }</script>
@@ -897,17 +923,21 @@
     cursor: default;
     background-color: #ffffff;
   }
-  .ct-searchtable .ct-tr > .ct-td1 {    
+
+  .ct-searchtable .ct-tr > .ct-td1 {
     border-right: 1px solid #e7e8eb;
     border-left: 1px solid #e7e8eb;
   }
-  .ct-searchtable .ct-tr:last-child > .ct-td1 {    
+
+  .ct-searchtable .ct-tr:last-child > .ct-td1 {
     border-bottom: 1px solid #e7e8eb;
   }
+
   .ct-searchtable .ct-tr > .ct-td2 {
     border-bottom: 1px solid #e7e8eb;
   }
-  .ct-searchtable .ct-tr > .ct-td3 {    
+
+  .ct-searchtable .ct-tr > .ct-td3 {
     border: 1px solid #e7e8eb;
   }