centaline-data-driven 1.2.20 → 1.2.21

package/package.json

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

package/src/centaline/css/max.css

@@ -47,6 +47,7 @@
     height: 26px;
     background: #EE6B6B;
     border-color:#EE6B6B;
+    width: 85px;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }

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

@@ -3,8 +3,8 @@
     <div class="list-title">
       <h5>{{model.title}}</h5>
     </div>
-    <div class="list-button max-btn-add">
-      <el-button v-if="model.create" type="success" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+    <div class="list-button">
+      <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
         新增
       </el-button>
     </div>
@@ -349,7 +349,6 @@
   .ct-form-list .list-button {
     padding-bottom: 5px;
     text-align: right;
-    width: 45%;
     display: inline-table;
     float: right;
   }

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -14,7 +14,7 @@
           <div class="cover-list-item">
             <el-image
               fit="fill"
-              :src="item.mediaUrl"
+              :src="item.thumbnailUrl"
               style="width: 100px; height: 100px"
               :z-index="previewZIndex"
               @click="viewerOpen(photoList, index)"
@@ -138,8 +138,8 @@ export default {
               Selected: chooseList,
               // width: self.modelPhotoselect.router.pageWidth + 'px',
               // height: self.modelPhotoselect.router.pageHeight+'px',
-              width: "1024px",
-              height: "600px",
+              width: "772px",
+              height: "550px",
               para: params,
             },
             on: {

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>
@@ -148,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) {
@@ -165,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/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/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') {