centaline-data-driven 1.3.86 → 1.3.88

package/package.json

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

package/src/centaline/css/ccai.css

@@ -5,4 +5,7 @@
 .ccai.button-absolute{
    bottom: 26px;
    width: calc(100% - 47px);
+}
+.ccai.ct-tags .ct-tags-mini{
+font-size: 12px !important;
 }

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

@@ -728,7 +728,7 @@
           return;
         }
         if(router.id.indexOf('_')===0){
-          // flagSearchlist=true;
+          flagSearchlist=true;
         }
 
         submitData = router.getActionPara(submitData).para;
@@ -747,6 +747,7 @@
               height: (router.dialogHeight || 500) + 'px',
               documentHeight:self.documentHeight,
               documentWidth:self.documentWidth,
+              flagPopupSearchlist:flagSearchlist,
             },
             on: {
               submit(option) {

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

@@ -13,10 +13,10 @@
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight" 
-      @loaded="tableLoaded" :documentWidth="documentWidth" 
+      @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" 
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
-      @showTitle="showTitleHandler"></ct-searchtable>
+      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
@@ -71,6 +71,10 @@
         String,
         default: 'auto',
       },
+      flagPopupSearchlist:{
+        Boolean,
+        default:false,
+      },
     },
     created() {
       this.model = this.vmodel;
@@ -307,6 +311,10 @@
       doClosePopoverHandle(){
         this.$refs.screen.$refs.doClosePopover.click();
       },
+      popupClickHandler(tempListData){
+        this.$emit('submit', tempListData);
+        this.$common.closeDialog(this);
+      },
     },
     beforeDestroy() {
       async function destroyDeep(vnode) {

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

@@ -151,7 +151,10 @@
     </div>
 
     <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading && !isLayout && model"></ct-tabletip>
-    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading && !isLayout && model"></ct-tabletip>
+    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading && !isLayout && model"></ct-tabletip>    
+    <div ref="popupButton" v-if="flagPopupSearchlist" style="margin-top: 10px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
+      <el-button size="mini" @click="popupClickHandler()" class="max-search-btn" style="float:right;" type="primary">确认</el-button>
+    </div>
     <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top: 30px"></div>
   </div>
 </template>
@@ -194,6 +197,10 @@
         String,
         default: 'auto',
       },
+      flagPopupSearchlist:{
+        Boolean,
+        default:false,
+      },
     },
     computed: {},
     data() {
@@ -595,7 +602,8 @@
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
             var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 22;
+            var h8 = this.$refs.popupButton?this.$refs.popupButton.offsetHeight+21 : 0;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 -h8 - 22;
             this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
@@ -864,7 +872,7 @@
                 self.$common.viewerfile(field, MediaAlbum, 0, 0);
               }
             }
-            else if (field.isUrlInLayer) {//URL页面（弹层）
+            else if (field.isUrlInLayer) {//URL页面（弹层iframe）
               var dialogOption = {
                 title: field.pageTitle,
                 pane: self.$common.getParentPane(self),
@@ -1567,6 +1575,15 @@
           self.updateCurrentRow(field, data);
         }
       },
+      popupClickHandler() {
+        var tempListData = this.model.getSelectRowData({isMulti:this.model.isMulti});
+        if (tempListData != null && tempListData.length>0) {
+          this.$emit('popupClickHandler', tempListData);
+        }
+        else {          
+          this.$message.error("请先选择数据");
+        }
+      },
     },
   };
 </script>

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -113,7 +113,14 @@
         var self = this;
         self.showDrop=false;
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
-          self.selectOptionArr(optionArr);
+          optionArr.forEach(row => {
+            if(self.model.type===3){
+              self.model.value=self.model.value+row[self.model.optionAttrs.label];
+            }
+            else {
+              self.model.value=row[self.model.optionAttrs.label];
+            }
+          });          
         });
       },
     },

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="field-top">
-    <div class="ct-tags" style="width:100%;display:flex">
+    <div class="ccai ct-tags" style="width:100%;display:flex">
       <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-tags-'+model.attrs.size:''
     ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
         <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -22,7 +22,7 @@ export default {
     searchConditionApi: String,
     searchDataApi: String,
     flagsearch: Boolean,
-    searchtreeHeight: String,
+    searchtreeHeight: Number,
     screenPara: {
       type: Object,
       default: () => { }
@@ -388,6 +388,9 @@ export default {
     //filterText(val) {
     //  this.$refs.trees.filter(val);
     //}
+    searchtreeHeight: function (val) {
+      this.setTreeHeight();
+    }
   },
   created() {
     this.model = this.vmodel;

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -43,7 +43,7 @@ export default {
     vmodel: Object,
     searchConditionApi: String,
     searchDataApi: String,
-    leftWidth: Number,
+    leftWidth: String,
   },
   data() {
     return {
@@ -91,10 +91,16 @@ export default {
   },
   created() {
     this.model = this.vmodel;
-    this.$nextTick(() => {
-      this.searchtreeHeight = this.$refs.tree_left.$el.offsetHeight;
+  },
+  mounted() {
+    let self = this;
+    window.addEventListener('resize', function () {
+      self.$nextTick(() => {
+        self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
+      })
     })
-  }
+    self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
+  },
 }
 
 </script>

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

@@ -69,7 +69,7 @@ const FormList = function (source, master) {
     },
     getFormObj() {
       let rtnFormArr = [];
-      
+      debugger
       for (let i = 1; i < rtn.rows.length; i++) {
         let rtnFormObj = {};
         rtn.rows[i].field.forEach((s) => {
@@ -464,8 +464,10 @@ const FormList = function (source, master) {
     deleteAll() {
       if(rtn._rows && rtn._rows.length>1){
         let index=0;
+        //如果是接口返回的数据需要保留，并且标识成删除
         var newRows=[]
         rtn._rows.forEach((r) => {
+          //排除表头数据
           if(index>0){
             if (!r.isNewFlag) {           
               r.deleted = true;
@@ -476,9 +478,15 @@ const FormList = function (source, master) {
             index++;
           }
         });
+        //清空列表数据需要保留表头数据
         rtn._tableData.splice(0,rtn._tableData.length);
-        source.rows.splice(1, source.rows.length-1,newRows);
-        rtn._rows.splice(1, rtn._rows.length-1,newRows);
+        source.rows.splice(1, source.rows.length-1);
+        rtn._rows.splice(1, rtn._rows.length-1);
+        if(newRows.length>0)
+        {
+          source.rows.push(newRows);
+          rtn._rows.push(newRows);
+        }
       }    
     }, 
     insertRow(rows) {

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

@@ -265,10 +265,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               return ro.$select === true;
             });
             return rtnData;
-          } else {
+          } 
+          else {
             return [rtn.listData[rtn.selectIndex]];
           }
-        } else {
+        } 
+        else {
           return [rtn.listData[rtn.selectIndex]];
         }
       },

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

@@ -3,6 +3,15 @@ import Base from './Base';
 import valid from '../../../validate/index';
 const T = function (source, inputType, readonly, isPassword,moreActionRouter) {
   var rtn = {
+    optionAttrs: {
+      rowid: 'rowID',
+      value: 'code',
+      label: 'name',
+      displayLabel:'displayName',
+      actionType: 'actionType',
+      flagDeleted: 'flagDeleted',
+      locked: 'locked'
+    },
     get clearable() {
       if (typeof source.clear === 'undefined'&&!readonly&&!source.locked) {
         return true;

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe_iuZZw7DhJN0jLwiGqBKVSmRBtJRDi7oBot-684Q1v-f8J45yhBreAG1rpwgJuaKUjkuBIW9wHF1FUGD1Fj1E0yrFpOR4aqKDcr1CTqjIFY7iCIU2_YNj4b5jHcjuVxz_OXabhM2u0BD7vGHtyFqVYxkS9wZzIphQKZZ_g9QYAAP__.NJkufTqRBO1yCwbzBg7qYMLBnQZr-gS8CQwQ_y5vf3k',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZh7_b27uj0wMaPIEs8EqyMQKIx_rsYoaP3FZPMa2ZeMM4dVOBXcCc22riCO7HREnH0JA0eok_IwhYDpYCJJfGpbmw61lBAftygIhHh0lG0BQw6_YSl4L9iHvP9nJ__OHedhmWWXci9CqNxJiOrCaidWarPpFEu2pcM7w8AAAD__w.JeIxQIdxvfdXeznKFoGbBpDvbEZYK_5QcpXp3XNAG4c',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',