centaline-data-driven-v3 0.0.45 → 0.0.46

package/package.json

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

package/src/components/app/PhotoSelect.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="van-uploader" style="margin:10px 10px 0 10px; ">
         <div class="van-uploader__wrapper">
-            <draggable :list="photoList" v-bind="dragOptions" @change="onEnd" class="card" @dragover.prevent @drop.prevent>
+            <draggable :list="photoList" v-bind="dragOptions" :distance="1" @change="onEnd" class="card" @dragover.prevent @drop.prevent>
                 <template #item="{ element, index }">
                     <div class="van-uploader__preview" style="display:inline-block;" @click="viewerfile(photoList, index)">
                         <div class="van-image van-uploader__preview-image">

package/src/components/app/ViewerFile.vue

@@ -32,8 +32,7 @@
                         </div>
                     </div>
                     <template v-if="file.mediaTypeID == '1'">
-                        <iframe :src="file.mediaUrl" :height="displayAreaHeight - 80 + 'px'"
-                            :width="displayAreaWidth + 'px'" style="border-width: 0px;">
+                        <iframe :src="file.mediaUrl" height="100%" width="100%" style="border-width: 0px;">
                         </iframe>
                     </template>
                     <!--Photo-->
@@ -48,11 +47,16 @@
                     <template v-else-if="file.mediaTypeID == '4'">
                         <div class="viewerContent">
                             <template v-if="file.thumbnailUrl">
-                                <video preload="none" :poster="file.thumbnailUrl" :src="file.mediaUrl"
-                                    controls="controls" controlslist="nodownload" style="width: 100%;">
-                                    您的浏览器不支持 video 标签。
-                                </video>
-
+                                <template v-if="common.isVideoFile(file.mediaUrl)">
+                                    <video preload="none" :poster="file.thumbnailUrl" :src="file.mediaUrl"
+                                        controls="controls" controlslist="nodownload" style="width: 100%;">
+                                        您的浏览器不支持 video 标签。
+                                    </video>
+                                </template>
+                                <template v-else>
+                                    <iframe :src="file.mediaUrl" height="100%" width="100%" style="border-width: 0px;">
+                                    </iframe>
+                                </template>
                             </template>
                             <template v-else>
                                 <video preload="none" :src="file.mediaUrl" controls="controls" class="viewerContent"
@@ -109,7 +113,7 @@
 </template>
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
-
+import common from '../../utils/common'
 import viewerImage from './ViewerFile/ViewerImage.vue';
 import viewerPDF from './ViewerFile/ViewerPDF.vue';
 import viewerP360 from './ViewerFile/viewerP360.vue';
@@ -191,7 +195,7 @@ function onswipenext() {
 }
 
 .enlarge-picture {
-    display:flex;
+    display: flex;
     padding: 2px 0;
 }
 </style>

package/src/components/web/File.vue

@@ -7,12 +7,12 @@
         v-model:file-list="model.fileList" :multiple="true" :auto-upload="true" :action="action()"
         :data="model.uploadData" :headers="headers" :before-upload="beforeUploadProcess"
         :on-success="handleAvatarSuccess" :on-error="handleAvatarError" :on-progress="uploadProcess"
-        :limit="parseInt(model.maxValue1 || 999)" :on-exceed="handleExceed">
+        :limit="parseInt(model.maxValue1 || 999)" :on-exceed="handleExceed"
+        :uploadStatus="!model.disableUpload&&!model.locked?'upload':'lock'"
+        >
         <el-icon>
           <Plus />
-        </el-icon>
-        <input style="position: absolute;width: 0px;height: 0px;top: 13px;left: 5px;" type="text" placeholder="粘贴上传"
-          source="upload" @paste="handlePaste" ref="refPasteUpload" />
+        </el-icon> 
         <template #tip>
           <div class="el-upload__tip errorMessage" style="white-space:pre-wrap;" v-show="!model.valid"
             v-html="model.validMessage">
@@ -20,14 +20,9 @@
           <div v-show="model.description" v-html="model.description">
           </div>
         </template>
-        <div class="qrcode-target">
-          <img @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction" :src="util.getAssetsImage('serw1.png')"
+        <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="扫码上传" />
-          <div style="cursor: pointer;    height: 16px;line-height: 16px; float: right;" @click.stop="getFocus">
-            <el-icon style="font-size: 14px;" title="粘贴上传">
-              <DocumentCopy />
-            </el-icon>
-          </div>
         </div>
         <div class="ScanUploadPhoto" v-if="model.qrcodeVisible" @click.stop="qrcodeVisible = true"
           :style="{ top: model.QRCodeRefTop + 'px', left: model.QRCodeRefLeft + 'px' }">
@@ -192,14 +187,12 @@ const props = defineProps({
 })
 const refct_upload = ref()
 const refupload = ref()
-const QRCodeRef = ref()
-const refPasteUpload = ref()
+const QRCodeRef = ref() 
 const UploadhttpRequest = ref({})
 const startfile = ref();
 const endfile = ref();
 const model = ref(null);
-
-const flagPasteUpload = ref(false);
+ 
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
@@ -633,40 +626,32 @@ function viewerfile(file) {
   File.viewerfile(file, model.value)
 }
 
-function getFocus() {
-  refPasteUpload.value.focus();
-}
-
-function handlePaste(event) {
-  flagPasteUpload.value = true;
-  PasteUpload(event);
-}
-
+ 
+ 
 function PasteUpload(event) {
-
-  // 获取粘贴板中的图片
-  const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
-  const items = clipboardDatas.items;
-  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();
+  if (!model.value.locked && !model.value.disableUpload) {
+    // 获取粘贴板中的图片
+    const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
+    const items = clipboardDatas.items;
+    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();
+      }
     }
   }
-
 }
 
-function ListenerPaste(event) {
-  if (!flagPasteUpload.value) {
+function ListenerPaste(event) { 
     var target = event.target;
-    const uploads = document.querySelectorAll('input[source="upload"]');
+    const uploads =  document.querySelectorAll('[uploadStatus="upload"]');
 
     if (!window.uploads) {
       window.uploads = { count: 0, length: uploads.length };
@@ -689,10 +674,7 @@ function ListenerPaste(event) {
       window.uploads = null;
       PasteUpload(event);
     }
-  }
-  else {
-    flagPasteUpload.value = false;
-  }
+  
 
 }
 
@@ -840,7 +822,7 @@ defineExpose({
   position: absolute;
   top: 3px;
   right: 3px;
-  width: 50px;
+  width: 35px;
   height: 35px;
   color: red;
   text-align: right;

package/src/components/web/PhotoSelect.vue

@@ -197,19 +197,24 @@ function selfValidExcute(eventName) {
 }
 
 function viewerfile(list, index) {
+    var file = list[index];
+    if (file && file.mediaTypeID == 4 && !common.isVideoFile(file.mediaUrl)) {
+        window.open(file.mediaUrl)
+    }
+    else {
+        var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
 
-    var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
+        let fileList = list.filter((item) => {
+            return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+            MediaAlbum[0].medias.push(v);
+        });
+        common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
+    }
 
-    let fileList = list.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
 }
 
-
 defineExpose({
     model
 })

package/src/components/web/PhotoSelectList.vue

@@ -225,16 +225,21 @@ function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     }
 }
 function viewerfile(list, index) {
+    var file = list[index];
+    if (file && file.mediaTypeID == 4 && !common.isVideoFile(file.mediaUrl)) {
+        window.open(file.mediaUrl)
+    }
+    else {
+        var MediaAlbum = [{ albumName: model.value.label || "媒体", medias: [] as any }];
 
-    var MediaAlbum = [{ albumName: model.value.label || "媒体", medias: [] as any }];
-
-    let fileList = list.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    common.viewerfile((model.value.label || "预览媒体"), MediaAlbum, 0, index, props.mediaViewPageType);
+        let fileList = list.filter((item) => {
+            return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+            MediaAlbum[0].medias.push(v);
+        });
+        common.viewerfile((model.value.label || "预览媒体"), MediaAlbum, 0, index, props.mediaViewPageType);
+    }
 }
 function change() {
     loading.value = true;

package/src/components/web/ViewerFile.vue

@@ -50,10 +50,10 @@
                     </div>
                     <div class="toggler" @click="mediaLabelShow=!mediaLabelShow" v-if="itemFile.mediaLabelName||itemFile.mediaDescCN||itemFile.mediaDescEN||itemFile.mediaUploadEmployeeDesc">
                         <span class="glyphicon glyphicon-chevron-right" v-if="mediaLabelShow">
-                            <el-icon><ArrowRightBold /></el-icon>
+                            <el-icon color="#000000"><ArrowRightBold /></el-icon>
                         </span>
                         <span class="glyphicon glyphicon-chevron-left" v-if="!mediaLabelShow">
-                            <el-icon><ArrowLeftBold /></el-icon>
+                            <el-icon color="#000000"><ArrowLeftBold /></el-icon>
                         </span>
                     </div>
                 </div>
@@ -486,16 +486,17 @@ html {
 .cont {
     position: absolute;
     z-index: 100000000000000;
-    color: black;
+    color: #ffffff;
     width: auto;
     display: inline-block !important;
     display: inline;
     background-color: #ffffff00;
     font-size: 12px;
+    background: rgba(0, 0, 0, .45);
 }
 
 .enlarge-picture {
-    padding: 5px 0;
+    padding: 5px 10px;
 }
 .toggler {
     -webkit-border-top-right-radius: 4px;

package/src/components/web/photo.vue

@@ -13,11 +13,8 @@
         <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 : '']">
-          
-        <input style="position: absolute;width: 0px;height: 0px; top: 13px;left: 5px" source="upload" type="text"
-          placeholder="粘贴上传" @paste="handlePaste" ref="refPasteUpload" />
-
-          <el-upload :class="model.disableUpload ? 'ct-upload-display-none' : ''" v-bind="UploadhttpRequest"
+ 
+          <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"
@@ -31,7 +28,7 @@
                 <div :style="{ 'width': (model.maxValue1 || 100) + 'px', 'height': (model.minValue1 || 100) + 'px' }"
                   :title="file.fileName" v-for="(file, index) in model.fileList">
                   <div class="cover-list-item">
-                    <span class="tool-top" :style="{ right: (model.QRCodeAction ? '54px' : '17px') }">
+                    <span class="tool-top" :style="{ right: (model.QRCodeAction ? '39px' : '2px') }">
 
                       <span v-if="!model.locked && file.rightCrop && file.mediaTypeID == 2" style="cursor: pointer;">
                         <el-icon @click.stop="handleEdit(file)">
@@ -95,16 +92,10 @@
               <div v-show="model.description" v-html="model.description">
               </div>
             </template>
-            <div class="qrcode-target">
-              <img @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
+            <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="扫码上传" />
-              <div style="cursor: pointer;height: 16px;line-height: 16px; float: right;" @click.stop="getFocus">
-                <el-icon title="粘贴上传">
-                  <DocumentCopy />
-                </el-icon>
-              </div>
-
+                title="扫码上传" /> 
             </div>
             <div class="ScanUploadPhoto" v-if="model.qrcodeVisible" @click.stop="qrcodeVisible = true"
               :style="{ top: model.QRCodeRefTop + 'px', left: model.QRCodeRefLeft + 'px' }">
@@ -152,11 +143,9 @@ const props = defineProps({
 })
 const refct_Photo = ref()
 const refupload = ref()
-const QRCodeRef = ref()
-const refPasteUpload = ref()
+const QRCodeRef = ref() 
 const UploadhttpRequest = ref({})
-const model = ref(null)
-const flagPasteUpload = ref(false);
+const model = ref(null) 
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
@@ -487,41 +476,32 @@ function QRCodeLocate() {
 function viewerfile(file) {
   Photo.viewerfile(file, model.value)
 }
-
-function getFocus() {
-  refPasteUpload.value.focus();
-}
-
-function handlePaste(event) {
-  flagPasteUpload.value = true;
-  PasteUpload(event);
-}
-
+ 
 function PasteUpload(event) {
-
-  // 获取粘贴板中的图片
-  const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
-  const items = clipboardDatas.items;
-  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();
+  if (!model.value.locked) {
+    // 获取粘贴板中的图片
+    const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
+    const items = clipboardDatas.items;
+    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) {
-  if (!flagPasteUpload.value) {
+function ListenerPaste(event) { 
+
     var target = event.target;
-    const uploads = document.querySelectorAll('input[source="upload"]');
+    const uploads =  document.querySelectorAll('[uploadStatus="upload"]');
 
     if (!window.uploads) {
       window.uploads = { count: 0, length: uploads.length };
@@ -533,7 +513,7 @@ function ListenerPaste(event) {
       if (window.uploads.count == window.uploads.length) {
         window.uploads = null;
         ElMessage({
-          message: "存在多个上传组件，请点击粘贴上传！",
+          message: "存在多个上传组件，请点击上传！",
           type: 'info',
           showClose: true,
         });
@@ -544,11 +524,7 @@ function ListenerPaste(event) {
       window.uploads = null;
       PasteUpload(event);
     }
-  }
-  else {
-    flagPasteUpload.value = false;
-  }
-
+  
 }
 
 // 添加粘贴事件监听器
@@ -692,8 +668,8 @@ defineExpose({
 
 :deep(.qrcode-target) {
   position: absolute;
-  right: 3px;
-  width: 50px;
+  right: 3px; 
+  width: 35px;
   height: 35px;
   color: red;
   text-align: right;

package/src/loader/src/SearchTable.js

@@ -169,13 +169,13 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         },
         //查询数据
         sortData: [],
-        sortString:'',
+        sortString: '',
         pageData: {
             get orderBy() {
                 if (rtn.sortData.length > 0) {
                     return rtn.sortData[0].sortName + ' ' + rtn.sortData[0].sortAction;
                 }
-                else if(rtn.sortString){
+                else if (rtn.sortString) {
                     return rtn.sortString;
                 }
             },
@@ -740,9 +740,14 @@ function apiData(model, callback) {
                     else {
                         if (!common.flagApp()) {
                             model.$vue.refreshTableColumns(response);
+                        } else {
+                            model.$vue.loadStats();
                         }
                     }
                 }
+                else {
+                    model.$vue.loadStats();
+                }
                 if (response.content.updateToolButtons) {
                     if (response.content.toolButtons) {
                         model._buttons = [];

package/src/main.js

@@ -26,7 +26,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -63,7 +63,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
-                authObject: '{EmpID:"Token_2fdaf18a-b466-4022-a084-8040775a1787",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_2fdaf18a-b466-4022-a084-8040775a1787",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_de95f4d5-ff59-4e26-bcbc-0581d420ca06",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_de95f4d5-ff59-4e26-bcbc-0581d420ca06",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/router/index.js

@@ -3,7 +3,6 @@ import form from "@/views/Form.vue"
 import Search from '@/views/SearchList.vue'
 import Tree from '@/views/Tree.vue'
 import container from '@/views/container.vue'
-import appContainer from '@/views/appContainer.vue'
 
 const routes = [
   {
@@ -27,11 +26,6 @@ const routes = [
     path: "/container",
     name: "container",
     component: container
-  },
-  {
-    path: "/appContainer",
-    name: "appContainer",
-    component: appContainer
   }
 ]
 

package/src/utils/common.js

@@ -1,4 +1,4 @@
-import { showConfirmDialog, showToast,showDialog } from 'vant';
+import { showConfirmDialog, showToast, showDialog } from 'vant';
 import { ElMessage } from 'element-plus'
 let dataDrivenOpts = {}
 const common = {
@@ -280,7 +280,10 @@ const common = {
   message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
     if (dataDrivenOpts.flagApp) {
       if (this.hasHtml(message)) {
-        showDialog({ message: message,allowHtml:true });
+        showDialog({ message: message, allowHtml: true });
+      }
+      else if(type=='error'){
+        showDialog({ title: '提示', message:message, closeOnClickOverlay: true, confirmButtonText: '确定', className: 'showDialogMessage' });
       }
       else {
         showToast(message);
@@ -860,5 +863,9 @@ const common = {
       return document.body;
     }
   },
+  isVideoFile(url) {
+    const videoExtensions = /\.(mp4|mov|webm|avi|wmv|flv)$/i;
+    return videoExtensions.test(url);
+  },
 };
 export default common;