centaline-data-driven-v3 0.1.58 → 0.1.60

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

@@ -398,7 +398,7 @@ function searchComplate(m, defaultSearch) {
                 searchEnd.value = Date.now();
                 isLoading.value = false;
                 tableLoading.value = false;
-            },null,props.appRootUrl);
+            }, null, props.appRootUrl);
         }
         if (typeof props.source !== "undefined") {
             load(SearchTable.loadSearchTableModel(props.source));
@@ -412,9 +412,9 @@ function searchComplate(m, defaultSearch) {
 //初始化数据
 function load(data) {
     model.value = data;
-    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler,closeTabThen };
+    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler, closeTabThen };
     model.value.isIframe = props.isIframe
-    model.value.appendToBody=props.appendToBody
+    model.value.appendToBody = props.appendToBody
     model.value.isPageInSideBar = false
     model.value.columnName = null
     model.value.columnGroupId = null
@@ -973,6 +973,7 @@ function thMouseDownHandle(ev, colIndex) {
 }
 //查询对应页的数据
 function getPage(index, flagRefreshRowHandle) {
+    getRetain();
     if (refTableParent.value) {
         refTableParent.value.scrollTop = 0;
         refTableParent.value.scrollLeft = 0;
@@ -997,8 +998,12 @@ function getPage(index, flagRefreshRowHandle) {
                     getScrollAttr();
                 }
                 setfixedSize();
+                model.value.selectIndex = 0;
+                model.value._lastRowspan = null;
                 if (index === 1) {
                     SearchTable.setButtonsDisabledByRowClick(model.value);
+                    SearchTable.setButtonsDisabled(model.value);
+                    model.value.selectAll = false;
                 }
             });
         }
@@ -1303,7 +1308,7 @@ function refreshTableColumns(data) {
         searchStats = refTableStats.value.getsearchStats();
     }
     if (data) {
-        load(SearchTable.loadSearchTableModel(data, model.value.searchModel, false, props.api,null,props.appRootUrl));
+        load(SearchTable.loadSearchTableModel(data, model.value.searchModel, false, props.api, null, props.appRootUrl));
     }
     else {
         if (refTableStats.value) {
@@ -1311,7 +1316,7 @@ function refreshTableColumns(data) {
             getPage(1, true);
         }
         else {
-            SearchTable.loadSearchTableApi(props.api, load, searchModel, true,null,null,null,props.appRootUrl);
+            SearchTable.loadSearchTableApi(props.api, load, searchModel, true, null, null, null, props.appRootUrl);
         }
     }
     model.value.searchStats = searchStats;
@@ -1657,6 +1662,17 @@ function closeTabThen(ev) {
     }
 }
 
+function getRetain() {
+    model.value.isRetain = false
+    let field = model.value.buttons.find((b) => {
+        return b.key.toLowerCase() === 'Retain'.toLowerCase();
+    });
+    if (field) {
+        if (field.code1) {
+            model.value.isRetain = true;
+        }
+    }
+}
 
 defineExpose({
     model,

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

@@ -3,16 +3,18 @@
         <div v-if="buttonsLeft && buttonsLeft.length > 0" class="bool_btn_l">
             <ul>
                 <li v-for="btn in buttonsLeft" class="ToolbarButton" :class="{ btn_r: btn.isRight }">
-                    <component :is="btn.is" :vmodel="btn" @fieldClick="clickHandler(btn)" @importComplete="importComplete"
-                        v-if="btn.show" :parameterAction="parameterAction" :fileData="getFileData(btn)"></component>
+                    <component :is="btn.is" :vmodel="btn" @fieldClick="clickHandler(btn)"
+                        @importComplete="importComplete" v-if="btn.show" :parameterAction="parameterAction"
+                        :fileData="getFileData(btn)"></component>
                 </li>
             </ul>
         </div>
         <div v-if="buttonsright && buttonsright.length > 0" class="bool_btn_r">
             <ul>
                 <li v-for="btn in buttonsright" class="ToolbarButton" :class="{ btn_r: btn.isRight }">
-                    <component :is="btn.is" :vmodel="btn" @fieldClick="clickHandler(btn,)" @importComplete="importComplete"
-                        v-if="btn.show" :parameterAction="parameterAction" :fileData="getFileData(btn)"></component>
+                    <component :is="btn.is" :vmodel="btn" @fieldClick="clickHandler(btn,)"
+                        @importComplete="importComplete" v-if="btn.show" :parameterAction="parameterAction"
+                        :fileData="getFileData(btn)"></component>
                 </li>
             </ul>
         </div>
@@ -37,7 +39,9 @@ props.buttons.forEach(v => {
     }
 });
 function clickHandler(btn) {
-    emit("click", btn);
+    if (btn.key.toLowerCase() != 'Retain'.toLocaleLowerCase()) {
+        emit("click", btn);
+    }
 }
 function importComplete(res, field) {
     emit("importComplete", res, field);

package/src/components/web/SearchList.vue

@@ -161,6 +161,7 @@ function init() {
     if (props.apiParam && props.apiParam.isIframe && props.apiParam.isIframe == 'true') {
         isIframe.value = true;
     }
+    window.addEventListener("resize", resizeSearchList);
 }
 
 function screenLoaded(defaultSearch) {
@@ -282,7 +283,6 @@ function tableLoaded() {
                 sideMenuClickHandler(status);
             }
         }
-        window.addEventListener("resize", resizeSearchList);
     }
     else {
         flagSideBarOfData.value = false;

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="Imagebox"  @mousewheel="bagimg($event)"  v-loading="loading">
+    <div class="Imagebox"  @mousewheel.stop.prevent="bagimg($event)"  v-loading="loading">
         <img id="ViewerImage" class="scaleimg" border="0" @load="complete()" v-bind:style="{
              top: params.top + 'px', left: params.left + 'px',
             transform:

package/src/components/web/ViewerFile.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="height: 100%" id="viewer-file" ref="refviewerfile" @contextmenu="handleMouse" class="viewer-file ccai">
         <el-container style="height: 100%; border: 1px solid #eee">
-            <el-aside style="background-color: rgb(238, 241, 246)" class="ccai-aside">
+            <el-aside style="background-color: rgb(238, 241, 246)" class="ccai-aside" v-if="flagLeft">
                 <div style="height: 100%" class="viewerMenu">
                     <el-menu :default-openeds="openeds" :default-active="activeitem" style="height: 100%">
                         <el-sub-menu :key="groupIndex" :index="groupIndex.toString()"
@@ -28,32 +28,44 @@
                 </div>
             </el-aside>
             <el-main ref="refdisplayArea" v-loading="downloadLoading" element-loading-spinner="el-icon-loading"
-                :element-loading-custom-class="'cloading'">
+                :element-loading-custom-class="'cloading'" style="background-color: white;overflow: hidden;position: relative;">
+                <div v-if="!flagLeft" style="position: absolute; top: 10px; left: 10px;cursor: pointer;color:red"
+                    @click="closeViewerFile">
+                    <el-icon size="20">
+                        <CircleClose />
+                    </el-icon>
+
+                </div>
                 <div class="cont" v-if="resultObject">
                     <div style="padding-right:10px;" v-if="mediaLabelShow">
                         <div class="enlarge-picture " v-if="itemFile.mediaLabelName">
-                            <span class="" style="width:80px;">{{common.LocalizedString('附件类型','附件類型')}} : </span>
+                            <span class="" style="width:80px;">{{ common.LocalizedString('附件类型', '附件類型') }} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaLabelName }}</lable>
                         </div>
                         <div class="enlarge-picture" v-if="itemFile.mediaDescCN">
-                            <span style="width:80px;">{{common.LocalizedString('中文描述','中文描述')}} : </span>
+                            <span style="width:80px;">{{ common.LocalizedString('中文描述', '中文描述') }} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaDescCN }}</lable>
                         </div>
                         <div class="enlarge-picture" v-if="itemFile.mediaDescEN">
-                            <span style="width:80px;">{{common.LocalizedString('英文描述','英文描述')}} : </span>
+                            <span style="width:80px;">{{ common.LocalizedString('英文描述', '英文描述') }} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaDescEN }}</lable>
                         </div>
                         <div class="enlarge-picture" v-if="itemFile.mediaUploadEmployeeDesc">
-                            <span style="width:80px;">{{common.LocalizedString('来源描述','來源描述')}} : </span>
+                            <span style="width:80px;">{{ common.LocalizedString('来源描述', '來源描述') }} : </span>
                             <lable style="font-weight: bold;">{{ itemFile.mediaUploadEmployeeDesc }}</lable>
                         </div>
                     </div>
-                    <div class="toggler" @click="mediaLabelShow=!mediaLabelShow" v-if="itemFile.mediaLabelName||itemFile.mediaDescCN||itemFile.mediaDescEN||itemFile.mediaUploadEmployeeDesc">
+                    <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 color="#000000"><ArrowRightBold /></el-icon>
+                            <el-icon color="#000000">
+                                <ArrowRightBold />
+                            </el-icon>
                         </span>
                         <span class="glyphicon glyphicon-chevron-left" v-if="!mediaLabelShow">
-                            <el-icon color="#000000"><ArrowLeftBold /></el-icon>
+                            <el-icon color="#000000">
+                                <ArrowLeftBold />
+                            </el-icon>
                         </span>
                     </div>
                 </div>
@@ -118,7 +130,7 @@
                         <template v-else>
                             <div class="viewerContent" style="max-height: 200px; text-align: center">
                                 <a :href="resultObject" target="_blank">
-                                    <img :src="(itemFile.thumbnailUrl||itemFile.url)" /><br />{{
+                                    <img :src="(itemFile.thumbnailUrl || itemFile.url)" /><br />{{
                                         itemFile.mediaLabelName || itemFile.fileName
                                     }}
                                 </a>
@@ -126,7 +138,8 @@
                         </template>
                     </template>
                     <!--p360-->
-                    <template v-else-if="itemFile.mediaTypeID == '7' || (itemFile.mediaTypeID + '').toLowerCase() == 'p360'">
+                    <template
+                        v-else-if="itemFile.mediaTypeID == '7' || (itemFile.mediaTypeID + '').toLowerCase() == 'p360'">
                         <viewerP360 ref="refviewerP360" :height="displayAreaHeight" :width="displayAreaWidth"
                             :imgUrl="resultObject" />
                     </template>
@@ -144,6 +157,8 @@
                         <div class="magnify-footer" :style="{
                             width: displayAreaWidth + 'px',
                             bottom: displayAreabtm + 10 + 'px',
+                            position: !flagLeft ? 'absolute' : 'fixed',
+
                         }">
                             <div class="magnify-toolbar" :style="{ 'margin-left': displayArealeft + 'px' }">
 
@@ -201,14 +216,18 @@ import common from '../../utils/common';
 import viewerImage from './ViewerFile/ViewerImage.vue';
 import viewerPDF from './ViewerFile/ViewerPDFjs.vue';
 import viewerP360 from './ViewerFile/viewerP360.vue';
+const emit = defineEmits(['closeViewerFile', 'ViewerFilechangeIndex'])
 
 const props = defineProps({
     MediaAlbum: Array,
     groupIndex: Number,
     index: Number,
+    flagLeft: {
+        type: Boolean,
+        default: true
+    }
 })
 
-
 const refviewerfile = ref()
 const refdisplayArea = ref()
 const refviewerImage = ref()
@@ -227,8 +246,8 @@ const displayArealeft = ref(0)
 const displayAreaHeight = ref(0)
 const downloadUrl = ref("")
 const downloadLoading = ref(false)
-const mediaLabelShow=ref(false)
-const qrtimer=ref(null)
+const mediaLabelShow = ref(false)
+const qrtimer = ref(null)
 
 groupCountLen.value = 0;
 props.MediaAlbum.forEach((item, n) => {
@@ -245,11 +264,18 @@ onMounted(() => {
     displayArealeft.value = DomLeft();
     displayAreabtm.value = DomTop(refdisplayArea.value.$el);
     displayAreaHeight.value = refdisplayArea.value.$el.offsetHeight;
+    if (!props.flagLeft) {
+        displayAreaHeight.value = displayAreaHeight.value - 5;
+    }
     window.onresize = () => {
         displayAreaWidth.value = DomWidth();
         displayArealeft.value = DomLeft();
         displayAreabtm.value = DomTop(refdisplayArea.value.$el);
+
         displayAreaHeight.value = refdisplayArea.value.$el.offsetHeight;
+        if (!props.flagLeft) {
+            displayAreaHeight.value = displayAreaHeight.value - 5;
+        }
     };
 
     if (
@@ -258,7 +284,7 @@ onMounted(() => {
         props.groupIndex > -1 &&
         props.index > -1
     ) {
-        var item = props.MediaAlbum[props.groupIndex].medias[props.index];
+        var item = props.MediaAlbum[props.groupIndex]?.medias[props.index];
         handleClick(item, props.groupIndex, props.index);
     }
 })
@@ -304,6 +330,9 @@ function handleMouse(e) {
     e.preventDefault();
 }
 function DomWidth() {
+    if (!props.flagLeft) {
+        return refdisplayArea.value.$el.offsetWidth - 40;
+    }
     let arrLength = window.innerWidth - refviewerfile.value.offsetWidth;
     arrLength = arrLength > 0 ? arrLength : 0;
     var Width =
@@ -315,6 +344,9 @@ function DomWidth() {
     return Width;
 }
 function DomTop() {
+    if (!props.flagLeft) {
+        return -65;
+    }
     const height = window.innerHeight; //可视区窗口高度
     const curDomHeight = refviewerfile.value.offsetHeight;
     // const curDomHeight = dom.getBoundingClientRect().height
@@ -324,6 +356,9 @@ function DomTop() {
     return curDomBottom;
 }
 function DomLeft() {
+    if (!props.flagLeft) {
+        return 65;
+    }
     let arrLength = window.innerWidth - refviewerfile.value.offsetWidth;
     arrLength = arrLength > 0 ? arrLength : 0;
     var Width =
@@ -341,7 +376,8 @@ function handleClick(item, groupIndex, index) {
     activeGroup.value = groupIndex;
     itemFile.value = item;
     activeitem.value = groupIndex + "-" + index;
-    resultObject.value = itemFile.value.mediaUrl;
+    resultObject.value = itemFile.value?.mediaUrl;
+    emit('ViewerFilechangeIndex', { groupIndex: groupIndex, index: index })
 }
 function jump(n) {
     var item = {};
@@ -421,12 +457,16 @@ function zoom(n) {
 function enterFullscreen(n) {
     refviewerP360.value.enterFullscreen(n);
 }
+
+function closeViewerFile() {
+    emit('closeViewerFile')
+}
 onUnmounted(() => {
-  window.onresize = null;
-  if (qrtimer.value) {
-    clearTimeout(qrtimer.value);
-    qrtimer.value = null;
-  }
+    window.onresize = null;
+    if (qrtimer.value) {
+        clearTimeout(qrtimer.value);
+        qrtimer.value = null;
+    }
 })
 </script>
 <style scoped>
@@ -503,6 +543,7 @@ html {
 .enlarge-picture {
     padding: 5px 10px;
 }
+
 .toggler {
     -webkit-border-top-right-radius: 4px;
     -webkit-border-bottom-right-radius: 4px;
@@ -522,6 +563,7 @@ html {
     cursor: pointer;
     position: absolute;
 }
+
 .glyphicon {
     margin: 15px 0px;
     position: relative;

package/src/components/web/dialog.vue

@@ -6,11 +6,15 @@
 </template>
 <script setup>
 import { h, ref, onActivated, resolveComponent, onBeforeUnmount } from 'vue'
+import { useDraggable } from '../../utils/useDraggable'
+
 const emit = defineEmits(['close'])
 const props = defineProps({
     vmodel: Object,
     zindex: Number
 })
+const { containerStyle, startDrag, hasDragged } = useDraggable('.ct-dialog_draggable')
+
 const contentTop = ref(0)
 const content = ref()
 const captionBarButtons = ref([])
@@ -63,10 +67,12 @@ const render = () => {
             }, [
 
                 h('div', {
+                    class: 'ct-dialog_draggable',   // 增加 class
                     style: {
-                        'margin': 'auto',
-                        'position': 'relative'
-                    },
+                        'cursor': 'move',
+
+                        ...containerStyle.value
+                    }   // 使用响应式样式
                 },
                     [
                         h('table',
@@ -87,8 +93,10 @@ const render = () => {
                                             class: ['ct-dialog_header'],
                                             style: {
                                                 'position': 'relative',
-                                                'padding': '10px 20px 10px 20px'
+                                                'padding': '10px 20px 10px 20px',
+                                                'cursor': hasDragged.value ? 'move' : 'default'
                                             },
+                                            onMousedown: startDrag,
                                         }, [
                                             h('span',
                                                 {
@@ -153,9 +161,8 @@ const render = () => {
                                                         }
                                                     }
                                                     //AI弹框宽度自适应
-                                                    if (!item.attrs.onAIToggle) {
-                                                        item.attrs.onAIToggle = (newWidth) => {
-
+                                                    if (!item.attrs.onToggleWdth) {
+                                                        item.attrs.onToggleWdth = (newWidth) => {
                                                             item.width = parseFloat(item.width) + newWidth + 'px';
                                                         }
                                                     }
@@ -281,4 +288,8 @@ const render = () => {
     border-top: initial;
     border-bottom: initial;
 }
+
+.ct-dialog_draggable{
+    cursor: move;
+}
 </style>

package/src/loader/src/File.js

@@ -502,7 +502,7 @@ function deleteFile(file, forceDelete, model) {
                 }
 
             }
-        break;
+            break;
         }
     }
 }
@@ -565,29 +565,44 @@ function S4() {
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
 }
 
-function viewerfile(file, model) {
+function buildMediaAlbum(model, targetFile) {
+  // 1. 生成专辑名称
+  const albumName = model.controlLabel || '媒体'
 
-    let MediaAlbum = [{ albumName: model.controlLabel || "媒体", medias: [] }];
+  // 2. 过滤出未被删除的文件
+  const medias = model.fileList.filter(item => item.flagDeleted !== true)
 
-    let fileList = model.fileList.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    var index = MediaAlbum[0].medias.findIndex(
-        (v) => (v === file)
-    );
+    
+  // 3. 构建专辑对象
+  const album = { albumName, medias }
+
+  // 4. 查找目标文件的索引（如果没有传入则返回 -1）
+  const index = targetFile
+    ? medias.findIndex(v => v === targetFile)
+    : -1
 
-    if(model.moreActionRouter){
-      let submitData = {};
-      submitData = model.form.$vue.getFileData(model.moreActionRouter);
-      submitData.index=index;
-      submitData = model.moreActionRouter.getActionPara(submitData).para;
-      model.$vue.emit('tableButtonClick',model.moreActionRouter,submitData);
+  return { album, index }
+}
+
+function viewerfile(file, model, callback) {
+
+    const { album, index } = buildMediaAlbum(model, file)
+// 如果之前其他地方需要 MediaAlbum 数组，只需 [album] 即可
+    const MediaAlbum = [album];
+    if (model.mediaViewPageType == 3) {
+        callback(MediaAlbum, 0, index);
+        return;
     }
-    else{
-      common.viewerfile((model.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.mediaViewPageType);
+
+    if (model.moreActionRouter) {
+        let submitData = {};
+        submitData = model.form.$vue.getFileData(model.moreActionRouter);
+        submitData.index = index;
+        submitData = model.moreActionRouter.getActionPara(submitData).para;
+        model.$vue.emit('tableButtonClick', model.moreActionRouter, submitData);
+    }
+    else {
+        common.viewerfile((model.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.mediaViewPageType);
     }
 }
 function selfValidExcute(eventName, model) {
@@ -601,7 +616,7 @@ function selfValidExcute(eventName, model) {
     }
     if (model.required) {
         if (File.getfileListLength(model) === 0) {
-            model.validMessage = common.LocalizedString("必须上传附件","必須上傳附件");
+            model.validMessage = common.LocalizedString("必须上传附件", "必須上傳附件");
             model.valid = false;
             model.displayValidMessage = model.validMessage;
             return false;
@@ -733,6 +748,7 @@ const File = {
     viewerfile,
     selfValidExcute,
     validFileClass,
-    setPublicClassify
+    setPublicClassify,
+    buildMediaAlbum
 };
 export default File;

package/src/loader/src/Form.js

@@ -675,7 +675,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.buttons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._buttons.push(button);
@@ -696,7 +698,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.captionBarButtons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._captionBarButtons.push(button);
@@ -717,7 +721,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.links.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._links.push(button);
@@ -738,7 +744,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.actionRouters.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._actionRouters.push(button);
@@ -935,7 +943,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
       }
     },
     getRtnRouter(v) {
-      v.action = (appRootUrl || '') + v.action;
+      if (v.action) {
+        v.action = (appRootUrl || '') + v.action;
+      }
       var button = Router(v);
       button.is = "ct-button";
       return button;