centaline-data-driven-v3 0.1.59 → 0.1.60

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/SearchTable.js

@@ -7,7 +7,7 @@ function loadSearchTableApi(action, callBack, searchModel, flagSearch, defaultSe
     var apiData = searchModel?.searchData ? searchModel.searchData : {};
 
     request.postHandler(common.globalUri(), {
-        action: (appRootUrl||'') + action,
+        action: (appRootUrl || '') + action,
         para: {
             searchFields: apiData,
             pageAttribute: {
@@ -49,7 +49,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
             },
 
         },
-        appRootUrl: appRootUrl||'',
+        appRootUrl: appRootUrl || '',
         selectAll: false,//全选是否选中
         selectIndex: 0,//选中行的索引
         pageIndex: 1,//当前显示页数
@@ -280,7 +280,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         },
         //取参数值的 Action名称
         get parameterAction() {
-            return (appRootUrl||'') + source.content.parameterAction;
+            return (appRootUrl || '') + source.content.parameterAction;
         },
         get multiRowSpan() {
             if (this.isMergeTitle) {
@@ -316,7 +316,10 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 if (source.content.toolButtons) {
 
                     source.content.toolButtons.forEach((v) => {
-                       v.action = (appRootUrl||'') + v.action;
+                        if (v.action) {
+                            v.action = (appRootUrl || '') + v.action;
+                        }
+
                         var button = Router(v);
                         button.is = "ct-button";
                         button.attrs = {
@@ -339,7 +342,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 rtn._actionRouter = [];
                 if (source.content.actionRouters) {
                     source.content.actionRouters.forEach((v) => {
-                        v.action = (appRootUrl||'') + v.action;
+                        if (v.action) {
+                            v.action = (appRootUrl || '') + v.action;
+                        }
                         var router = Router(v);
                         router.is = "ct-button";
                         rtn._actionRouter.push(router);
@@ -743,7 +748,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         },
         //初始化button路由
         getRtnRouter(v) {
-            v.action = (appRootUrl||'') + v.action;
+            if (v.action) {
+                v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-btn";
             return button;
@@ -755,15 +762,15 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
 }
 //加载指定页数数据
 function getPage(index, model, callback) {
-    model.listData.splice(0, model.listData.length);
+    var selectListData = []
+    if (model.isRetain) {
+        model.listData = model.getSelectRowData({ isMulti: model.isMulti })
+    }
+    else {
+        model.listData.splice(0, model.listData.length);
+    }
     model.pageIndex = index;
     apiData(model, callback);
-    model.selectIndex = 0;
-    model._lastRowspan = null;
-    if (index === 1) {
-        setButtonsDisabled(model);
-        model.selectAll = false;
-    }
 }
 //加载下一页数据
 function nextPage(model, callback) {
@@ -784,8 +791,17 @@ function apiData(model, callback) {
     }
     model.isLoading = true;
     var newSearchModel = model.getSearchData();
+    if (model.isRetain && model.listData && model.listData.length > 0) {
+        newSearchModel.fields.push({
+            fieldName1: model.primaryFieldMappingDBName ? model.primaryFieldMappingDBName : model.primaryFieldName,
+            groupName: model.primaryFieldName,
+            operation: Enum.SearchOperation.None,
+            searchDataType: Enum.SearchDataType.None,
+            searchValue1: JSON.stringify(getSelectValue(model.listData)),
+        });
+    }
     request.postHandler(common.globalUri(), {
-        action: model.appRootUrl + model.searchAction,
+        action: model.searchAction ? model.appRootUrl + model.searchAction : model.searchAction,
         para: {
             searchFields: newSearchModel ? newSearchModel : {},
             pageAttribute: model.pageData,
@@ -845,13 +861,18 @@ function apiData(model, callback) {
                         model._buttons = [];
                         model._actions = [];
                         response.content.toolButtons.forEach((v) => {
-                            v.action = model.appRootUrl + v.action;
+                            if (v.action) {
+                                v.action = model.appRootUrl + v.action;
+                            }
                             var button = Router(v);
                             button.is = "ct-button";
                             button.attrs = {
                                 size: "small",
                                 class: 'btn-gray'
                             }
+                            if (model.isRetain && button.key.toLowerCase() == 'Retain'.toLowerCase()) {
+                                button.code1 = true
+                            }
                             model._buttons.push(button);
                         });
                         model._buttons.forEach((v) => {
@@ -1013,7 +1034,7 @@ function getCurrentRowApiData(model, callback, rtnData, router) {
         });
     }
     request.postHandler(common.globalUri(), {
-        action: model.appRootUrl+model.searchAction,
+        action: model.searchAction ? model.appRootUrl + model.searchAction : model.searchAction,
         para: {
             searchFields: searchFields,
             pageAttribute: {
@@ -1075,7 +1096,9 @@ function getCurrentRowApiData(model, callback, rtnData, router) {
                     if (response.content.toolButtons) {
                         model._buttons = [];
                         response.content.toolButtons.forEach((v) => {
-                            v.action = model.appRootUrl + v.action;
+                            if (v.action) {
+                                v.action = model.appRootUrl + v.action;
+                            }
                             var button = Router(v);
                             button.is = "ct-button";
                             button.attrs = {
@@ -1246,6 +1269,24 @@ function checkCloseTabThen(notification) {
     }
     return rtn;
 }
+function getSelectValue(model) {
+    let submitData = {};
+    let jsonData = [];
+    if (model.listData != null) {
+        var submitArr = [];
+        model.primaryFieldName.split(',').forEach(v => {
+            submitArr.push(common.initialsToLowerCase(v));
+        })
+        model.listData.forEach((row) => {
+            let jsonModel = {};
+            submitArr.forEach((k) => {
+                jsonModel[common.initialsToLowerCase(k)] = common.getDataOfUpperLower(row, k);
+            });
+            jsonData.push(jsonModel);
+        });
+    }
+    return jsonData
+}
 const SearchTable = {
     loadSearchTableApi,
     loadSearchTableModel,

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
+    baseUrl: "http://10.88.22.66:7080/ibs-api/",
     //baseUrl:"http://10.88.22.66:7080/ibs-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
@@ -29,7 +29,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -66,7 +66,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{EmpID:"Token_eb197a2a-06d4-4258-af95-90a6d3541b12",MachineCode:"1d6b7fc9-90ff-4a68-9504-1174fa72db7b",SSO_Token:"SSOToken_eb197a2a-06d4-4258-af95-90a6d3541b12",Platform:"WEB"}',
+              authobject: '{token:"T5067-2066339039585452032",platform:"WEB"}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/utils/useDraggable.js

@@ -0,0 +1,100 @@
+// utils/useDraggable.js
+import { ref, reactive, computed, onBeforeUnmount } from 'vue'
+
+/**
+ * 对话框拖动组合式函数
+ * @param {string} selector - 要拖动的容器选择器（默认 '.ct-dialog_draggable'）
+ * @param {Object} initialPosition - 初始位置 { left, top }
+ * @returns {Object} { containerStyle, startDrag, hasDragged }
+ */
+export function useDraggable(selector = '.ct-dialog_draggable', initialPosition = { left: 0, top: 0 }) {
+  const isDragging = ref(false)
+  const position = reactive({ ...initialPosition })
+  const hasDragged = ref(false)
+  const offset = reactive({ x: 0, y: 0 })
+
+  /**
+   * 鼠标按下开始拖动
+   * @param {MouseEvent} e
+   */
+  function startDrag(e) {
+    // 过滤按钮、关闭图标等元素，避免误触发
+    if (e.target.closest('button, .el-icon-close, [role="button"]')) return
+
+    // 查找真正要移动的对话框容器
+    const targetEl = e.currentTarget.closest(selector)
+    if (!targetEl) return
+
+    // 记录鼠标与容器左上角的偏移
+    const rect = targetEl.getBoundingClientRect()
+    offset.x = e.clientX - rect.left
+    offset.y = e.clientY - rect.top
+
+    // 首次拖动时记录当前位置，并切换为固定定位模式
+    if (!hasDragged.value) {
+      position.left = rect.left
+      position.top = rect.top
+      hasDragged.value = true
+    }
+
+    isDragging.value = true
+
+    // 绑定全局移动和释放事件
+    document.addEventListener('mousemove', onDrag)
+    document.addEventListener('mouseup', stopDrag)
+
+    // 阻止默认行为和文本选择
+    e.preventDefault()
+  }
+
+  /**
+   * 拖动过程中更新位置
+   * @param {MouseEvent} e
+   */
+  function onDrag(e) {
+    if (!isDragging.value) return
+    position.left = e.clientX - offset.x
+    position.top = e.clientY - offset.y
+  }
+
+  /**
+   * 停止拖动
+   */
+  function stopDrag() {
+    isDragging.value = false
+    document.removeEventListener('mousemove', onDrag)
+    document.removeEventListener('mouseup', stopDrag)
+  }
+
+  // 组件卸载时清理事件
+  onBeforeUnmount(() => {
+    document.removeEventListener('mousemove', onDrag)
+    document.removeEventListener('mouseup', stopDrag)
+  })
+
+  /**
+   * 对话框容器动态样式
+   * - 未拖动前：margin: auto; position: relative; （保持居中）
+   * - 拖动后：position: fixed; left/top 由拖动位置控制
+   */
+  const containerStyle = computed(() => {
+    if (hasDragged.value) {
+      return {
+        position: 'fixed',
+        left: position.left + 'px',
+        top: position.top + 'px',
+        margin: '0'
+      }
+    }
+    return {
+      margin: 'auto',
+      position: 'relative'
+    }
+  })
+
+  return {
+    containerStyle,
+    startDrag,
+    hasDragged
+  }
+}

package/src/views/SearchList.vue

@@ -7,8 +7,8 @@
       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       
     :searchDataApi="'/propertyPublishList/getListOfSearchModel'" :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
-       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
-      :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist>
+       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/PropertyComprehensiveQueryList/getLayoutOfSearch'"
+      :searchDataApi="'/PropertyComprehensiveQueryList/getListOfSearchModel'"></ct-searchlist>
 
  
     <ct-dialoglist ref="dialogList"></ct-dialoglist>