centaline-data-driven 1.2.18 → 1.2.21

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -1,55 +1,43 @@
 <template>
-  <div style="width:100%" class="ct-photoSelectList" v-if="FlagPhoto">
-    <el-main style="position:absolute; top:60px;bottom:60PX;left:0;right:0;">
-      <el-row :gutter="10">
-        <el-col :span="24"
-                :lg="4"
-                :md="7"
-                :sm="9"
-                v-for="(item, index) in imageList"
-                :key="index">
-          <el-card class="box-card mb-3 position-relative" :class="{'border-danger': item.ischeck }"
-                   :body-style="{ padding: '0' }"
-                   shadow="hover"
-                   style="cursor:pointer;">
-            <div class="border ">
-              <img :src="item.mediaUrl"
-                   alt=""
-                   class="w-100"
-                   style="height:100px;" />
-              <div class="w-100 text-white px-1"
-                   style="background:rgba(0,0,0,0.5);margin-top:-25px; position:absolute">
-                <span class="small">{{item.mediaLabelName }}</span>
-              </div>
-              <div class="p-2 text-center">
-                <el-button-group>
-                  <el-button icon="el-icon-view"
-                             size="mini"
-                             class="p-2"
-                             @click="viewerOpen(imageList,index)"></el-button>
-                  <el-button icon="el-icon-shopping-cart-2"
-                             size="mini"
-                             class="p-2"
-                             @click="choose(item)"></el-button>
-                </el-button-group>
-                <span class="badge badge-danger"
-                      style="position:absolute;right:0;top:0;"
-                      v-if="item.ischeck"></span>
-                <!-- <el-tag type="danger" effect="dark" size="mini" >1</el-tag> -->
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-main>
+  <div style="    width: 100%;height: 100%;position: relative;
+" class="ct-photoSelectList" v-if="FlagPhoto">
+    <el-main style="position: absolute;
+    top: 10px;
+    bottom: 70PX;
+    left: 10px;
+    right: 0;
+    padding:0px">
+      <ul class="el-upload-list el-upload-list--picture-card">
+        <li class="el-upload-list__item is-success" :class="{'border-danger': item.ischeck}"
+            v-bind:key="index"
+            v-for="(item, index) in imageList">
+          <div class="cover-list-item">
+            <el-image fit="fill"
+                      :src="item.thumbnailUrl"
+                      style="width: 100px; height: 100px"
+                      :z-index="previewZIndex"
+                      @click="viewerOpen(imageList, index)">
+            </el-image> 
+            <span class="cover-list-item-span" v-if="item.mediaLabelName">
+              <span class="el-dropdown-link">
+                &nbsp;{{ item.mediaLabelName }}
+              </span>
+            </span>
+            <div class="p-2 text-center">
+              <i class="max-view" @click="viewerOpen(imageList,index)"></i>
+              <i class="max-success" @click="choose(item)" :class="{'ischeck': item.ischeck }"></i>
 
+              <!-- <el-tag type="danger" effect="dark" size="mini" >1</el-tag> -->
+            </div>
+          </div>
+        </li> 
+     </ul>
 
-    <el-row :gutter="10" t>
-      <el-col :span="24" :lg="4" :md="6" :sm="8">
-        <el-button type="primary" @click="handleClick()">选择</el-button>
-      </el-col>
-    </el-row>
+</el-main>
 
+    <div style="width:100%;text-align:center">
+      <el-button type="primary" style="position:absolute;bottom:30px;" @click="handleClick()">选择</el-button>
+    </div>
     <ct-viewer ref="photoSelectListViewer" />
 
   </div>
@@ -99,12 +87,11 @@
     },
     methods: {
       load(data) {
-
         var self = this;
         self.model = data;
 
         try {
-          var sourceRows = self.$common.deepClone(data.source.content.rows);
+          var sourceRows = self.$common.deepClone(data.source.content);
 
           sourceRows.forEach((n) => {
           
@@ -149,7 +136,11 @@
         item.ischeck = false;
       },
       handleClick() {
-        this.$emit('handlePhoto', this.chooseList);
+        if (this.chooseList && this.chooseList.length > 0) {
+          this.$emit('handlePhoto', this.chooseList);
+        } else {
+          self.$message.warning("请选择至少一张图片");
+        }
         
       },
       viewerOpen(list, index) {
@@ -166,6 +157,116 @@
 </script>
 <style> 
   .border-danger {
-    border: 1px solid red;
+    border: 1px solid red !important;
+  }
+  .ct-photoSelectList .cover-list-item-span {
+    position: inherit;
+    bottom: 0px;
+    display: block;
+    background-color: #544f48;
+    opacity: 0.8;
+    text-align: left
+  }
+  .ct-photoSelectList .el-dropdown-link {
+    color: #fff;
+    margin-left:5px
+  }
+  .text-center {
+    position: absolute;
+    top: 0;
+    right: 5px;
+  }
+  .max-view {
+    background: url(../../../assets/ck.png);
+    background-size: 100% 100%;
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+  }
+    .max-success {
+    background: url(../../../assets/succe.png);
+    background-size: 100% 100%;
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+  }
+  .ischeck {
+     background: url(../../../assets/success.png);
+     background-size: 100% 100%;
   }
+
+
+  .ct-upload-display-none .el-upload--picture-card {
+    display: none;
+  }
+
+  .el-upload-list__item .is-ready {
+    width: 100px;
+    height: 100px;
+  }
+
+  .ct-photoSelectList .cover-list-item {
+    position: sticky;
+  }
+
+  .ct-photoSelectList .cover-list-item-span {
+    position: inherit;
+    bottom: 0px;
+    left: 0px;
+    display: block;
+    background-color: #544f48;
+    opacity: 0.8;
+  }
+
+  .ct-photoSelectList .cover-list-item-span-delete {
+    position: inherit;
+    bottom: 160px;
+    left: 130px;
+    color: #000000;
+    text-align: center;
+  }
+
+  .cover-list-item-span-delete i {
+    cursor: pointer;
+    vertical-align: sub;
+    margin-right: 4px;
+  }
+
+  .ct-photoSelectList .el-dropdown-link {
+    cursor: pointer;
+    color: #fff;
+  }
+
+  .ct-photoSelectList .el-icon-arrow-down {
+    font-size: 12px;
+  }
+
+  .el-collapse-item__content {
+    padding-bottom: 18px;
+  }
+
+  .el-upload--picture-card {
+    width: 100px;
+    height: 100px;
+    line-height: initial;
+    padding: 34px;
+  }
+
+    .el-upload--picture-card i {
+      font-size: 30px;
+    }
+
+  .el-upload-list--picture-card .el-upload-list__item {
+    width: 100px;
+    height: 100px;
+  }
+
+  .card {
+    display: inline-block;
+  }
+  .ct-photoSelectList .icon{
+cursor: pointer;
+    font-size: 20px;
+  }
+
 </style>

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

@@ -725,7 +725,7 @@
                         self.$forceUpdate();
                         self.$refs.footer.$forceUpdate();
                         self.$common.closeDialog(dialogOption.dialog);
-                        self.updateCurrentRow(field);
+                        self.updateCurrentRow(field,ev);
                       },
                       refreshParent() {
                         self.getPage(1);
@@ -795,7 +795,7 @@
                   }
                   self.$forceUpdate();
                   self.$refs.footer.$forceUpdate();
-                  self.updateCurrentRow(field);
+                  self.updateCurrentRow(field,data);
                 })
               }
             }
@@ -865,14 +865,14 @@
         //}
         //self.$refs
       },
-      updateCurrentRow(router) {
+      updateCurrentRow(router,data) {
         let self = this;
         if (router.flagFreshCurrentRow) {
           self.tableComplate = true;
           self.model.getCurrentRowApiData(function () {
             self.$forceUpdate();
             self.tableComplate = false;
-          });
+          },data,router);
         }
       },
       importComplete(res) {

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

@@ -100,6 +100,12 @@
           });
 
         }
+        this.$nextTick(function () {
+          if (document.querySelector('.is-select') != null) {
+            document.querySelector('.is-select').classList.remove("is-select");
+          }
+          document.querySelector('.is-current .el-tree-node__label').classList.add("is-select");
+        })
 
       }
     },
@@ -109,6 +115,10 @@
   }
 </script>
 <style lang="scss">
+
+  .mytree .is-select {
+    color: #409eff !important
+  }
   .tree-line:first-child div{
     overflow: hidden;
   }

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

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;">
     <el-container style="height:  calc(100vh - 98px);border: 1px solid #eee">
-      <el-aside :width="leftWidth?leftWidth+'px':'15%'" style="background-color:white">
+      <el-aside :width="leftWidth?leftWidth+'px':'15%'" style="background-color:white;border-radius: 6px;">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowMain">

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

@@ -136,20 +136,20 @@ const Detail = function (source,para ,callBack) {
                 return rtn._actionRouters;
             }
             else {
-                if (data.actionRouters) { 
-                    rtn._actionRouters = [];
-                    let indexMore=1;
-                    if(data.actionRouters.length===3){
-                        indexMore=2;
-                    }
-                    data.actionRouters.forEach((v,i) => {
-                        if(i<=indexMore){
-                            var router = Router(v);
-                            router.is = "ct-btn";
-                            router.attrs = { size: "mini" }
-                            rtn._actionRouters.push(router);
-                        }
-                    });
+                if (data.actionRouters) {
+                  rtn._actionRouters = [];
+                  let indexMore=1;
+                  if(data.actionRouters.length<=3){
+                      indexMore=2;
+                  }
+                  data.actionRouters.forEach((v,i) => {
+                      if(i<=indexMore){
+                          var router = Router(v);
+                          router.is = "ct-btn";
+                          router.attrs = { size: "mini" }
+                          rtn._actionRouters.push(router);
+                      }
+                  });
                 }
                 return rtn._actionRouters;
             }

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

@@ -41,7 +41,13 @@ const box = function (source, fileSourceList, router, optionApi) {
         return rtn._fileList;
       },
       getfileListLength() {
-        return rtn.fileList.length;
+        if (!fileSourceList) {
+          return 0;
+        }
+        let fileList = fileSourceList.filter(item=>{
+          return item.flagDeleted != true
+        })
+        return fileList.length;
       },
       optionModel: {
         options: [],
@@ -210,6 +216,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
+      
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           fileSourceList.push(res.content[0]);
@@ -238,6 +245,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         }
       },
       deleteFile(file, forceDelete) {
+
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {
@@ -268,6 +276,7 @@ const box = function (source, fileSourceList, router, optionApi) {
             break;
           }
         }
+        console.log(rtn.fileList)
       },
       getFormObj() {
         var rtnFormObj = {};

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

@@ -10,7 +10,7 @@ const PhotoSelect = function (source, fileSourceList, router, optionApi) {
   var init = function (data) {
     var rtn = {
       get action() {
-        return router.action ? router.action : "";
+        return optionApi ? optionApi : "";
       },
       get router() {
         return router;
@@ -21,13 +21,18 @@ const PhotoSelect = function (source, fileSourceList, router, optionApi) {
       set action(v) {
         data.action = v;
       },
-    
+      getfileListLength() {
+        if (!fileSourceList) {
+          return 0;
+        }
+        return fileSourceList.length;
+      },
       _fileList: [],
       get fileList() {
         if (this._fileList.length !== 0) {
           return rtn._fileList;
         }
-        else {
+        else { 
           //this._fileList = [];
           fileSourceList.forEach((v, index) => {
             if (v.flagDeleted !== 0) {
@@ -37,13 +42,11 @@ const PhotoSelect = function (source, fileSourceList, router, optionApi) {
         }
         return rtn._fileList;
       }, 
-      setFileList(fileList) {
-        fileSourceList = fileList;
-        rtn.fileList = fileList;
+      setFileList(fileList) { 
+        fileSourceList= fileList;  
       }, 
       delete(index) {
         fileSourceList.splice(index, 1);
-        rtn.fileList.splice(index, 1);
       },
       getFormObj() {
         var rtnFormObj = {};

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

@@ -14,55 +14,6 @@ const PhotoSelectList = function (source, callBack,searchModel, defaultSearchDat
       set source(v) { 
         source = v;
       }, 
-      _rowSelectRouter: null,
-      get rowSelectRouter() {
-        if (rtn._rowSelectRouter !== null) {
-          return rtn._rowSelectRouter;
-        }
-        else {
-          rtn._rowSelectRouter = [];
-          if (source.content.rowSelectRouter) {
-            var router = Router(source.content.rowSelectRouter);
-            rtn._rowSelectRouter = router;
-          }
-          return rtn._rowSelectRouter;
-        }
-      },
-      _actionRouter: null,
-      get actionRouter() {
-        if (rtn._actionRouter !== null) {
-          return rtn._actionRouter;
-        }
-        else {
-          rtn._actionRouter = [];
-          if (source.content.actionRouters) {
-            source.content.actionRouters.forEach((v) => {
-              var router = Router(v);
-              //router.is = "ct-btn";
-              //router.attrs = { size: "mini" }
-              rtn._actionRouter.push(router);
-            });
-          }
-          return rtn._actionRouter;
-        }
-      },
-      _rowRouter: null,
-      get rowRouter() {
-        if (rtn._rowRouter !== null) {
-          return rtn._rowRouter;
-        }
-        else {
-          rtn._rowRouter = [];
-          if (rtn.actionRouter) {
-            rtn.actionRouter.forEach((v) => {
-              if (v.show) {
-                rtn._rowRouter.push(v);
-              }
-            });
-          }
-          return rtn._rowRouter;
-        }
-      },
       doAction(api, searchModel, callback) {
         var self = this;
         var para = searchModel ? searchModel : {};
@@ -88,16 +39,11 @@ const PhotoSelectList = function (source, callBack,searchModel, defaultSearchDat
     return rtn;
   };
   if (typeof source === 'string') {
-    var apiData = searchModel ? searchModel.searchData : {};
+    var para = searchModel ? searchModel : {};
     Vue.prototype.$api.postHandler(common.globalUri(),
       {
         action: source,
-        para:
-        {
-          searchFields: apiData,
-          pageAttribute: { pageIndex: 1 },
-          flagSearch: true
-        }
+        para:para
       }).then(
         function (response) {
           if (response.rtnCode === Enum.ReturnCode.Successful) {

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

@@ -554,7 +554,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             console.error(error);
           });
       },
-      getCurrentRowApiData(callback) {
+      getCurrentRowApiData(callback,rtnData,router) {
         var self = this;
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
         if (self.primaryKey) {
@@ -563,7 +563,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
-            searchValue1: rtn.listData[rtn.selectIndex][self.primaryKey],
+            searchValue1: router.actionType==Enum.ActionType.New? rtnData.responseData.content: rtn.listData[rtn.selectIndex][self.primaryKey],
           });
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
@@ -577,11 +577,23 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           .then(function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {
-                response.content.rows.forEach((row) => {
-                  for (var vkey in row) {
-                    rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
-                  }
-                });
+                if(router.actionType==Enum.ActionType.New){
+                  rtn.setStyleRow(response.content.rows);
+                  response.content.rows.forEach((nr) => {
+                    rtn.listData.unshift(nr);
+                  });
+                  rtn.dataDictionary = response.content.rows;
+
+                  source.page.rows = source.page.rows + response.content.rows.length;
+                  rtn.$vue.calculatingRowHeight()
+                }
+                else{
+                  response.content.rows.forEach((row) => {
+                    for (var vkey in row) {
+                      rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+                    }
+                  });
+                }
               }
 
               if (typeof response.content.foot !== 'undefined') {

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -218,7 +218,7 @@ const Enum = {
     /*带标签的超链接列表*/
     HyperlinkListWithLabel: 44,
     /// <summary>
-    /// 图片
+    /// 图片选择
     /// </summary>
     PhotoSelect: 45,
   },

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ct-quickInput">
 
-     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click">
+     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click" @show="searchInputHandle">
             <div>
               <div>
                 <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
@@ -42,7 +42,6 @@
       else {
         this.model = this.vmodel;
       }
-      this.searchInputHandle();
     },
     data() {
       return {

package/src/centaline/validate/index.js

@@ -125,7 +125,15 @@ const actions = {
     } else {
       return false;
     }
-  }
+  },
+  requiredFile(v, o) {
+    if (v.getfileListLength()<=0) {
+      return false;
+    }
+    else {
+      return true;
+    }
+  },
 };
 
 const valid = {
@@ -162,6 +170,16 @@ const valid = {
     message: '值必须是数字',
     ticker:'input'
   },
+  requiredFile: {
+    action: actions.requiredFile,
+    message: '必须上传附件',
+    ticker: 'input'
+  },
+  requiredPhoto: {
+    action: actions.requiredFile,
+    message: '必须选择图片',
+    ticker: 'input'
+  },
   //numberDecimal: {
   //  action: actions.numberDecimal,
   //  message: '小数点位数错误',
@@ -262,6 +280,12 @@ const valid = {
             case Enum.ControlType.Address:
               rtnValidate.push(valid.requiredMultiCombo);
               break;
+            case Enum.ControlType.File: 
+                rtnValidate.push(valid.requiredFile);
+              break;
+            case Enum.ControlType.PhotoSelect:
+              rtnValidate.push(valid.requiredPhoto);
+                break;
             default:
               rtnValidate.push(valid.required);
               break;