centaline-data-driven 1.5.29 → 1.5.30

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

@@ -1,9 +1,9 @@
 <template>
-  <el-dropdown v-if="model.isDropdown" 
-               trigger="click" 
-               v-bind="model.attrs"  
+  <el-dropdown v-if="model.isDropdown"
+               trigger="click"
+               v-bind="model.attrs"
                placement="bottom"
-               @click.native="dropClick" 
+               @click.native="dropClick"
                @command="commandClick"
                :disabled="model.disabled || model.locked">
     <el-button type="primary">
@@ -31,17 +31,17 @@
              :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
              :icon="model.icon"
              :disabled="model.disabled || model.locked">
-             <div>{{model.label}}</div>
-             <div class="subText">{{model.subText}}</div>             
+    <div>{{model.label}}</div>
+    <div class="subText">{{model.subText}}</div>
   </el-button>
   <el-button v-else-if="model.isCallTel" class="max"
-    :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  class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'" 
-      v-model="visible" :trigger="option.trigger?option.trigger:''">
+             :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 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>
         <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
@@ -53,18 +53,44 @@
   <el-checkbox v-else-if="model.isCheckbox" v-model="model.code1" @change="clickHandle">
     {{model.label}}
   </el-checkbox>
-  <el-button v-else  class="max"
-    :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-dropdown trigger="click" ref="searchwhere"  v-else-if="model.isSearchRouterKey&&fieldSearchWhere" :hide-on-click="false" split-button class="max max-search-btn-dropdown" @visible-change="clickHandleDropdown"
+               :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" placement="bottom-start">
     <div v-if="flagAppMode" :title="model.label">
-      <img :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+      <img :src="model.imgUrl" :height="model.buttonHeight+'px'" />
       <div style="margin-top:5px;" class="labelText">{{model.label}}</div>
     </div>
     <div v-else>
-      <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+      <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'" />
+      <span v-else>{{model.label}}</span>
+    </div>
+    <el-dropdown-menu>
+      <el-dropdown-item>
+        <div style="width:100%;float: left;margin:10px 0;">
+          <el-button style="float: left" v-for="(field, index) in SearchWhereButtons" :key="index" :type="field.isHyperLink ? 'text' : 'primary'" :disabled="field.locked" @click="SaveSearchWhere(field)">{{field.label}}</el-button>
+          <span style="margin-left:10px;margin-top:3px;float:left" @click="SearchWhereManage" title="维维护已保存的查询条件，如：设置和取消默认、修改标签、删除等。"><i class="el-icon-s-tools" style=" font-size: 18px;"></i></span>
+        </div>
+      </el-dropdown-item>
+      <el-dropdown-item v-for="(col, index) in SearchWhereList" :key="index">
+        <span @click="clickDropdownItem(col)" style="width:100%;float: left;">{{col.labelName}}</span>
+      </el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
+  <el-button v-else class="max"
+             :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">
+    <div v-if="flagAppMode" :title="model.label">
+      <img :src="model.imgUrl" :height="model.buttonHeight+'px'" />
+      <div style="margin-top:5px;" class="labelText">{{model.label}}</div>
+    </div>
+    <div v-else>
+      <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'" />
       <span v-else>{{model.label}}</span>
     </div>
   </el-button>
@@ -79,11 +105,15 @@
       optionApi:String,
       rowData: Object,
       rowindex:Number,
-      flagAppMode:Boolean,
+      flagAppMode: Boolean,
+      actionRouters: Array,
     },
     mixins: [dynamicElement],
     data: function () {
       return {
+        fieldSearchWhere: {},
+        SearchWhereList: [],
+        SearchWhereButtons:[],
         visible:false,
         message:'',
         qrCode:'',
@@ -106,6 +136,11 @@
       else {
         this.model = this.vmodel;
       }
+      if (this.actionRouters && this.model.routerKey) {
+        this.fieldSearchWhere = this.actionRouters.find((b) => {
+          return b.id === this.model.routerKey;
+        });
+      }
     },
     computed: {
       uploadData() {
@@ -165,6 +200,43 @@
           this.$emit('click',this.model,this.rowData,this.rowindex);
         }
       },
+      clickHandleDropdown(v) {
+        if (v) {
+          this.getSearchWherList();
+        }
+      },
+      SaveSearchWhere(field) {
+        if (field.lock) {
+          return;
+        }
+        this.$refs.searchwhere.hide();
+        this.$emit('SaveSearchWhere', field);
+      },
+      getSearchWherList() {
+        if (this.model.routerKey) {
+          let field = this.actionRouters.find((b) => {
+            return b.id === this.model.routerKey;
+          });
+          if (field) {
+            this.model.getApiData(this.loadSearchWher, field);
+          }
+        }
+      },
+      SearchWhereManage() {
+        this.$refs.searchwhere.hide();
+        this.$emit('SearchWhereManage', this.model);
+      },
+      clickDropdownItem(col) {
+        this.$refs.searchwhere.hide();
+        this.$emit('clichSearchWhere', col);
+      },
+      loadSearchWher(data, Buttons) {
+        this.SearchWhereList = [];
+        data.rows.forEach((row) => {
+          this.SearchWhereList.push(row);
+        });
+        this.SearchWhereButtons = Buttons;
+      },
       callTelClick(data){
         var self=this;
         this.message='';
@@ -219,4 +291,31 @@
 .max-info:hover .subText{
   color: #fff;
 }
+  .max-search-btn-dropdown {
+    margin-right:10px;
+  }
+.max-search-btn-dropdown .el-dropdown__caret-button::before {
+   top: 0 !important;
+    bottom: 0 !important;
+}
+ .max-search-btn-dropdown .el-button:first-child {
+   border-radius: 5px 0 0 5px;
+}
+ .max-search-btn-dropdown .el-dropdown__caret-button {
+    border-radius: 0 5px 5px 0;
+}
+    .max-search-btn-dropdown .el-button:first-child:focus {
+      background-color: var(--chinaRed);
+      border-top-color: var(--chinaRed);
+      border-left-color: var(--chinaRed);
+      border-bottom-color: var(--chinaRed);
+    }
+
+    .max-search-btn-dropdown .el-dropdown__caret-button:focus {
+      background-color: var(--chinaRed);
+      border-top-color: var(--chinaRed);
+      border-right-color: var(--chinaRed);
+      border-bottom-color: var(--chinaRed);
+    }
+
 </style>

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -660,7 +660,7 @@
     position: inherit;
     bottom: 160px;
     left: 65px;
-    color: #000000;
+    color: var(--chinaRed);
     text-align: center;
   }
 
@@ -672,7 +672,7 @@
     position: inherit;
     bottom: 160px;
     left: 130px;
-    color: #000000;
+    color: var(--chinaRed);
     text-align: center;
   }
 

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

@@ -231,7 +231,8 @@
           if (isIndependent) {
             this.independentItem.push(v);
           }
-          else if (v.is === 'ct-group') {
+          else if (v.is === 'ct-group' || v.is === 'ct-repeat') {
+
             self.collapse.push(v);
             if (v.isExpand && self.activeName == '-1') {
               self.activeName = (self.collapse.length - 1).toString();
@@ -249,6 +250,10 @@
             v.collapseName = collapseItemArr.length - 1;
             collapseItem.push(v);
           }
+          if (v.is === 'ct-repeat') {
+            v.collapseName = collapseItemArr.length - 1;
+            collapseItem.push(v);
+          }
         });
         if (self.activeName === '-1') self.activeName = '0';
         if (collapseItem.length > 0) {
@@ -261,7 +266,6 @@
 
           self.collapseFieldsRow.push(myFilter);
         }
-
         //因有一些子组件需要计算宽度及高度，故要先全部展开在缩起来
         //也可采用方案二：子组件中，找不到高度，产生一个定时器，找到为止
         //方案三：在显示分组时，主动触发resize方法

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -92,6 +92,7 @@
       onChangeHandler: function (val) {
         this.changeHandler(this.model.value);
         this.isShowClear();
+        this.model.value.dispatchEvent(new Event("val")); //更新v-model的值
       },
       onBlurHandler:function(event){
         this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数

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

@@ -305,7 +305,7 @@ export default {
   position: inherit;
   bottom: 160px;
   left: 130px;
-  color: #000000;
+  color: var(--chinaRed);
   text-align: center;
 }
 

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -1,16 +1,11 @@
 <template>
-  <div class="ct-form-repeat" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
-    <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">
-        新增
+  <div class="ct-form-repeat">
+      <el-button v-if="model.create&&model.tableData.length<model.max" type="success" style="float: right; " class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+        {{model.createText}}
       </el-button>
-    </div>
-    <div class="list-title">
-      <h5>{{model.title}}</h5>
-    </div>
-    <div class="el-col el-col-24 ct-form-repeat-el-col"  v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
+    <div class="el-col el-col-24 ct-form-repeat-el-col" v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
       <el-row v-if="v.field.length > 0">
-        <el-col v-for="(col, index) in v.field" :key="col.guid" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
+        <el-col v-for="(col, index) in v.field" :key="col.guid" v-if="col.show !== false&&col.type!=13" :span="col.colspan" style="padding:5px">
           <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
                      @click="fieldClickHandler(col,index,i)" @change="changeHandler(col,index,i)"
                      @input="inputHandler(col,index,i)"></component>
@@ -35,7 +30,7 @@
     },
     data: function () {
       return {
-
+        
       }
     },
     methods: {
@@ -61,14 +56,14 @@
       return {
         model: null,
         foucus: false,
-        itemKey: Math.random()
+        itemKey: Math.random(),
+        activeName: ['0'],
       }
     },
     created() {
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
-
       this.$nextTick(function () {
         self.model.refField = this.$refs.Fields;
         self.model.refFieldsLabel = this.$refs.FieldsLabel;
@@ -88,7 +83,12 @@
       deleteRow(index) {
         var self = this;
         this.model.deleteRow(index + 1, () => {
-          self.model.tableData[index].deleted = true;
+          if (self.model.tableData[index].isNewFlag) {
+            self.model.tableData.splice(index, 1);
+          }
+          else {
+            self.model.tableData[index].deleted = true;
+          }
           self.$forceUpdate();
           self.model.change = self.model.formListChange;
           self.$emit('change');
@@ -113,10 +113,18 @@
         var rtnBool = true;
         if (!self.fieldsValidExcute()) {
           rtnBool = false;
-        } 
+        }
+        else if (this.model.tableData.length < this.model.min) {
+          self.$message({
+            message: this.model.title + " 最少需要" + this.model.min+"条数据",
+            type: 'warning',
+            showClose: true,
+          });
+          rtnBool = false;
+        }
         if (rtnBool && self.model.required && this.model.tableData.length === 0) {
           self.$message({
-            message: this.model.label + " 表格不能为空",
+            message: this.model.title + " 表格不能为空",
             type: 'warning',
             showClose:true,
           });