centaline-data-driven-v3 0.0.44 → 0.0.46

package/package.json

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

package/src/components/app/FormList.vue

@@ -399,9 +399,8 @@ defineExpose({
 }
 
 .ct-formTable .list-button {
-    display: flex;
-    justify-content: right;
     margin-right: 10px;
+    text-align: right;
 }
 
 .select-cost table {

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/app/searchScreen.vue

@@ -2,7 +2,8 @@
     <div class="ct-serach-screen" v-if="model">
         <div class="screen-serach" style="display: flex;flex-direction: row;">
             <div style="display: flex; flex: 1;">
-                <van-dropdown-menu v-if="showScreen && screendata.length > 0" active-color="#EE6B6B" style=" width: 100%;">
+                <van-dropdown-menu v-if="showScreen && screendata.length > 0" active-color="#EE6B6B"
+                    style=" width: 100%;">
                     <van-dropdown-item v-for="(field, index) in screendata" :key="index" ref="Refitem"
                         :title-class="field.searchValue || field.searchValue1 ? 'title color-EE6B6B' : 'title'"
                         @open="open(field)" @close="close(field)">
@@ -32,7 +33,6 @@
                             <component :is="field.is" :vmodel="field" ref="Fields"
                                 :parameterAction="model.parameterAction" />
                         </template>
-
                         <van-sticky position="bottom">
                             <div style="padding: 5px 16px; display: flex;background-color: #ffffff;">
                                 <van-button color="#ECECEC" block @click="reset"
@@ -47,8 +47,11 @@
                     </van-dropdown-item>
                 </van-dropdown-menu>
             </div>
-            <div style="display: flex;width: 60px;align-items: center;justify-content: center;" v-if="flagsort" @click="clicksort">
-                <span class="van-ellipsis" style="font-size: 14px;line-height: 22px;color: #323233;">{{sortname != '' ? sortname : '排序'}}</span>
+            <div style="display: flex;width: 60px;align-items: center;justify-content: center;" v-if="flagsort"
+                @click="clicksort">
+                <span class="van-ellipsis" style="font-size: 14px;line-height: 22px;color: #323233;">{{ sortname != '' ?
+                    sortname :
+                    '排序' }}</span>
                 <van-icon name="sort" size="13" color="#323233" />
             </div>
         </div>
@@ -329,7 +332,7 @@ function getsortfield(field) {
 function selectsort(ev) {
     issort.value = false;
     sortname.value = "";
-    if(ev.code){
+    if (ev.code) {
         sortname.value = ev.name;
     }
     emit("sort", ev);

package/src/components/web/File.vue

@@ -7,11 +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>
+        </el-icon> 
         <template #tip>
           <div class="el-upload__tip errorMessage" style="white-space:pre-wrap;" v-show="!model.valid"
             v-html="model.validMessage">
@@ -19,8 +20,10 @@
           <div v-show="model.description" v-html="model.description">
           </div>
         </template>
-        <img class="qrcode-target" @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
-          :src="util.getAssetsImage('serw1.png')" style="width: 35px;height: 35px;" alt="扫码上传" title="扫码上传">
+        <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>
         <div class="ScanUploadPhoto" v-if="model.qrcodeVisible" @click.stop="qrcodeVisible = true"
           :style="{ top: model.QRCodeRefTop + 'px', left: model.QRCodeRefLeft + 'px' }">
           <div style="border-bottom:none">
@@ -103,11 +106,8 @@
 
 
               <div @dragstart="drag($event, file)" @drop="drop($event, file)" @dragover.prevent
-                @dragenter="dragenter($event, file)" @dragleave="dragleave($event, file)">
-                <div v-if="file.progressFlag" v-loading="file.progressFlag" style="width: 100px; height: 100px"
-                  element-loading-spinner="el-icon-loading">
-                </div>
-                <el-image v-else fit="fill"
+                @dragenter="dragenter($event, file)" @dragleave="dragleave($event, file)" >             
+                <el-image fit="fill"
                   :src="file.url ? file.url : file.mediaUrl ? file.mediaUrl + '/100/100' : util.getAssetsImage('blank.png')"
                   style="width: 100px; height: 100px" :z-index="previewZIndex">
                 </el-image>
@@ -187,11 +187,13 @@ const props = defineProps({
 })
 const refct_upload = ref()
 const refupload = ref()
-const QRCodeRef = ref()
-
+const QRCodeRef = ref() 
 const UploadhttpRequest = ref({})
+const startfile = ref();
+const endfile = ref();
+const model = ref(null);
+ 
 
-const model = ref(null)
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
 })
@@ -222,6 +224,7 @@ function action() {
   return "";
 }
 
+
 function load(data) {
   model.value = data;
   model.value.validExcute = () => {
@@ -410,7 +413,7 @@ async function SliceUpload(options) {
   }
   // data是上传时附带的额外参数，file是文件
 
-  let uid = model.value.uploadguid;
+  let uid = File.uploadguid();
   try {
     file.uid = file.uid || uid;
 
@@ -568,8 +571,7 @@ function QRCodeLocate() {
 }
 
 
-const startfile = ref();
-const endfile = ref();
+
 
 function drag(e, file) {
   startfile.value = file;
@@ -624,10 +626,66 @@ function viewerfile(file) {
   File.viewerfile(file, model.value)
 }
 
+ 
+ 
+function PasteUpload(event) {
+  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) { 
+    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.count == window.uploads.length) {
+        window.uploads = null;
+        ElMessage({
+          message: "存在多个上传组件，请点击粘贴上传！",
+          type: 'info',
+          showClose: true,
+        });
+        return false;
+      }
+    }
+    else if (uploads.length == 1) {
+      window.uploads = null;
+      PasteUpload(event);
+    }
+  
+
+}
+
+// 添加粘贴事件监听器
+document.addEventListener('paste', ListenerPaste);
 onBeforeUnmount(() => {
   //销毁定时上传
   clearTimeout(model.value.qrtimer);
   window.removeEventListener('scroll', model.value.QRCodeLocate, true)
+  //销毁贴事件监听器 
+  document.removeEventListener('paste', ListenerPaste)
 })
 
 defineExpose({
@@ -766,6 +824,8 @@ defineExpose({
   right: 3px;
   width: 35px;
   height: 35px;
+  color: red;
+  text-align: right;
 }
 
 :deep(.ScanUploadPhoto) {

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/SearchList/SearchStats.vue

@@ -80,15 +80,20 @@ const props = defineProps({
         Boolean,
         default: false,
     },
+    apiParam: {
+        type: Object,
+        default: () => { }
+    },
 })
 const model = ref(null)
 const FlagStatistics = ref(false)
 const sortData = ref(null)
-const selectStats = ref([])
+const selectStats = ref('')
 const showData = ref([])
 const flagClick = ref(false)
 const lastWidth = ref(0)
 const showWidth = ref(0)
+const fieldName1 = ref('')
 const option = ref({
     isHidden: true, //是否开启操作栏隐藏设置，默认开启
     showNum: 3, //如果isHidden为true时，个数大于3就会隐藏，默认是3
@@ -130,12 +135,14 @@ function load(data) {
             data.source.content.forEach((item, index) => {
                 item.sort = index;
                 item.key = item.fieldName1 + "*" + replabel(item.controlLabel);
+                fieldName1.value = item.fieldName1;
                 sortData.value[item.key] = index;
             });
         }
         else {
             data.source.content.forEach((item, index) => {
                 item.key = item.fieldName1 + "*" + replabel(item.controlLabel);
+                fieldName1.value = item.fieldName1;
                 if (sortData.value[item.key] == undefined) {
                     item.sort = index;
                 } else {
@@ -151,11 +158,18 @@ function load(data) {
                 return -1; // 顺序不变
             }
         });
-
+        if (selectStats.value == '') {
+            var m = data.source.content.find((v) => {
+                return v.code1 === props.apiParam[fieldName1.value];
+            });
+            if (m) {
+                selectStats.value = m.key
+            }
+        }
         let i = data.source.content.findIndex(
             (v) => selectStats.value === v.key
         );
-        if (i == -1 || selectStats.value == []) {
+        if (i == -1 || selectStats.value == '') {
             handleClick(data.source.content[0], false);
         }
         FlagStatistics.value = true;
@@ -232,7 +246,7 @@ function replabel(labelName) {
 }
 function getsearchStats() {
     let rtn = [];
-    if (selectStats.value != []) {
+    if (selectStats.value != '') {
         let n = model.value.source.content.find(
             (v) => selectStats.value === v.key
         );

package/src/components/web/SearchList/SearchTable.vue

@@ -2,7 +2,7 @@
     <div style="width: 100%" class="ct-searchtable" ref="refSearchTable">
         <SearchStats ref="refTableStats" v-if="!isLoading && model && searchStatsApi" :api="searchStatsApi"
             @searchStats="clickSearchStats" :searchModel="model.searchModel" @setTableHeight="setTableHeight"
-            :flagDisabled="disabledStats">
+            :flagDisabled="disabledStats" :apiParam="apiParam">
         </SearchStats>
         <TableToolbar ref="refToolbar" v-if="!isLoading && model && model.buttons" :buttons="model.buttons"
             :key="model.toolbarKey" @click="toolbarClickHandler" @importComplete="importComplete"
@@ -243,6 +243,10 @@ const props = defineProps({
     api: String,
     searchStatsApi: String,
     flagAppMode: Boolean,
+    apiParam: {
+        type: Object,
+        default: () => { }
+    },
     flagFocus: {
         Boolean,
         default: true,

package/src/components/web/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
     <div ref="refMain" style="width: 100%;height: 100%;display: flex;" :class="{ 'domDisabled': pageDisabled }">
         <div class="search-list"
-            :style="{ 'height': pageHeightReal ? pageHeightReal : '100%', 'width': searchWidth ? searchWidth + 'px' : '100%','background':isLayout?'#ffffff':'' }">
+            :style="{ 'height': pageHeightReal ? pageHeightReal : '100%', 'width': searchWidth ? searchWidth + 'px' : '100%', 'background': isLayout ? '#ffffff' : '' }">
             <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
                 <span style="font-weight:bold">{{ title }}</span>
             </div>
@@ -15,10 +15,11 @@
             <searchTable ref="refTable" :api="searchDataApi" :key="reloadKey" :searchStatsApi="searchStatsApi"
                 :from="from" :isIframe="isIframe" :documentHeight="documentHeight" :documentWidth="documentWidth"
                 :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
-                @searchComplate="searchComplate" @loaded="tableLoaded" @rowClickHandle="rowClickHandle"
-                @refreshRowHandle="refreshRowHandle" @scrollHandle="scrollHandle" @refreshParent="refreshParentHandler"
-                @simpleRouterRefreshHandler="simpleRouterRefreshHandler" @closeSideBar="closeSideBar"
-                @popupClickHandler="popupClickHandler" :dragStartItem="dragStartItem" :dragStartName="dragStartName"
+                :apiParam="apiParam" @searchComplate="searchComplate" @loaded="tableLoaded"
+                @rowClickHandle="rowClickHandle" @refreshRowHandle="refreshRowHandle" @scrollHandle="scrollHandle"
+                @refreshParent="refreshParentHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"
+                @closeSideBar="closeSideBar" @popupClickHandler="popupClickHandler" :dragStartItem="dragStartItem"
+                :dragStartName="dragStartName"
                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
             </searchTable>
         </div>
@@ -42,7 +43,7 @@ import SearchCategory from './SearchList/SearchCategory.vue';
 import SearchSideMenu from './SearchList/SearchSideMenu.vue';
 import SearchSideRight from './SearchList/SearchSideRight.vue';
 import { ref, nextTick, onMounted, watch, onActivated } from 'vue'
-const emit = defineEmits(['loaded', 'failLoad', 'tableLoaded', 'scrollHandle', 'rowClickHandle', 'refreshParent', 'submit','flagNotificationParentAfterContentChanged'])
+const emit = defineEmits(['loaded', 'failLoad', 'tableLoaded', 'scrollHandle', 'rowClickHandle', 'refreshParent', 'submit', 'flagNotificationParentAfterContentChanged'])
 const props = defineProps({
     vmodel: Object,
     parameterAction: String,
@@ -158,7 +159,7 @@ function screenLoaded(defaultSearch) {
     if (props.from && props.from == 'detail') {
         screenTop.value = refScreen.value.$el.offsetTop;
     }
-    pageDisabled.value=true;
+    pageDisabled.value = true;
     refTable.value.searchComplate(refScreen.value.model, defaultSearch);
     emit('loaded', refScreen.value.model);
 }
@@ -232,10 +233,10 @@ function searchComplate(index) {
 }
 function tableLoaded() {
     title.value = refTable.value.model.title;
-    pageDisabled.value=false;
+    pageDisabled.value = false;
     flagSideBar.value = refTable.value.model.flagSideBar;
     flagDefaultDisplaySideBar.value = refTable.value.model.flagDefaultDisplaySideBar;
-    isLayout.value=refTable.value.model.isLayout;
+    isLayout.value = refTable.value.model.isLayout;
     if (refTable.value.model.rowSelectRouter) {
         rowSelectRouter.value = refTable.value.model.rowSelectRouter
         sideBarPageType.value = refTable.value.model.rowSelectRouter.actionSource;

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;