centaline-data-driven-v3 0.0.49 → 0.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -15,6 +15,7 @@
     "element-plus": "^2.5.5",
     "moment": "^2.30.1",
     "photo-sphere-viewer": "^4.8.1",
+    "sortablejs": "^1.15.6",
     "vant": "^4.8.0",
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vue": "^3.3.4",

package/src/components/app/PhotoSelect.vue

@@ -1,15 +1,17 @@
 <template>
     <div class="van-uploader" style="margin:10px 10px 0 10px; ">
         <div class="van-uploader__wrapper">
-            <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 ref="uploadImgItem">
+                <template v-for="(element, index) in photoList" :key="element.mediaCode">
+                    <div class="van-uploader__preview" style="display:inline-block;"
+                        @click="viewerfile(photoList, index)">
                         <div class="van-image van-uploader__preview-image">
                             <img :src="element.thumbnailUrl" class="van-image__img" style="object-fit: cover;">
                             <div class="van-uploader__preview-cover">
                                 <div class="preview-cover van-ellipsis">{{ element.mediaLabelName }}</div>
                             </div>
-                            <div class="swiper-i" @click="viewerfile(photoList, index)" v-if="element.mediaTypeID == '7'">
+                            <div class="swiper-i" @click="viewerfile(photoList, index)"
+                                v-if="element.mediaTypeID == '7'">
                                 <img :src="util.getAssetsImage('p3602x.png')" class="hous-icon" />
                             </div>
                         </div>
@@ -21,7 +23,7 @@
 
                     </div>
                 </template>
-            </draggable>
+            </div>
             <div class="van-uploader__upload" v-if="!model.locked && photoList.length < max" @click="handleOpen()">
                 <i class="van-badge__wrapper van-icon van-icon-plus van-uploader__upload-icon"></i>
             </div>
@@ -29,12 +31,12 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick } from 'vue'
+import { ref, nextTick, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import common from '../../utils/common'
 import util from '../../utils/pub-use'
 import PhotoSelect from '../../loader/src/PhotoSelect';
-import draggable from "vuedraggable";
+import Sortable from 'sortablejs'
 const emit = defineEmits(['loaded'])
 const props = defineProps({
     vmodel: Object,
@@ -42,17 +44,11 @@ const props = defineProps({
 })
 const max = ref(99999)
 const photoList = ref([])
-const dragOptions = {
-    animation: 200,
-    group: "description",
-    disabled: false,
-    'item-key': "mediaID",
-    ghostClass: "ghost",
-    dragClass: "drag",
-    chosenClass: "chosen",
-    forceFallback: true,
-    handle:'.van-uploader__preview-image',
-}
+const uploadImgItem = ref()
+
+onMounted(() => {
+    initDragSort()
+})
 
 const model = ref()
 init();
@@ -63,6 +59,30 @@ function init() {
     }
 
 }
+const initDragSort = () => {
+    nextTick(() => {
+        // 选择包含所有可排序项目的容器
+        const el = uploadImgItem.value
+
+        // 确保 el 是一个有效的 DOM 元素
+        if (el) {
+            Sortable.create(el, {
+                group: 'shared', // 设置同一组内的元素可以互相排序
+                fallbackOnBody: false, // 如果需要的话，可以在 body 上进行拖拽
+                swapThreshold: 0.65, // 控制元素交换的阈值
+                onEnd: (/** 事件对象 */ evt) => {
+                    // 获取旧的索引和新索引
+                    const { oldIndex, newIndex } = evt
+                    // 交换位置
+                    const movedItem = photoList.value.splice(oldIndex, 1)[0]
+                    photoList.value.splice(newIndex, 0, movedItem)
+
+                    PhotoSelect.setfileSourceList(photoList.value, model.value);
+                }
+            })
+        }
+    })
+}
 
 function load(data) {
     model.value = data;
@@ -140,22 +160,8 @@ function handleOpen() {
 
 
 }
-function onEnd(a, b) {
-
-    nextTick(function () {
-        PhotoSelect.setfileSourceList(photoList.value, model.value);
-    });
-}
-function radiochecked(list, item) {
 
-    list.forEach((v) => {
-        v.flagDefault = false;
-    });
-    item.flagDefault = true;
-    PhotoSelect.setfileSourceList(list, model.value);
 
-    selfValidExcute("valid");
-}
 //不能共用的数据校验
 function selfValidExcute(eventName) {
     return PhotoSelect.selfValidExcute(eventName, model.value)
@@ -196,6 +202,7 @@ defineExpose({
     position: absolute;
     bottom: 0;
 }
+
 .swiper-i {
     position: absolute;
     width: 100%;
@@ -217,9 +224,9 @@ defineExpose({
     transform: translate(-50%, -50%);
 }
 
-.van-uploader__preview-image,.van-uploader__upload {
+.van-uploader__preview-image,
+.van-uploader__upload {
     width: 110px;
     height: 110px;
 }
-
 </style>

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

@@ -29,9 +29,11 @@
                     <template v-else>
                         <van-checkbox-group v-model="checkeds" ref="refCheckboxGroup">
                             <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex">
-                                <van-checkbox v-if="isoperate || flagPopupSearchlist" shape="square"
-                                    checked-color="#EE6B6B" icon-size="14px" :name="rowindex" @click="selectRow(row)"
-                                    :disabled="!flagSelect(row)"></van-checkbox>
+                                <template v-if="isoperate || flagPopupSearchlist">
+                                    <van-checkbox v-if="flagSelect(row)" shape="square" checked-color="#EE6B6B"
+                                        icon-size="14px" :name="rowindex" @click="selectRow(row)"></van-checkbox>
+                                    <div class="van-checkbox" v-else></div>
+                                </template>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
                                     :actionRouter="model.actionRouter"

package/src/components/web/ComboBox.vue

@@ -167,6 +167,7 @@ function clear() {
             model.value.value.push(v.code);
         });
     }
+    model.value.reset();
 }
 // 重新计算弹出最小宽度
 function setminWidth() {

package/src/components/web/File.vue

@@ -107,7 +107,7 @@
 
               <div @dragstart="drag($event, file)" @drop="drop($event, file)" @dragover.prevent
                 @dragenter="dragenter($event, file)" @dragleave="dragleave($event, file)" >             
-                <el-image fit="fill"
+                <el-image fit="fill" @click="viewerfile(file)"
                   :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>

package/src/components/web/TreeList.vue

@@ -8,10 +8,9 @@
                         :searchDataApi="searchDataApi" :searchtreeHeight="searchtreeHeight" @loaded="loaded"></ct-tree>
                 </div>
 
-                <div class="resizer" @mousedown="startResizing"></div>
             </el-aside>
-            <el-main v-if="isShowMain">
-
+            <el-main v-if="isShowMain" style="position: relative;">
+                <div class="resizer" @mousedown="startResizing"></div>
                 <template v-if="pageType == 'form'">
                     <div style="height: 100%;">
                         <div class="ct-form"
@@ -171,17 +170,13 @@ onUnmounted(() => {
 
 
 <style scoped>
-.el-aside {
-    position: relative;
-}
-
+ 
 .resizer {
     position: absolute;
     top: 0;
-    right: 0;
-    width: 3px;
+    left: 0;
+    width: 2px;
     height: 100%;
-    cursor: ew-resize;
-    background-color: rgba(0, 0, 0, 0.2);
+    cursor: ew-resize; 
 }
 </style>

package/src/components/web/ViewerFile/ViewerPDFjs.vue

@@ -41,10 +41,23 @@ function complete() {
 
             var doc = document.getElementById("previewPdf").contentWindow.document;
             if (doc) {
-                doc.getElementById("download").style.display = "none";
-                doc.getElementById("openFile").style.display = "none";
-                doc.getElementById("print").style.display = "none";
-                doc.getElementById("viewBookmark").style.display = "none";
+                elementHideById("download", doc)
+                elementHideById("openFile", doc)
+                elementHideById("print", doc)
+                elementHideById("viewBookmark", doc)
+
+                elementHideById("editorHighlightButton", doc)
+                elementHideById("editorFreeText", doc)
+                elementHideById("editorInk", doc)
+                elementHideById("editorStamp", doc)
+                elementHideById("editorModeButtons", doc)
+
+                elementHideById("printButton", doc)
+                elementHideById("downloadButton", doc)
+
+                elementHideById("secondaryOpenFile", doc)
+                elementHideById("cursorToolButtons", doc)
+                elementHideById("documentProperties", doc)
                 doc.oncontextmenu = new Function("event.returnValue=false");
             }
         }
@@ -71,6 +84,13 @@ function getApplicationPath() {
     }
     return url;
 }
+function elementHideById(elementId, doc) {
+  if (doc.getElementById(elementId) != null) {
+    if (doc.getElementById(elementId).style) {
+      doc.getElementById(elementId).style.display = "none";
+    }
+  }
+}
 watch(() => props.src, () => {
     init(props.src);
     //complete();

package/src/main.js

@@ -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_4e6cac0d-0185-4e8c-83ca-e4cf26373ff8",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_4e6cac0d-0185-4e8c-83ca-e4cf26373ff8",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_5d2d290d-98da-4c00-adef-bb975c372e46",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_5d2d290d-98da-4c00-adef-bb975c372e46",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/views/SearchList.vue

@@ -1,8 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-      :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>