centaline-data-driven 1.2.56 → 1.2.57

package/package.json

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

package/src/centaline/css/common.css

@@ -804,9 +804,4 @@ html {
   line-height: 26px;
 }
 
-.el-popoverabsolute{
-  position: absolute !important;
-  top: 20px !important;
-}
-
 

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -34,14 +34,14 @@
              <div>{{model.label}}</div>
              <div style="color:red;font-weight:700;">{{model.subText}}</div>             
   </el-button>
-  <el-button v-else-if="model.isCallTel" :id="model.id"
+  <el-button v-else-if="model.isCallTel" :id="model.id" 
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="clickHandle"
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    <el-popover :ref="'popover'+model.id" :append-to-body="false"
-      class="Stats-popover" :popper-class="flagAbsolute?'el-popoverabsolute':'el-popover1'" :placement="option.placement?option.placement:'left'" 
+    <el-popover :ref="'popover'+model.id" 
+      class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'" 
       v-model="visible" :trigger="option.trigger?option.trigger:''">
       <div style="border-bottom:none">
         <div style="color: #388cd3;text-align: center;">{{message}}</div>
@@ -69,7 +69,6 @@
       vmodel: Object,
       fileData: Object,
       optionApi:String,
-      flagAbsolute:Boolean,
     },
     mixins: [dynamicElement],
     data: function () {

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -1,6 +1,7 @@
 <template>
-  <div v-if="apiRouter!=={} && model && model.listData.length>0" style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
-  padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;">
+  <div v-if="apiRouter!=={} && model && model.listData.length>0"
+    style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
+    padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;width:100%">
     <div class="ct-so" style="width:auto;margin-right: 10px;">        
       <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
         <div>
@@ -18,8 +19,8 @@
       </span>
     </div>
     <div style="margin-left: 5px;display: flex;">
-      <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id" :flagAbsolute="true"
-      v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" :style="{position: router.isCallTel ?'relative':null}"
+      <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id"
+      v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" 
       :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
       </component>
     </div>

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -60,8 +60,8 @@
           <el-popover v-if="showIndex>0" ref="popover0" :append-to-table="option.appendId?option.appendId:''" 
             class="Stats-popover" popper-class="el-popover1" :placement="option.placement?option.placement:'left'" 
             :trigger="option.trigger?option.trigger:''">
-            <div class="tab-list" style="border-bottom:none">
-              <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index" 
+            <div class="tab-list" style="border-bottom:none;display: flex;flex-direction: column;">
+              <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index" style="margin-bottom: 10px;margin-left: 0px;"
                 v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
                 :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
               </component>
@@ -100,7 +100,7 @@
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
           appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
-          placement: 'right-start',//方向，传值可查看Popper UI组件placement属性
+          placement: 'left-start',//方向，传值可查看Popper UI组件placement属性
         },
       }
     },
@@ -147,9 +147,12 @@
             this.topWidth=this.$refs.main.clientWidth-140;
           }
 
-          let totalWidth=self.$refs.routers.offsetWidth;
+          let totalWidth=0;
           let sumWidth=0;
           let moreWidth = 20;
+          if(self.$refs.routers){
+            totalWidth=self.$refs.routers.offsetWidth;
+          }
           self.model.actionRoutersSimple.forEach((v,i) => {
             if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
               if(self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){

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

@@ -255,8 +255,11 @@
           if (!field.isClientFuntion) {
             if (field.isSubmit) {
               let verified = true;
-              if (self.validExcute()) {
-                if (typeof field.onClick !== 'undefined') {
+              if(field.flagVerifyData){
+                verified=self.validExcute();
+              }
+              if (verified) {
+                if (field.flagVerifyData && typeof field.onClick !== 'undefined') {
                   verified = self.$common.excute.call(self.model.scripts, field.onClick);
                 }
 
@@ -294,7 +297,7 @@
                           self.parentModel.$vue.closeTabThen(data);
                         }
                       }
-                      field.disabled = false;                    
+                      field.disabled = false;
                       self.model.pageDisabled= false;
                     });
                   }
@@ -411,7 +414,7 @@
           }
         }
 
-        if (field.isSubmit && !self.validExcute()) {
+        if (field.isSubmit && field.flagVerifyData && !self.validExcute()) {
           return;
         }
 

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

@@ -20,21 +20,36 @@
               @click="viewerOpen(photoList, index)"
             >
             </el-image>
-            <span class="cover-list-item-span-delete">
+            <span
+              class="cover-list-item-span-delete"
+              v-if="!modelPhotoselect.lock"
+            >
               <i class="el-icon-delete" @click="handleRemove(index)"></i>
             </span>
-            <span class="cover-list-item-span" v-if="item.mediaLabelName">
-              <span class="el-dropdown-link">
-                &nbsp;{{ item.mediaLabelName }}
+            <span class="cover-list-item-span">
+              <span class="el-dropdown-link" v-if="item.mediaLabelName">
+                <span style="width: 80px; height: 26px; display: inline-flex;">
+                &nbsp;{{ item.mediaLabelName }} </span>
+              </span>
+              <span v-if="item.rightDefault==true||item.rightDefault=='true'"
+                :class="[
+                  item.flagDefault &&
+                  (item.flagDefault == true || item.flagDefault == 'true')
+                    ? 'checked'
+                    : 'Unchecked',
+                  'isradio',
+                ]"
+                @click="radiochecked(photoList, item)"
+              >
               </span>
             </span>
           </div>
         </li>
       </draggable>
     </ul>
-    <div 
+    <div
       class="el-upload el-upload--picture-card"
-      v-if="!modelPhotoselect.lock&&photoList.length<max"
+      v-if="!modelPhotoselect.lock && photoList.length < max"
       @click="handleOpen()"
     >
       <i class="el-icon-plus"></i>
@@ -65,7 +80,8 @@ export default {
   },
   data() {
     return {
-      max:99999, 
+      radio: "1",
+      max: 99999,
       validMessage: "",
       photoList: [],
       modelPhotoselect: {},
@@ -103,7 +119,7 @@ export default {
   methods: {
     load(data) {
       this.model = data;
-      this.max=data.max?data.max:99999;
+      this.max = data.max ? data.max : 99999;
       this.modelPhotoselect = data;
       this.photoList = data.fileList;
     },
@@ -156,7 +172,7 @@ export default {
                       }, 3000);
                       photoList = photoList.slice(0, this.modelPhotoselect.max);
                     }
-                  } 
+                  }
                   self.modelPhotoselect.setFileList(photoList);
                   self.photoList = photoList;
 
@@ -183,7 +199,15 @@ export default {
       self.$nextTick(function () {
         self.modelPhotoselect.setFileList(self.photoList);
       });
-    }, 
+    },
+    radiochecked(list, item) {
+      var self = this;
+      list.forEach((v) => {
+        v.flagDefault = false;
+      });
+      item.flagDefault = true;
+      self.modelPhotoselect.setFileList(list);
+    },
     //不能共用的数据校验
     selfValidExcute: function (eventName) {
       if (this.modelPhotoselect.required) {
@@ -275,10 +299,14 @@ export default {
   margin-right: 4px;
 }
 
-.ct-photoSelect .el-dropdown-link {
-  cursor: pointer;
-  color: #fff;
-}
+.ct-photoSelect .el-dropdown-link{
+    cursor: pointer;
+    color: #fff;
+    position: relative;
+    width: 80px;
+    height: 26px;
+    display: inline-block;
+  }
 
 .ct-photoSelect .el-icon-arrow-down {
   font-size: 12px;
@@ -306,4 +334,21 @@ export default {
 .card {
   display: inline-block;
 }
+
+.ct-photoSelect .checked {
+  background: url(../../../assets/checked.png);
+}
+.ct-photoSelect .Unchecked {
+  background: url(../../../assets/Unchecked.png);
+}
+
+.ct-photoSelect .isradio {
+  background-size: 100% 100%;
+  height: 18px;
+  width: 18px;
+  display: block;
+  cursor: pointer;
+  margin-top: 5px;
+  float: right;
+}
 </style>

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

@@ -215,12 +215,16 @@
         }
       },
       sideMenuClickHandler(v) {
+        let popoverCallTels=document.getElementsByClassName('el-popoverCallTel');
         if(v=='open'){
           this.sideBarStatus ='close';
           this.sideBarRight=-this.sideBarWidth;
           this.sideBarWidth=0;
           this.searchWidth=0;
           this.sideBarMenuRight=0;
+          for(var i=0;i<popoverCallTels.length;i++){
+            popoverCallTels[i].style.display='none';
+          }
         }
         else if(v=='close'){
           this.sideBarStatus ='open';
@@ -228,7 +232,10 @@
           this.sideBarWidth=this.$refs.table.model.sideBarWidth;
           this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           this.sideBarMenuRight=this.sideBarWidth-2;
-          this.rowClickHandle();
+          this.rowClickHandle();          
+          for(var i=0;i<popoverCallTels.length;i++){
+            popoverCallTels[i].style.display='block';
+          }
         }
       },
       closeSideHandler() {

package/src/centaline/formData/index.js

@@ -45,7 +45,6 @@ const formData = {
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             rtn1.source[attrKey] = attrValue;
-            console.log(this.form)
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);
             //this.form.hiddenHandle(rtn1);//隐藏关联的
 
@@ -231,7 +230,7 @@ const formData = {
     //获取后台数据，并返回脚本。
     execServerScript(action, object, successCallback) {
         let formData = this;//作用域保存
-debugger;
+
         //是否是行内触发的
         let data = this.getListField(this.form.scripts.$fd, null, null);
         object.editMode = data ? 1 : 0;

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

@@ -144,7 +144,9 @@ const Base = function (source) {
     },
     get lock() {
       return source.locked;
-      //return true;
+    },
+    set locked(v) {
+      source.locked = v;
     },
     get listBind() {
       let bind = {};

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

@@ -313,6 +313,15 @@ const Router = function (source) {
     get locked() {
       return source.locked;
     },
+    get flagVerifyData() {
+      //提交表单时是否校验数据
+      if(source.flagVerifyData!=undefined){
+        return source.flagVerifyData;
+      }
+      else{
+        return true;
+      }
+    },
   };
   return rtn;
 }