centaline-data-driven-v3 0.0.53 → 0.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/app/File.vue

@@ -63,6 +63,7 @@ import { ref, nextTick } from 'vue'
 import { showToast, showConfirmDialog } from 'vant';
 import { changeHandler } from '../../utils/mixins';
 import { uploadByPieces } from '../../loader/src/SliceUpload';
+import common from '../../utils/common'
 import File from '../../loader/src/File';
 import util from '../../utils/pub-use'
 import draggable from "vuedraggable";
@@ -145,9 +146,9 @@ function uploadProcess(file) {
 function handleRemove(file) {
     showConfirmDialog({
         title: "提示",
-        confirmButtonText: "确定",
+        confirmButtonText: common.LocalizedString("确定","確認"),
         cancelButtonText: "取消",
-        message: "确定删除该附件？",
+        message: common.LocalizedString("确定删除该附件？","確定刪除該附件？"),
     })
         .then(() => {
             File.deleteFile(file, false, model.value);

package/src/components/app/FormList.vue

@@ -166,7 +166,7 @@ function Init() {
     model.value.validExcute = () => {
         var rtn = fieldsValidExcute();
         if (!rtn) {
-            model.value.displayValidMessage = '请填写[' + model.value.controlLabel + ']'
+            model.value.displayValidMessage = common.LocalizedString('请填写','請填寫')+'[' + model.value.controlLabel + ']'
         }
         return fieldsValidExcute();
     }

package/src/components/app/Photo.vue

@@ -78,6 +78,7 @@ import { ref, nextTick } from 'vue'
 import { showToast, showConfirmDialog } from 'vant';
 import { changeHandler } from '../../utils/mixins';
 import { uploadByPieces } from '../../loader/src/SliceUpload';
+import common from '../../utils/common'
 import Photo from '../../loader/src/Photo';
 import util from '../../utils/pub-use'
 const emit = defineEmits(['loaded', "change", "click"])
@@ -134,9 +135,9 @@ function uploadProcess(file) {
 function handleRemove(file) {
     showConfirmDialog({
         title: "提示",
-        confirmButtonText: "确定",
+        confirmButtonText: common.LocalizedString("确定","確認"),
         cancelButtonText: "取消",
-        message: "确定删除该附件？",
+        message: common.LocalizedString("确定删除该附件？","確定刪除該附件？"),
     })
         .then(() => {
             Photo.deleteFile(file, false, model.value);

package/src/components/web/File.vue

@@ -261,8 +261,8 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
 function handleRemove(file) {
 
 
-  common.confirm("确定删除该附件？", "提示", {
-    confirmButtonText: "确定",
+  common.confirm(common.LocalizedString("确定删除该附件？","確定刪除該附件？"), "提示", {
+    confirmButtonText: common.LocalizedString("确定","確認"),
     cancelButtonText: "取消",
     //type: 'warning'
   }).then(() => {
@@ -633,17 +633,28 @@ function PasteUpload(event) {
     // 获取粘贴板中的图片
     const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
     const items = clipboardDatas.items;
+      //检测是否全是文件才上传
+      let fileSum = 0;
     for (let index in items) {
       const item = items[index];
       if (item.kind === 'file') {
-
-        const file = item.getAsFile();
-        let uid = File.uploadguid();
-
-        file.uid = file.uid || uid;
-        refupload.value.handleStart(file);
-        // 提交上传队列
-        refupload.value.submit();
+        ++fileSum;
+      }
+    }
+    
+    if (fileSum == items.length) {
+      for (let index in items) {
+        const item = items[index];
+        if (item.kind === 'file') {
+
+          const file = item.getAsFile();
+          let uid = File.uploadguid();
+
+          file.uid = file.uid || uid;
+          refupload.value.handleStart(file);
+          // 提交上传队列
+          refupload.value.submit();
+        }
       }
     }
   }

package/src/components/web/FormList.vue

@@ -179,7 +179,7 @@ model.value.$vue = { insertOrUpdateRow, insertRow, delRow, deleteAll, insertSing
 model.value.validExcute = () => {
     var rtn=fieldsValidExcute();
     if(!rtn){
-        model.value.displayValidMessage='请填写['+model.value.controlLabel+']'
+        model.value.displayValidMessage=common.LocalizedString('请填写','請填寫')+'['+model.value.controlLabel+']'
     }
     return fieldsValidExcute();
 }

package/src/components/web/photo.vue

@@ -13,12 +13,13 @@
         <div style="width: 100%;position: relative" ref="refct_Photo" class="block ct-file"
           :style="{ 'width': (model.maxValue1 || 100) + 'px', 'height': (model.minValue1 || 100) + 'px' }"
           :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
- 
-          <el-upload :class="model.disableUpload ? 'ct-upload-display-none' : ''" v-bind="UploadhttpRequest"  :uploadStatus="!model.disableUpload&&!model.locked?'upload':'lock'"
-            ref="refupload" :disabled="model.locked" :accept="model.fileAccept1" :on-change="handleChange"
-            :multiple="false" :auto-upload="true" :action="action()" :headers="headers"
-            :before-upload="beforeUploadProcess" :on-success="handleAvatarSuccess" :on-error="handleAvatarError"
-            :on-progress="uploadProcess" :on-exceed="handleExceed" :show-file-list="false">
+
+          <el-upload :class="model.disableUpload ? 'ct-upload-display-none' : ''" v-bind="UploadhttpRequest"
+            :uploadStatus="!model.disableUpload && !model.locked ? 'upload' : 'lock'" ref="refupload" :disabled="model.locked"
+            :accept="model.fileAccept1" :on-change="handleChange" :multiple="false" :auto-upload="true"
+            :action="action()" :headers="headers" :before-upload="beforeUploadProcess" :on-success="handleAvatarSuccess"
+            :on-error="handleAvatarError" :on-progress="uploadProcess" :on-exceed="handleExceed"
+            :show-file-list="false">
 
 
             <el-icon class="avatar-uploader-icon"
@@ -93,9 +94,8 @@
               </div>
             </template>
             <div class="qrcode-target" v-if="model.QRCodeAction">
-              <img @click.stop="qrcodeFn" ref="QRCodeRef" 
-                :src="util.getAssetsImage('serw1.png')" style="width: 35px;height: 35px; float: right; " alt="扫码上传"
-                title="扫码上传" /> 
+              <img @click.stop="qrcodeFn" ref="QRCodeRef" :src="util.getAssetsImage('serw1.png')"
+                style="width: 35px;height: 35px; float: right; " alt="扫码上传" title="扫码上传" />
             </div>
             <div class="ScanUploadPhoto" v-if="model.qrcodeVisible" @click.stop="qrcodeVisible = true"
               :style="{ top: model.QRCodeRefTop + 'px', left: model.QRCodeRefLeft + 'px' }">
@@ -143,9 +143,9 @@ const props = defineProps({
 })
 const refct_Photo = ref()
 const refupload = ref()
-const QRCodeRef = ref() 
+const QRCodeRef = ref()
 const UploadhttpRequest = ref({})
-const model = ref(null) 
+const model = ref(null)
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
@@ -215,8 +215,8 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
 function handleRemove(file) {
 
 
-  common.confirm("确定删除该附件？", "提示", {
-    confirmButtonText: "确定",
+  common.confirm(common.LocalizedString("确定删除该附件？","確定刪除該附件？"), "提示", {
+    confirmButtonText: common.LocalizedString("确定","確認"),
     cancelButtonText: "取消",
     //type: 'warning'
   }).then(() => {
@@ -476,55 +476,66 @@ function QRCodeLocate() {
 function viewerfile(file) {
   Photo.viewerfile(file, model.value)
 }
- 
+
 function PasteUpload(event) {
   if (!model.value.locked) {
     // 获取粘贴板中的图片
     const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
     const items = clipboardDatas.items;
+    //检测是否全是文件才上传
+    let fileSum = 0;
     for (let index in items) {
       const item = items[index];
       if (item.kind === 'file') {
-
-        const file = item.getAsFile();
-        let uid = Photo.uploadguid();
-
-        file.uid = file.uid || uid;
-        refupload.value.handleStart(file);
-        // 提交上传队列
-        refupload.value.submit();
+        ++fileSum;
+      }
+    }
+    
+    if (fileSum == items.length) {
+      for (let index in items) {
+        const item = items[index];
+        if (item.kind === 'file') {
+
+          const file = item.getAsFile();
+          let uid = Photo.uploadguid();
+
+          file.uid = file.uid || uid;
+          refupload.value.handleStart(file);
+          // 提交上传队列
+          refupload.value.submit();
+        }
       }
     }
   }
 }
 
-function ListenerPaste(event) { 
+function ListenerPaste(event) {
 
-    var target = event.target;
-    const uploads =  document.querySelectorAll('[uploadStatus="upload"]');
+  var target = event.target;
+  const uploads = document.querySelectorAll('[uploadStatus="upload"]');
 
-    if (!window.uploads) {
-      window.uploads = { count: 0, length: uploads.length };
-    }
-    if (uploads.length > 1) {
-      window.uploads.count = window.uploads.count + 1;
-      window.uploads.length = uploads.length;
+  if (!window.uploads) {
+    window.uploads = { count: 0, length: uploads.length };
+  }
+  if (uploads.length > 1) {
+    window.uploads.count = window.uploads.count + 1;
+    window.uploads.length = uploads.length;
 
-      if (window.uploads.count == window.uploads.length) {
-        window.uploads = null;
-        ElMessage({
-          message: "存在多个上传组件，请点击上传！",
-          type: 'info',
-          showClose: true,
-        });
-        return false;
-      }
-    }
-    else if (uploads.length == 1) {
+    if (window.uploads.count == window.uploads.length) {
       window.uploads = null;
-      PasteUpload(event);
+      ElMessage({
+        message: "存在多个上传组件，请点击上传！",
+        type: 'info',
+        showClose: true,
+      });
+      return false;
     }
-  
+  }
+  else if (uploads.length == 1) {
+    window.uploads = null;
+    PasteUpload(event);
+  }
+
 }
 
 // 添加粘贴事件监听器
@@ -668,7 +679,7 @@ defineExpose({
 
 :deep(.qrcode-target) {
   position: absolute;
-  right: 3px; 
+  right: 3px;
   width: 35px;
   height: 35px;
   color: red;

package/src/loader/src/File.js

@@ -585,7 +585,7 @@ function selfValidExcute(eventName, model) {
     }
     if (model.required) {
         if (File.getfileListLength(model) === 0) {
-            model.validMessage = "必须上传附件";
+            model.validMessage = common.LocalizedString("必须上传附件","必須上傳附件");
             model.valid = false;
             model.displayValidMessage = model.validMessage;
             return false;

package/src/loader/src/Photo.js

@@ -380,7 +380,7 @@ function viewerfile(file, model) {
 function selfValidExcute(eventName, model) {
     if (model.required) {
         if (Photo.getfileListLength(model) === 0) {
-            model.validMessage = "必须上传附件";
+            model.validMessage = common.LocalizedString("必须上传附件","必須上傳附件");
             model.valid = false;
             model.displayValidMessage = model.validMessage;
             return false;