centaline-data-driven-v3 0.1.5 → 0.1.7

package/package.json

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

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

@@ -87,6 +87,7 @@
                                             column.width === undefined ? 'ct-table-auto' : null,
                                             column.fixed === 'right' ? 'right-fixation' : null,
                                         ]" v-bind="column.attrs" :draggable="column.paramName == 'drop' ? true : false"
+                                        @dragstart="onDragStartColumn($event, row, column, 'table')"
                                         @drop="drop($event, row, column, 'table')" @dragover.prevent
                                         @dragenter="dragenter($event, column, 'table')"
                                         @dragleave="dragleave($event, column, 'table')">
@@ -148,6 +149,9 @@
                                                 </template>
 
                                             </el-popover>
+
+
+
                                         </div>
 
                                         <template v-else-if="column.id === 'linksCol'">
@@ -193,6 +197,10 @@
                                             :style="column.style ? column.style : ''">
                                             {{ common.getDataOfUpperLower(row, column.id) }}
                                         </div>
+                                        <el-icon v-if="showDelete(row, column)" class="el-icon-close card__delete"
+                                            @click="deleteColumn(row, column)">
+                                            <CircleClose />
+                                        </el-icon>
 
                                     </td>
                                 </template>
@@ -207,7 +215,8 @@
                 <div v-for="(row, rowindex) in model.listData" :key="rowindex">
                     <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex" :key="itemKey"
                         @rolRouterclick="rolRouterCellClickHandler" :actionRouter="model.actionRouter"
-                        :selectIndex="model.selectIndex" :selectedRowBackColor="model.selectedRowBackColor" @rowclick="rowLayoutClickHandle">
+                        :selectIndex="model.selectIndex" :selectedRowBackColor="model.selectedRowBackColor"
+                        @rowclick="rowLayoutClickHandle">
                     </ct-layout>
                 </div>
             </div>
@@ -230,7 +239,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick, onActivated, onDeactivated, onBeforeUnmount } from 'vue'
+import { ref, nextTick, onActivated, onDeactivated, onBeforeUnmount, computed } from 'vue'
 import common from '../../../utils/common'
 import request from '../../../utils/request'
 import SearchStats from './SearchStats.vue';
@@ -345,18 +354,18 @@ const getRowsRouterRef = (el, index) => {
 }
 const refHeadTr = ref()
 const refTableHead = ref()
-onBeforeUnmount(()=>{
-  if (model.value && typeof model.value.scripts !== 'undefined') {
-    model.value.scripts.formData.formTable = null;
-    model.value.scripts.formData = null;
-  }
-  window.removeEventListener("resize",  setTableHeight)
-  if(refTableParent.value){
-    refTableParent.value.removeEventListener("scroll", getScrollAttr);
-    refTableParent.value=null
-  }
-  refSearchTable.value = null;
-  model.value = null;
+onBeforeUnmount(() => {
+    if (model.value && typeof model.value.scripts !== 'undefined') {
+        model.value.scripts.formData.formTable = null;
+        model.value.scripts.formData = null;
+    }
+    window.removeEventListener("resize", setTableHeight)
+    if (refTableParent.value) {
+        refTableParent.value.removeEventListener("scroll", getScrollAttr);
+        refTableParent.value = null
+    }
+    refSearchTable.value = null;
+    model.value = null;
 })
 onActivated(() => {
     nextTick(() => {
@@ -413,30 +422,30 @@ function load(data) {
         fiexdHead()
         //当表格没有占满表格框时，主动请求下一页
         var next = function (rtn) {
-          if (rtn) {
-            nextTick(() => {
-              if(!model.value.isLayout){
-                if(refTableParent.value  && refTableParent.value.scrollHeight != 0  && refTableParent.value.offsetHeight != 0 
-                && refTableParent.value.scrollHeight <= refTableParent.value.offsetHeight){
-                  tableLoading.value = true;
-                  SearchTable.nextPage(model.value,next);
-                }
-                else {
-                  tableLoading.value = false;
-                  rowColorChange(model.value.selectIndex, true);
-                  resetScroll();
-                  calculatingRowHeight();
-                  getScrollAttr();
-                }
-              }
-              searchEnd.value = Date.now();
-            });
-          }
-          else {
-            searchEnd.value = Date.now();
-            tableLoading.value = false;
-          }
-        };     
+            if (rtn) {
+                nextTick(() => {
+                    if (!model.value.isLayout) {
+                        if (refTableParent.value && refTableParent.value.scrollHeight != 0 && refTableParent.value.offsetHeight != 0
+                            && refTableParent.value.scrollHeight <= refTableParent.value.offsetHeight) {
+                            tableLoading.value = true;
+                            SearchTable.nextPage(model.value, next);
+                        }
+                        else {
+                            tableLoading.value = false;
+                            rowColorChange(model.value.selectIndex, true);
+                            resetScroll();
+                            calculatingRowHeight();
+                            getScrollAttr();
+                        }
+                    }
+                    searchEnd.value = Date.now();
+                });
+            }
+            else {
+                searchEnd.value = Date.now();
+                tableLoading.value = false;
+            }
+        };
         next(true);
         nextTick(() => {
             loadStats()
@@ -491,6 +500,7 @@ function toolbarClickHandler(field) {
 }
 //导入
 function importComplete(res, field) {
+    debugger
     if (res && res.rtnCode && res.rtnCode === 201) {
         if (res.rtnMsg) {
             ElMessage({
@@ -509,6 +519,7 @@ function importComplete(res, field) {
             });
     }
     if (field.flagAsync) {
+        debugger
         if (res.rtnCode && res.rtnCode === 202 && res.rtnMsg) {
             common.confirm(res.rtnMsg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
                 if (res.content && res.content.action) {
@@ -710,7 +721,7 @@ function rowLayoutClickHandle(index) {
 }
 
 //表单列表操作
-function rolRouterClickHandler(field, rowData, rowindex, visible, columnName,callBack,flagMouseenter) {
+function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, callBack, flagMouseenter) {
     field.rowindex = rowindex;
     if (refRowsPopover.value[rowindex]) {
         refRowsPopover.value[rowindex].hide();
@@ -742,11 +753,11 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName,cal
         action = rowData[field.actionField];
     }
 
-    RouterClickHandler(field, submitData, action, model.value, 'table',callBack,flagMouseenter)
+    RouterClickHandler(field, submitData, action, model.value, 'table', callBack, flagMouseenter)
 }
 //表单列表操作
-function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack,flagMouseenter) {
-    rolRouterClickHandler(field,rowData,rowindex,visible,columnName,callBack,true)
+function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack, flagMouseenter) {
+    rolRouterClickHandler(field, rowData, rowindex, visible, columnName, callBack, true)
 }
 function popupClickHandler() {
     var tempListData = model.value.getSelectRowData({ isMulti: model.value.isMulti });
@@ -806,7 +817,7 @@ function setTableHeight() {
             }
             var h8 = 0;
             if (refPopupButton.value) {
-              h8 = refPopupButton.value.offsetHeight + 21 | 0;
+                h8 = refPopupButton.value.offsetHeight + 21 | 0;
             }
 
             let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 16;
@@ -1341,59 +1352,206 @@ function fiexdHead() {
         }
     });
 }
+
+// 3. 函数式 computed：调用时传 id，返回布尔
+const showDelete = computed(() => (row, column) => {
+    let flagDelete = false;
+    if (column.paramName == "drop") {
+
+        let val = null;
+        if (row[column.id] != undefined) {
+            val = row[column.id];
+        } else if (row[common.initialsToUpperCase(column.id)] != undefined) {
+            val = row[common.initialsToUpperCase(column.id)];
+        } else if (row[common.initialsToLowerCase(column.id)] != undefined) {
+            val = row[common.initialsToLowerCase(column.id)];
+        }
+        const routerKey = 'delete';
+        const field = model.value.actionRouter?.find(b => b.key === routerKey);
+        // 只根据 field 是否存在来决定显不显示
+        flagDelete = !!(field && val);
+    }
+
+    return flagDelete;
+});
+
 // 拖拽开始事件
+const dragStartColumn = ref(null);
+const dragStartItem = ref(null);
+const dragStartName = ref(null);
+
 function onDragStart(event, row, column, name) {
     if (name == "table" && row.flagDrag == "1") {
         emit("drag", row, column, 'drag');
     }
 }
+function onDragStartColumn(event, row, column, name) {
+    if (name == "table" && column.paramName == "drop") {
+        dragStartItem.value = row;
+        dragStartName.value = name;
+        dragStartColumn.value = column;
+        emit("drag", row, column, 'drag');
+    }
+}
+
 
 function drop(e, row, column, name) {
-    let routerKey = "edit";
-    let submitData = {};
-    if (props.dragStartName == "top" && name == "table" && column.paramName == "drop") {
-        var actionRouter = model.value.actionRouter;
-        let field = actionRouter.find((b) => {
-            return b.key === routerKey;
-        });
+    if (( props.dragStartName == "top" || dragStartName.value == "table") && name == "table" && column.paramName == "drop") {
 
-        field.submitListField.forEach((k) => {
-            let keyLower = common.initialsToLowerCase(k);
-            let keyUpper = common.initialsToUpperCase(k);
-            submitData[k] = row[keyLower] || row[keyUpper];
-        });
-        submitData["columnFieldName"] = column.id;
-        submitData["dropObject"] = props.dragStartItem;
-
-        request.postHandler(common.globalUri(), {
-            action: field.action,
-            para: submitData,
-        })
-            .then(function (response) {
-                if (response.rtnCode === 200) {
-                    nextTick(() => {
-                        let key = column.id;
-                        if (row[key] != undefined) {
-                            row[key] = props.dragStartItem.name;
-                        } else if (row[common.initialsToUpperCase(key)] != undefined) {
-                            row[common.initialsToUpperCase(key)] =
-                                props.dragStartItem.name;
-                        } else if (row[common.initialsToLowerCase(key)] != undefined) {
-                            row[common.initialsToLowerCase(key)] =
-                                props.dragStartItem.name;
-                        }
-                    });
-                }
-            });
 
+        if (dragStartName.value == "table") {
+            exchangeRequest(row, column, dragStartItem.value, dragStartColumn.value);
+        }
+        else if ( props.dragStartName == "top") {
+            dropRequest(row, column, props.dragStartItem);
+        }
         if (name === "table") {
             let el = e.target.nodeName.toLowerCase() == "td" ? e.target : getTDOfParents(e.target);
             removeClass(el, "dragEnterHover");
         }
+
+        dragStartItem.value = null;
+        dragStartName.value = null;
+        dragStartColumn.value = null;
     }
     emit("drag", row, column, 'drop');
 }
 
+function dropRequest(row, column, obj) {
+    let routerKey = "edit";
+    let submitData = {};
+    var actionRouter = model.value.actionRouter;
+    let field = actionRouter.find((b) => {
+        return b.key === routerKey;
+    });
+
+    field.submitListField.forEach((k) => {
+        let keyLower = common.initialsToLowerCase(k);
+        let keyUpper = common.initialsToUpperCase(k);
+        submitData[k] = row[keyLower] || row[keyUpper];
+    });
+    submitData["columnFieldName"] = column.id;
+    submitData["dropObject"] = obj;
+
+    request.postHandler(common.globalUri(), {
+        action: field.action,
+        para: submitData,
+    })
+        .then(function (response) {
+            if (response.rtnCode === 200) {
+                nextTick(() => {
+                    let key = column.id;
+                    if (row[key] != undefined) {
+                        row[key] = obj.name;
+                    } else if (row[common.initialsToUpperCase(key)] != undefined) {
+                        row[common.initialsToUpperCase(key)] =
+                            obj.name;
+                    } else if (row[common.initialsToLowerCase(key)] != undefined) {
+                        row[common.initialsToLowerCase(key)] =
+                            obj.name;
+                    }
+                });
+            }
+        });
+}
+
+function exchangeRequest(targetRow, targetColumn, sourceRow, sourceColumn) {
+    let routerKey = "exchange";
+    let submitData = [];
+    let obj = {};
+    let obj1 = {};
+    var actionRouter = model.value.actionRouter;
+    let field = actionRouter.find((b) => {
+        return b.key === routerKey;
+    });
+
+    field.submitListField.forEach((k) => {
+        let key = k;
+        let keyLower = common.initialsToLowerCase(k);
+        let keyUpper = common.initialsToUpperCase(k);
+        obj[k] = targetRow[keyLower] || targetRow[keyUpper];
+        obj["columnFieldName"] = targetColumn.id;
+        submitData.push(obj);
+
+        obj1[k] = sourceRow[keyLower] || sourceRow[keyUpper];
+        obj1["columnFieldName"] = sourceColumn.id;
+        submitData.push(obj1)
+    });
+
+
+    request.postHandler(common.globalUri(), {
+        action: field.action,
+        para: { jsonData: submitData },
+    })
+        .then(function (response) {
+            if (response.rtnCode === 200) {
+                nextTick(() => {
+                    exchangeColumn(targetRow, targetColumn, sourceRow, sourceColumn);
+                });
+            }
+        });
+}
+
+function exchangeColumn(targetRow, targetColumn, sourceRow, sourceColumn) {
+    // 定义查找有效属性名的函数
+    const getValidKey = (row, key) => {
+        if (row[key] !== undefined) return key;
+        const upperKey = common.initialsToUpperCase(key);
+        if (row[upperKey] !== undefined) return upperKey;
+        const lowerKey = common.initialsToLowerCase(key);
+        if (row[lowerKey] !== undefined) return lowerKey;
+        return null; // 未找到有效属性名
+    };
+    // 获取源列和目标列的实际属性名
+    const targetKey = getValidKey(targetRow, targetColumn.id);
+    const sourceKey = getValidKey(sourceRow, sourceColumn.id);
+
+    // 双属性都存在时才执行交换
+    if (targetKey !== null && sourceKey !== null) {
+        // 使用中间变量交换值
+        const temp = targetRow[targetKey];
+        targetRow[targetKey] = sourceRow[sourceKey];
+        sourceRow[sourceKey] = temp;
+    }
+}
+
+function deleteColumn(row, column) {
+    let routerKey = "delete";
+    let submitData = {};
+    var actionRouter = model.value.actionRouter;
+    let field = actionRouter.find((b) => {
+        return b.key === routerKey;
+    });
+
+    field.submitListField.forEach((k) => {
+        let keyLower = common.initialsToLowerCase(k);
+        let keyUpper = common.initialsToUpperCase(k);
+        submitData[k] = row[keyLower] || row[keyUpper];
+    });
+    submitData["columnFieldName"] = column.id;
+
+    request.postHandler(common.globalUri(), {
+        action: field.action,
+        para: submitData,
+    })
+        .then(function (response) {
+            if (response.rtnCode === 200) {
+                nextTick(() => {
+                    let key = column.id;
+                    if (row[key] != undefined) {
+                        row[key] = "";
+                    } else if (row[common.initialsToUpperCase(key)] != undefined) {
+                        row[common.initialsToUpperCase(key)] = "";
+                    } else if (row[common.initialsToLowerCase(key)] != undefined) {
+                        row[common.initialsToLowerCase(key)] = "";
+                    }
+                });
+            }
+        });
+
+
+}
+
 function dragenter(e, column, name) {
     let el = e.target.nodeName.toLowerCase() == "td" ? e.target : getTDOfParents(e.target);
     if (name === "table" && column.paramName == "drop") {
@@ -1441,6 +1599,7 @@ function addClass(el, className) {
     newClassName.push(className);
     el.className = newClassName.join(" ");
 }
+ 
 defineExpose({
     model,
     searchComplate,
@@ -1451,3 +1610,33 @@ defineExpose({
     refreshFromSimple
 })
 </script>
+<style lang="css" scoped>
+.ct-td {
+    position: relative;
+}
+
+/* 右上角删除图标，默认隐藏 */
+.card__delete {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 14px;
+    color: #909399;
+    cursor: pointer;
+    opacity: 0;
+    transition: opacity 0.2s;
+    /* 鼠标移到图标本身不会触发 mouseleave */
+    pointer-events: none;
+}
+
+/* 鼠标悬停卡片时让图标出现，并恢复点击事件 */
+.ct-td:hover .card__delete {
+    opacity: 1;
+    pointer-events: auto;
+}
+
+.card__delete:hover {
+    color: #f56c6c;
+    /* 悬停图标变红，符合 Element 交互 */
+}
+</style>

package/src/loader/src/Field.js

@@ -853,7 +853,9 @@ const Base = function (source, moreActionRouter) {
                 this.code1 = this.defaultCode1 || '';
                 this.code2 = this.defaultCode2 || '';
                 this.name1 = this.defaultName1 || '';
-
+                if(this.controlType === Enum.ControlType.SearchListBox && this.defaultCode1 && this.defaultName1){
+                  this.options=[{ value: this.code1, label: this.name1 }]
+                }
             }
             else {
                 if (this.controlType === Enum.ControlType.DateRange

package/src/main.js

@@ -22,8 +22,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 
 app.use(centaline, {
     //baseUrl:"https://uplink.centaline.com.cn/xian/",
-    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
-    baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
+    baseUrl:"http://10.88.22.13:7070/onecard-api/",
+    //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
     //baseUrl: "http://10.88.22.66:6060/xian/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
@@ -67,8 +67,8 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                authObject: '{token:"1647-1937695555379662848",platform:"WEB"}',
-                //authObject: '{EmpID:"Token_256e18aa-5aeb-4033-9d75-80bbc3dec2c3",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_256e18aa-5aeb-4033-9d75-80bbc3dec2c3",Platform:"WEB"}',
+                authObject: '{token:"wufw-1953248614457528320",platform:"WEB"}',
+                //authObject: '{token:"1-90f7df2c-fba7-4ea0-8874-aa7202034f06"}',
             };
         },
         getToken() {

package/src/utils/mixins.js

@@ -546,15 +546,22 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                 onFinished: (data) => {
                                                     common.closeDialog(dialogOption);
                                                     if (field.isExport) {
-                                                        if (data.content.indexOf(".zip") > -1) {
-                                                            window.location.href = encodeURI(data.content);
+                                                        if (data.content.toLowerCase().indexOf('downloadFileName'.toLowerCase()) > -1) {
+                                                            getBlob(data.content).then(blob => {
+                                                                downloadFile(blob, getUrlParameter(data.content, 'downloadFileName') + '.' + getExtensionFromUrl(data.content))
+                                                            })
                                                         }
                                                         else {
-                                                            if (data.content.indexOf("?") > -1) {
-                                                                model.$vue.downloadUrl = data.content + "&" + Math.random();
+                                                            if (data.content.indexOf(".zip") > -1) {
+                                                                window.location.href = encodeURI(data.content);
                                                             }
                                                             else {
-                                                                model.$vue.downloadUrl = data.content + "?" + Math.random();
+                                                                if (data.content.indexOf("?") > -1) {
+                                                                    model.$vue.downloadUrl = data.content + "&" + Math.random();
+                                                                }
+                                                                else {
+                                                                    model.$vue.downloadUrl = data.content + "?" + Math.random();
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -606,15 +613,22 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                             onFinished: (data) => {
                                                                 common.closeDialog(dialogOption);
                                                                 if (field.isExport) {
-                                                                    if (data.content.indexOf(".zip") > -1) {
-                                                                        window.location.href = encodeURI(data.content);
+                                                                    if (data.content.toLowerCase().indexOf('downloadFileName'.toLowerCase()) > -1) {
+                                                                        getBlob(data.content).then(blob => {
+                                                                            downloadFile(blob, getUrlParameter(data.content, 'downloadFileName') + '.' + getExtensionFromUrl(data.content))
+                                                                        })
                                                                     }
                                                                     else {
-                                                                        if (data.content.indexOf("?") > -1) {
-                                                                            model.$vue.downloadUrl = data.content + "&" + Math.random();
+                                                                        if (data.content.indexOf(".zip") > -1) {
+                                                                            window.location.href = encodeURI(data.content);
                                                                         }
                                                                         else {
-                                                                            model.$vue.downloadUrl = data.content + "?" + Math.random();
+                                                                            if (data.content.indexOf("?") > -1) {
+                                                                                model.$vue.downloadUrl = data.content + "&" + Math.random();
+                                                                            }
+                                                                            else {
+                                                                                model.$vue.downloadUrl = data.content + "?" + Math.random();
+                                                                            }
                                                                         }
                                                                     }
                                                                 }
@@ -794,10 +808,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                 onSubmit: () => {
                                     common.closeDialog(dialogOption.dialog);
                                 },
-                                onCloseDialog:()=>{
-                                  if (source == 'table') {
-                                    model.$vue.updateCurrentRow(field);
-                                  }
+                                onCloseDialog: () => {
+                                    if (source == 'table') {
+                                        model.$vue.updateCurrentRow(field);
+                                    }
                                 },
                                 isIframe: model.isIframe,
                             },
@@ -992,6 +1006,35 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
     }
 
 }
+//通过文件下载url拿到对应的blob对象
+function getBlob(url) {
+    return new Promise(resolve => {
+        const xhr = new XMLHttpRequest()
+        xhr.open('GET', url, true)
+        xhr.responseType = 'blob'
+        xhr.onload = () => {
+            if (xhr.status === 200) {
+                resolve(xhr.response)
+            }
+        }
+
+        xhr.send()
+    })
+}
+//下载文件
+function downloadFile(blob, filename) {
+    var link = document.createElement('a')
+    link.href = window.URL.createObjectURL(blob)
+    link.download = filename
+    link.click()
+}
+function getExtensionFromUrl(url) {
+    return url.split('.').pop().split(/#|\?/)[0];
+}
+function getUrlParameter(href, name) {
+    const url = new URL(href); // 创建URL对象
+    return url.searchParams.get(name); // 返回查询参数的值，例如 /user?userId=123 中的 userId
+}