cnhis-design-vue 2.1.160 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.160",
+  "version": "2.2.1",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/components/player-vod/video-modal.vue

@@ -13,7 +13,7 @@
     <div class="preview-wrap">
       <div class="preview">
         <playerVod :playerOptions="playerOptions" v-if="fileList && fileList.length === 0"></playerVod>
-        <a-carousel v-else arrows :initialSlide="palyerIndex">
+        <a-carousel v-else arrows :initialSlide="palyerIndex" class="vod-carousel">
           <div slot="prevArrow" class="custom-slick-arrow" style="left: 10px;zIndex: 1">
             <a-icon type="left-circle" />
           </div>
@@ -123,4 +123,9 @@ export default {
   opacity: 0.5;
   color: #fff;
 }
+.vod-carousel {
+  /deep/ .video-container  {
+    height: 520px;
+  }
+}
 </style>

package/packages/scale-view/formitem/r-choice.vue

@@ -47,7 +47,7 @@
               :style="{ color: choiceColor(o) }"
             >{{ o.suffix }}</template>
           </template>
-          <span v-else :style="{ color: choiceColor(o) }">{{ o.label }}</span>
+          <span v-else :style="{ color: choiceColor(o) }" class="choice-span">{{ o.label }}</span>
           <a-input
             v-if="o.importability"
             v-model="othersText"
@@ -111,6 +111,7 @@
               v-else
               style="white-space: initial;"
               :style="{ color: choiceColor(o) }"
+              class="choice-span"
             >{{ o.label }}</span>
             <a-input
               v-if="o.importability"
@@ -231,7 +232,7 @@ export default {
     choiceColor() {
       return function (p) {
         let color = p.color || 'rgba(0, 0, 0, 0.65)';
-        return `${color} !important`;
+        return `${color}`;
       };
     },
     showImgWrap() {

package/packages/scale-view/formitem/r-upload.vue

@@ -1,16 +1,17 @@
 <template>
-  <div class="r-upload">
+  <div class="r-upload" :class="{'r-upload-lock': isLock}">
     <div v-if="upType == 'UPFILE'">
       <a-upload-dragger
         name="file"
         :multiple="true"
         :defaultFileList="defaultFileList"
         :action="uploadFileUrl"
+        :before-upload="beforeUploadFile"
         @change="handleFileChange"
         :disabled="isLock"
       >
-        <p class="dragger-upload-text">
-          <a-icon class="m-icon" type="plus" />请点击文件上传,单个文件50M以内。
+        <p  class="dragger-upload-text">
+          <a-icon class="m-icon" type="plus" />请点击文件上传,单个文件{{maxSizeFile}}M以内。
         </p>
       </a-upload-dragger>
     </div>
@@ -32,11 +33,10 @@
             添加图片
           </div> -->
           <a-icon type="camera" />
-          <p>添加图片</p>
+          <p>点击上传（不超过{{ maxSize }}M）</p>
         </div>
       </a-upload>
-      <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel"       :cancelText="'取消'"
-      :okText="'确定'">
+      <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel" :cancelText="'取消'" :okText="'确定'">
         <img alt="example" style="width: 100%" :src="previewImage" />
       </a-modal>
     </div>
@@ -49,6 +49,7 @@ import utils from "@/utils/utils-map";
 export default {
   props: {
     value: [Array, String],
+    item: { type: Object, default: () => ({}) },
     upType: { default: "UPFILE", type: String },
     isLock: { type: Boolean, default: false },
     limitPic: { type: [String, Number], default: "1" },
@@ -78,6 +79,17 @@ export default {
       previewImage: ""
     };
   },
+  computed:{
+    cMaxSize() {
+      return this.item.setting?.maxSize;
+    },
+    maxSize() {
+      return this.cMaxSize || 2;
+    },
+    maxSizeFile() {
+      return this.cMaxSize || 50;
+    },
+  },
   methods: {
     handleCancel() {
       this.previewVisible = false;
@@ -103,6 +115,11 @@ export default {
           if (file.status == "removed") return;
           this.$message.error(file.response.resultMsg || "上传失败！");
         }
+      } else {
+        if (file.status !== "uploading") {
+          let curIndex = fileList.findIndex(f => f.uid == file.uid);
+          fileList.splice(curIndex, 1);
+        }
       }
     },
     handlePictureChange(info) {
@@ -131,12 +148,19 @@ export default {
       if (!isJpgOrPng) {
         this.$message.error("仅支持jpeg/png格式");
       }
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 < this.maxSize;
       if (!isLt2M) {
-        this.$message.error("上传图片限制在2MB以内");
+        this.$message.error(`图片大小超过了${this.maxSize}MB`);
       }
       return isJpgOrPng && isLt2M;
     },
+    beforeUploadFile(file) {
+      const isLimit = file.size / 1024 / 1024 < this.maxSizeFile;
+      if (!isLimit) {
+        this.$message.error(`附件大小超过了${this.maxSizeFile}MB`);
+      }
+      return isLimit;
+    },
     handlerFormatUpload(data = []) {
       // type = pic / file
       if (data.length === 0) {
@@ -284,4 +308,14 @@ export default {
     }
   }
 }
+.r-upload-lock {
+  /deep/ .ant-upload {
+    &.ant-upload-drag.ant-upload-disabled {
+      display: none;
+    }
+    &.ant-upload-select-picture-card.ant-upload-disabled {
+      display: none;
+    }
+  }
+}
 </style>

package/packages/scale-view/scaleView.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="r-scale r-scale-v3">
+  <div class="r-scale r-scale-v2">
     <slot v-if="spinning">
       <a-spin :indicator="indicator" tip="加载中..." />
     </slot>
@@ -190,6 +190,7 @@
                       :useFileList="item.dbValue"
                       :limitPic="item.setting.limitPic"
                       :isLock="componentDisable"
+                      :item="item"
                       @change="changeUpload($event, item)"
                     />
                     <!-- 地图 -->
@@ -2019,4 +2020,67 @@ export default create({
     max-width: 100%;
   }
 }
+.r-scale-v2 {
+  /deep/ .scale-container {
+
+    .choice-radio-div .ant-radio-wrapper-disabled,
+    .choice-radio-div .ant-checkbox-wrapper-disabled {
+      padding: 4px;
+      box-sizing: border-box;
+      border: 1px solid transparent;
+      
+    }
+    .ant-radio-wrapper-checked.ant-radio-wrapper-disabled {
+      border-color: #2d7aff;
+      border-radius: 4px;
+      .choice-span {
+        color: #000 !important;
+      }
+      >.ant-radio-disabled {
+        .ant-radio-inner {
+          background-color: #fff !important;
+          border-color: #2d7aff !important;
+          &::after {
+            background-color: #2d7aff;
+          }
+        }
+      }
+    }
+    .ant-checkbox-wrapper-checked.ant-checkbox-wrapper-disabled {
+      border-color: #2d7aff;
+      border-radius: 4px;
+      .choice-span {
+        color: #000 !important;
+      }
+      >.ant-checkbox-disabled {
+        .ant-checkbox-inner {
+          background-color: #2d7aff;
+          border-color: #2d7aff !important;
+          &::after {
+            border-color: #fff !important;
+          }  
+        }
+      }
+    }
+
+    .ant-input-disabled {
+      color: #000 !important;
+      font-weight: 700;
+    }
+
+    .ant-select-disabled {
+      .ant-select-selection-selected-value {
+        color: #000 !important;
+        font-weight: 700;
+      }
+    }
+    
+    .ant-cascader-picker-disabled {
+      .ant-cascader-picker-label {
+        color: #000 !important;
+        font-weight: 700;
+      }
+    }
+  }
+}
 </style>

package/packages/select-label/select-label.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="label-page">
     <div class="tag-label">
-      <a-tag v-for="v in labelSelectedList" :key="v.labelId" :style="handleLabelColor(v, true)" :closable="item_is_edit" @close="closeTag(v)">
+      <a-tag v-for="v in labelSelectedList" :key="v.labelId" :style="handleLabelColor(v, true)" :closable="item_is_edit && !isLock" @close="closeTag(v)">
         {{ v.labelName }}
       </a-tag>
-      <span v-if="!explicit" class="form-add-icon form-add-icon-label" @click="handleEditLabel" :class="{ disable: isLock }" v-show="item_is_edit">
+      <span v-if="!explicit && !isLock" class="form-add-icon form-add-icon-label" @click="handleEditLabel" :class="{ disable: isLock }" v-show="item_is_edit">
         <a-icon class="add-icon" type="plus-circle" />
         新增
       </span>

package/packages/table-filter/src/components/render-widget/components/NumberRange.vue

@@ -102,11 +102,21 @@ export default {
       this.lessValue = resVal.split('~')?.[0] ?? undefined;
       this.bigValue = resVal.split('~')?.[1] ?? undefined;
     },
+    handleChangeValue(lessValue, bigValue) {
+      if(!lessValue && lessValue !== 0) return;
+      if(!bigValue && bigValue !== 0) return;
+      let lessNum = +lessValue
+      if(isNaN(lessNum)) return;
+      let bigNum = +bigValue
+      if(isNaN(bigNum)) return;
+      if(lessNum > bigNum) {
+        return `${bigValue}~${lessValue}`
+      }
+    },
     changeFilterNumber() {
       let res = `${this.lessValue ?? ''}~${this.bigValue ?? ''}`
-      if (this.lessValue && this.bigValue && this.lessValue > this.bigValue) {
-        res = `${this.bigValue}~${this.lessValue}`
-      }
+      let transferRes = this.handleChangeValue(this.lessValue, this.bigValue)
+      if(transferRes) res = transferRes;
       this.$emit("update:value", res);
     },
     clearFilterNumber() {

package/packages/upload/chunk-upload/chunk-upload-new.vue

@@ -133,7 +133,7 @@ export default {
       default: ""
     },
     max_size: {
-      type: String,
+      type: [String, Number],
       default: ""
     },
     maxLength: {
@@ -162,7 +162,8 @@ export default {
     getChunkUploadConfig:{
       type: Function,
       default: () => Promise.resolve({})
-    }
+    },
+    source: { type: String, default: ""}
   },
   data() {
     return {
@@ -401,6 +402,9 @@ export default {
     },
 
     curMaxSize(curMax) {
+      if(this.source === 'guage') {
+        return curMax / 1024 + 'MB';
+      }
       let useMax;
       if (curMax) {
         useMax = +(+curMax).toFixed(2);

package/packages/upload/chunk-upload/vod-chunk-upload.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="upload">
-    <div v-if="!isDetail" class="chunk-uploader-btn" :class="{ 'disable-upload': isDisabled }" v-show="isShowBtn" @click="handleBtnOnClick">
+    <div v-if="!isDetail && !isLock" class="chunk-uploader-btn" :class="{ 'disable-upload': isDisabled }" v-show="isShowBtn" @click="handleBtnOnClick">
       <div class="chunk-btn-content">
         <div class="c-uploader-btn">
           <template v-if="source == 'guage'">
             <img :src="require('@/assets/img/video.png')" alt="" class="guage-img" />
             <div class="uploader-text">
               <p>点击上传</p>
-              <span class="guage-text">上传视频（不超过50M)</span>
+              <span class="guage-text">上传视频（不超过{{guageMaxSize}}M）</span>
             </div>
           </template>
           <template v-else>
@@ -82,6 +82,7 @@
       :maxLength="maxlength"
       :propsCategoryMap="propsDefaultAccept"
       :defaultList="fileList"
+      :source="source"
       @getSumbitList="getSumbitList"
     ></vodUploadModal>
   </div>
@@ -166,9 +167,15 @@ export default {
     defaultFileList() {
       return this.handleDefList();
     },
+    isGuage(){
+      return this.source == 'guage';
+    },
+    guageMaxSize(){
+      return this.formData?.setting?.maxSize || 50;
+    },
     isShowBtn() {
       let { max_length } = this.formData?.validate || {};
-      if (this.source == 'guage') {
+      if (this.isGuage) {
         max_length = +this.limitNum;
       }
       if (max_length) {
@@ -188,7 +195,7 @@ export default {
       };
     },
     allow_format() {
-      if (this.source === 'guage') return this.defaultAccept;
+      if (this.isGuage) return this.defaultAccept;
       const { allow_format } = this.formData;
       try {
         if (allow_format) {
@@ -217,7 +224,7 @@ export default {
 
     defaultValue() {
       const { formData, mainForm } = this;
-      if (this.source === 'guage') {
+      if (this.isGuage) {
         return this.defFileList;
       }
       return mainForm.defaultValue[formData.name] || formData.default_val;
@@ -232,6 +239,7 @@ export default {
     },
 
     max_size() {
+      if(this.isGuage) return this.guageMaxSize * 1024;
       const { max_size } = this.formData?.validate || {};
       return max_size || '';
     },
@@ -263,7 +271,7 @@ export default {
     handleDefList() {
       const { formData, mainForm } = this;
       let defList = [];
-      if (this.source === 'guage') {
+      if (this.isGuage) {
         defList = this.defFileList;
       } else {
         defList = mainForm.handleSysParams(mainForm.defaultValue[formData.name] || formData.default_val);
@@ -313,7 +321,7 @@ export default {
       });
       // let resVal = resList.length ? JSON.stringify(resList) : "";
       let resVal = JSON.stringify(resList);
-      if (this.source === 'guage') {
+      if (this.isGuage) {
         this.$emit('vodFileList', resVal);
         return;
       }