npm - centaline-data-driven - Versions diffs - 1.3.99 → 1.4.1 - Mend

centaline-data-driven 1.3.99 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/package.json CHANGED Viewed

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

package/src/Detail.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "1583031531402825728"} ,
       }
     },
     mounted() {

package/src/Form.vue CHANGED Viewed

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/externalincomemanage/externalincomeimport/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/SearchList.vue CHANGED Viewed

@@ -4,23 +4,23 @@
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para"
+    <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'"
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'"
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
     <!-- <ct-searchlist
       :searchConditionApi="'/report/monthly/region/layout'"
       :searchDataApi="'/report/monthly/region/list'">
     </ct-searchlist> -->
-    <!-- <ct-searchlist
+    <ct-searchlist
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'"
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'"
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist> -->
+    </ct-searchlist>
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/api/index.js CHANGED Viewed

@@ -127,9 +127,9 @@ Axios.defaults.withCredentials = true;//允许带上跨域cookies
 const api = {
   get(url, params, callback) {
-    if(common.flagRouterSelf()){
-      url=url+params.action;
-      params=params.para;
+    if (common.flagRouterSelf()) {
+      url = url + params.action;
+      params = params.para;
     }
     return Axios.get(url, params, {
       headers: {
@@ -142,9 +142,9 @@ const api = {
     );
   },
   post(url, params, callback) {
-    if(common.flagRouterSelf()){
-      url=url+params.action;
-      params=params.para;
+    if (common.flagRouterSelf()) {
+      url = url + params.action;
+      params = params.para;
     }
     return Axios.post(url, params, {
       headers: {
@@ -156,7 +156,7 @@ const api = {
       }
     );
   },
-  postThenHandler: function (response,scripts) {
+  postThenHandler: function (response, scripts) {
     var data = response.data;
     if (typeof common.getDataDrivenOpts().handler.requestComplete === 'function') {
@@ -200,7 +200,7 @@ const api = {
             attrs: {
               progressAction: data.content.action,
               progressKey: data.content.key,
-              progressType:'export',
+              progressType: 'export',
               width: '350px',
               height: '165px'
             },
@@ -236,14 +236,29 @@ const api = {
     return Promise.resolve(response.data);
   },
   postHandler(url, params, scripts) {
-    if(common.flagRouterSelf()){
-      url=url+params.action;
-      params=params.para;
+    if (common.flagRouterSelf()) {
+      url = url + params.action;
+      params = params.para;
     }
     return Axios.post(url, params, {
       headers: common.getDataDrivenOpts().handler.getRequestHeaders()
     }).then((response) => {
-      return this.postThenHandler(response,scripts);
+      return this.postThenHandler(response, scripts);
+    }).catch((ex) => {
+      if (ex.message) {
+        Vue.prototype.$message.error(ex.message);
+      }
+      else if (typeof ex.data === "string") {
+        Vue.prototype.$message.error(ex.data);
+      }
+      return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
+    });
+  },
+  SliceUpload(url, params, scripts) {
+    return Axios.post(url, params, {
+      headers: { ...common.getDataDrivenOpts().handler.getRequestHeaders(), ...{ 'Content-Type': 'multipart/form-data' } }
+    }).then((response) => {
+      return this.postThenHandler(response, scripts);
     }).catch((ex) => {
       if (ex.message) {
         Vue.prototype.$message.error(ex.message);

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue CHANGED Viewed

@@ -345,8 +345,9 @@
               </el-tab-pane>
             </el-tabs>
           </div>
-          <div class="customer">
-            <div class="customer-title">匹配客户</div>
+          <div ref="MatchCustomer" v-if="model.matchCustomerApiRouter !== null" class="customer">
+            <ct-MatchCustomer :apiRouter="model.matchCustomerApiRouter"></ct-MatchCustomer>
+            <!-- <div class="customer-title">匹配客户</div>
             <div class="mt10 clearfix">
               <div class="customre-line"></div>
               <div class="match-customre rel">
@@ -397,7 +398,6 @@
                 </div>
               </div>
             </div>
             <div class="clearfix">
               <div class="customre-line"></div>
               <div class="match-customre rel">
@@ -447,7 +447,7 @@
                   </div>
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -460,6 +460,7 @@ import dynamicElement from "../../mixins/dynamicElement";
 import dynamicSearchList from "../../dynamicSearchList/src/dynamicSearchList.vue";
 import dynamicContactList from "./dynamicContactList.vue";
 import dynamicAlbums from "./dynamicAlbums.vue";
+import dynamicMatchCustomer from "./dynamicMatchCustomer.vue";
 export default {
   name: "ct-PropertyDetailOFI",
   mixins: [dynamicElement],
@@ -467,6 +468,7 @@ export default {
     "ct-searchlist": dynamicSearchList,
     "ct-contactList": dynamicContactList,
     "ct-albums": dynamicAlbums,
+    "ct-MatchCustomer": dynamicMatchCustomer,
   },
   props: {
     vmodel: Object,

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue CHANGED Viewed

@@ -90,7 +90,6 @@ export default {
             else {
                 this.model = this.vmodel;
                 this.testList = this.vmodel.dragList;
-                // console.log('this.testList', this.testList);
             }
         });
@@ -130,7 +129,6 @@ export default {
         // 更新位置
         handleListChange(event) {
-            console.log(event);
             this.testList = event;
             this.testList.forEach((item, i) => {

package/src/centaline/dynamicFile/src/dynamicFile.vue CHANGED Viewed

@@ -1,71 +1,143 @@
 <template>
   <div style="width: 100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
-    <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
-               :disabled="model.lock"
-               :accept="model.fileAccept"
-               :on-change="handleChange"
-               list-type="picture-card"
-               :file-list="model.fileList"
-               :multiple="true"
-               :auto-upload="true"
-               :action="model.action"
-               :data="model.uploadData"
-               :headers="headers"
-               :before-upload="beforeUploadProcess"
-               :on-success="handleAvatarSuccess"
-               :on-error="handleAvatarError"
-               :on-progress="uploadProcess"
-               :limit="parseInt(model.max || 999)"
-               :on-exceed="handleExceed">
-      <i slot="default" class="el-icon-plus"></i>
-      <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
-        {{ validMessage }}
-      </div>
-      <div slot="tip" v-show="model.description" v-html="model.description">
-      </div>
-      <div slot="file" slot-scope="{ file }" :title="file.fileName">
-        <div class="cover-list-item">
-          <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
-          </el-image>
-          <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
-            <i>
-              <el-radio v-model="file.flagDefault" :label="true" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
-            </i>
-          </span>
-          <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
-            <i class="el-icon-delete" @click="handleRemove(file)"></i>
-          </span>
-          <span class="cover-list-item-span" v-if="model.lock || model.paramName">
-            <!--锁定-->
-            <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
-              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+    <!--分片上传-->
+    <template v-if="model.type==51">
+      <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
+                 :disabled="model.lock"
+                 :accept="model.fileAccept"
+                 :on-change="handleChange"
+                 list-type="picture-card"
+                 :file-list="model.fileList"
+                 :multiple="true"
+                 :auto-upload="true"
+                 :action="model.action"
+                 :data="model.uploadData"
+                 :headers="headers"
+                 :before-upload="beforeUploadProcess"
+                 :on-success="handleAvatarSuccess"
+                 :on-error="handleAvatarError"
+                 :on-progress="uploadProcess"
+                 :limit="parseInt(model.max || 999)"
+                 :on-exceed="handleExceed">
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
+          {{ validMessage }}
+        </div>
+        <div slot="tip" v-show="model.description" v-html="model.description">
+        </div>
+        <div slot="file" slot-scope="{ file }" :title="file.fileName">
+          <div class="cover-list-item">
+            <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
+            </el-image>
+            <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
+              <i>
+                <el-radio v-model="file.flagDefault" :label="true" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
+              </i>
+            </span>
+            <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
+              <i class="el-icon-delete" @click="handleRemove(file)"></i>
+            </span>
+            <span class="cover-list-item-span" v-if="model.lock || model.paramName">
+              <!--锁定-->
+              <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
+                <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+              </span>
+              <!--复杂分类-->
+              <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
+                <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <!--简单分类-->
+              <el-dropdown v-else class="el-upload-list__item-preview" trigger="click" placement="top" @command="classifySelectedClickHandle">
+                <span class="el-dropdown-link" @click="classifyClickHandle">
+                  <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+                  <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
+                  <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{ option: option, file: file }">
+                    {{ option[model.optionModel.optionAttrs.label] }}
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </span>
+          </div>
+          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
+        </div>
+      </el-upload>
+    </template>
+    <!-- 官方上传 -->
+    <template v-else>
+      <el-upload :class="disableUpload ? 'ct-upload-display-none' : ''"
+                 :http-request="SliceUpload"
+                 :disabled="model.lock"
+                 :accept="model.fileAccept"
+                 :on-change="handleChange"
+                 list-type="picture-card"
+                 :file-list="model.fileList"
+                 :multiple="true"
+                 :auto-upload="true"
+                 :action="model.action"
+                 :data="model.uploadData"
+                 :headers="headers"
+                 :before-upload="beforeUploadProcess"
+                 :on-success="handleAvatarSuccess"
+                 :on-error="handleAvatarError"
+                 :on-progress="uploadProcess"
+                 :limit="parseInt(model.max || 999)"
+                 :on-exceed="handleExceed">
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">
+          {{ validMessage }}
+        </div>
+        <div slot="tip" v-show="model.description" v-html="model.description">
+        </div>
+        <div slot="file" slot-scope="{ file }" :title="file.fileName">
+          <div class="cover-list-item">
+            <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
+            </el-image>
+            <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
+              <i>
+                <el-radio v-model="file.flagDefault" :label="true" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
+              </i>
             </span>
-            <!--复杂分类-->
-            <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
-              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
-              <i class="el-icon-arrow-down el-icon--right"></i>
+            <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
+              <i class="el-icon-delete" @click="handleRemove(file)"></i>
             </span>
-            <!--简单分类-->
-            <el-dropdown v-else class="el-upload-list__item-preview" trigger="click" placement="top" @command="classifySelectedClickHandle">
-              <span class="el-dropdown-link" @click="classifyClickHandle">
+            <span class="cover-list-item-span" v-if="model.lock || model.paramName">
+              <!--锁定-->
+              <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
+                <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+              </span>
+              <!--复杂分类-->
+              <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
                 <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
-              <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
-                <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{ option: option, file: file }">
-                  {{ option[model.optionModel.optionAttrs.label] }}
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </span>
+              <!--简单分类-->
+              <el-dropdown v-else class="el-upload-list__item-preview" trigger="click" placement="top" @command="classifySelectedClickHandle">
+                <span class="el-dropdown-link" @click="classifyClickHandle">
+                  <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+                  <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
+                  <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{ option: option, file: file }">
+                    {{ option[model.optionModel.optionAttrs.label] }}
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </span>
+          </div>
+          <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
         </div>
-        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
-      </div>
-    </el-upload>
+      </el-upload>
+    </template>
   </div>
 </template>
 <script>
   import dynamicElement from "../../mixins/dynamicElement";
+  import { upload, uploadByPieces } from "../../loader/src/ctl/SliceUpload";
   export default {
     name: "ct-file",
     mixins: [dynamicElement],
@@ -103,9 +175,10 @@
     },
     methods: {
       load(data) {
+        debugger
         this.model = data;
         this.classifyClickHandle();
-        if(this.model.action==='' && !this.model.lock){
+        if (this.model.action === '' && !this.model.lock) {
           this.validMessage = "必须配置上传的URL";
           this.valid = false;
           this.$message.error(this.validMessage);
@@ -257,7 +330,7 @@
             return false;
           }
         }
-        if (this.model.min) {
+        if (this.model.min && this.modelPhotoselect.required) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示
             if (eventName == "change" && this.model.getfileListLength() > 0) {
@@ -270,15 +343,15 @@
             }
             else if (eventName == "remove") {
               this.valid = true;
-            }
+            }
             return false;
           }
         }
-        if (this.model.rightDefault && this.model.rightDefault==1&& eventName == "valid") {
-          if (this.model.getfileDefault()<=0) {
+        if (this.model.rightDefault && this.model.rightDefault == 1 && eventName == "valid") {
+          if (this.model.getfileDefault() <= 0) {
             this.validMessage = "请设置默认封面";
             this.valid = false;
-            return false;
+            return false;
           }
         }
         if (eventName == "valid" && !this.validFileClass()) {
@@ -341,7 +414,70 @@
       handleDefault: function (event, file) {
         this.model.setDefault(file);
         // this.selfValidExcute("remove");
-      }
+      },
+      async SliceUpload(options) {
+        const { file, onProgress, onSuccess, onError } = options;
+        if (this.model.action === '' && !this.model.lock) {
+          this.validMessage = "必须配置上传的URL";
+          this.valid = false;
+          this.$message.error(this.validMessage);
+        }
+        // data是上传时附带的额外参数，file是文件
+        let url = this.model.action; //上传文件接口
+        let uid = this.uploadguid();
+        try {
+          let awaitfile = {
+            "url": "",
+            "source": "",
+            "mediaUrl": "",
+            "fileName": "",
+            "flagDefault": "",
+            "mediaTypeID": "",
+            "flagDeleted": "",
+            "actionType": "",
+            "rightDel": "",
+            "rightEdit": "",
+            "rightDownload": "",
+            "mediaLabelID": "",
+            "mediaLabelName": "",
+            "fileExtension": "",
+            "progressFlag": true,
+            "loadProgress": 1,
+            "uid": uid,
+          }
+          this.model.fileList.push(awaitfile);
+          file.uid = uid;
+          const res = await uploadByPieces(this.model.action, { file }, this.uploadpro, options);
+          return res;
+        } catch (e) {
+          return e;
+        }
+      },
+      S4() {
+        return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+      },
+      uploadguid() {
+        return (this.S4() + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + '-' + this.S4() + this.S4() + this.S4());
+      },
+      uploadpro(uploadOptions, res) {
+        if (res.rtnCode != 200 && res.rtnMsg != "") {
+          this.$message.error(res.rtnMsg);
+          return;
+        }
+        const { file, onProgress, onSuccess, onError } = uploadOptions;
+        const Progress = Math.min(100, Math.floor(1E4 * parseInt(res.content.nextOffSet) / parseInt(file.size)) / 100);
+        this.model.setByPieces(res, Progress, file);
+        if (res.content.finished == 1) {
+          this.handleChange();
+        }
+      },
     },
   };
 </script>

package/src/centaline/dynamicForm/src/dynamicForm.vue CHANGED Viewed

@@ -486,11 +486,20 @@
                   });
                 }
                 else{
-                  field.doAction(submitData, (data) => {
-                    if(data.content){
-                      window.open(data.content, "_blank");
-                    }
-                  });
+                  if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
+                    window.open(field.action, "_blank");
+                  }
+                  else {
+                    field.doAction(submitData, (data) => {
+                      if(data.content){
+                        if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                          window.open(data.content, "_blank");
+                        }
+                        else {
+                        }
+                      }
+                    });
+                  }
                 }
               }
               else {

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue CHANGED Viewed

@@ -95,13 +95,14 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-        if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {
-          this.validMessage = this.model.label +" 不能大于 " + this.model.max;
-          this.valid = false;
-          return false;
+        if (eventName === "change") {
+          if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {
+            this.validMessage = this.model.label +" 不能大于 " + this.model.max;
+            this.valid = false;
+            return false;
+          }
         }
-        if (eventName === "valid") {
+        if (eventName === "valid") {
           if (this.model.min !== "" && parseFloat(this.model.value) < parseFloat(this.model.min)) {
             this.validMessage = this.model.label+" 不能小于 " + this.model.min;
             this.valid = false;

package/src/centaline/dynamicIti/src/dynamicIti.vue CHANGED Viewed

@@ -91,19 +91,20 @@
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);//todo input事件里要不要加这个事件
-        console.log('onInputHandler');
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-        if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {
-          this.validMessage = this.model.label +" 不能大于 " + this.model.max;
-          this.valid = false;
-          return false;
-        }
-        if (this.model.max1 !== "" && parseFloat(this.model.value1) > parseFloat(this.model.max1)) {
-          this.validMessage = this.model.label +" 不能大于 " + this.model.max1;
-          this.valid = false;
-          return false;
+        if (eventName === "change") {
+          if (this.model.max !== "" && parseFloat(this.model.value) > parseFloat(this.model.max)) {
+            this.validMessage = this.model.label +" 不能大于 " + this.model.max;
+            this.valid = false;
+            return false;
+          }
+          if (this.model.max1 !== "" && parseFloat(this.model.value1) > parseFloat(this.model.max1)) {
+            this.validMessage = this.model.label +" 不能大于 " + this.model.max1;
+            this.valid = false;
+            return false;
+          }
         }
         if (eventName === "valid") {
           if (this.model.min !== "" && parseFloat(this.model.value) < parseFloat(this.model.min)) {

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue CHANGED Viewed

@@ -227,7 +227,7 @@ export default {
           return false;
         }
       }
-      if (this.modelPhotoselect.min) {
+      if (this.modelPhotoselect.min && this.modelPhotoselect.required) {
         if (
           this.modelPhotoselect.getfileListLength() < this.modelPhotoselect.min
         ) {

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue CHANGED Viewed

@@ -136,7 +136,6 @@
           var row = self.tableData[i];
           jumpFieldArr.forEach((v) => {
-            console.log(eval("row." + v));
             if (typeof eval("row." + v) !== 'undefined' && eval("row." + v).indexOf(self.jumpStr) >= 0) {
               jumpRow = row;
               return false;