Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/components/ImportForm/src/ImportForm.vue

@@ -8,9 +8,9 @@
       <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       <template #tip>
-        <div class="el-upload__tip ml--80px mr--80px">
+        <div class="el-upload__tip ml--126px mr--80px">
           <div class="flex">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px" style="line-height:32px">导入模式</div>
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px  w-100px text-right" style="line-height:32px">导入模式</div>
             <div class="">
               <div class="radio">
                 <el-radio-group v-model="mode">
@@ -28,18 +28,25 @@
             </div>
           </div>
           <div class="flex mt-16px">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px" style="line-height:32px">部分保存</div>
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">部分保存</div>
             <div class="">
               <div class="switch">
                 <el-switch v-model="updatePart" />
               </div>
-
               <div class="tips color-#acaeb3 font-size-14px">
                 <div class="mt-2">部分保存：如存在错误数据，正确数据正常导入</div>
                 <div class="mt-2">全部保存：全部数据正确，才能导入</div>
               </div>
             </div>
           </div>
+          <div class="flex mt-16px" v-if="isShowOut">
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">是否外部资源</div>
+            <div class="">
+              <div class="switch">
+                <el-switch v-model="outFile" />
+              </div>
+            </div>
+          </div>
         </div>
       </template>
     </el-upload>
@@ -54,7 +61,6 @@
         <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
-
     </template>
   </Dialog>
 </template>
@@ -114,12 +120,18 @@ const file = ref('')
   updatePart: {
     type: Boolean,
     required: false,
-    default: true
+    default: false
   },
   url:{
     type: String,
     required: false,
-  }
+  },
+  // 显示是否外部资源
+  isShowOut: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 const importTemplateData= ref(props.importTemplateData)
 const  accept= ref(props.accept)

src/components/rowDrop/index.vue

@@ -155,8 +155,20 @@ const initSelectSta = () => {
       })
       
       _showTableColumns.push(_myTableColumns[_myTableColumns.length-1])
+      if(checkedDataList.value.length>0){
+        if(allData.value?.length != checkedDataList.value.length){
+          isIndeterminate.value = true
+        }else{
+          isIndeterminate.value = false
+          checkAll.value = true
+        }
+      }else{
+        isIndeterminate.value = false
+        checkAll.value = false
+      }
+     
       updataTableColumns(_showTableColumns)
-      console.log(allData.value)
+     
     } else { // 无缓存
       checkedDataList.value = []
       allData.value = []