centaline-data-driven-v3 0.1.38 → 0.1.40

package/src/components/web/dialog.vue

@@ -12,6 +12,7 @@ const contentTop = ref(0)
 const content = ref()
 const captionBarButtons = ref([])
 const modelSelf = ref(null)
+const submitCancelData= ref(null)
 onBeforeUnmount(()=>{
   modelSelf.value=null
 })
@@ -23,7 +24,7 @@ onActivated(() => {
 function close() {
     emit('close', props);
     if (props.vmodel.content[0].component != 'ct-iframe' && props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
-        props.vmodel.content[0].attrs["onCloseDialog"]();
+        props.vmodel.content[0].attrs["onCloseDialog"](submitCancelData.value);
     }
 }
 function scrollHandle(ev) {
@@ -159,6 +160,13 @@ const render = () => {
                                                             close();
                                                         }
                                                     }
+
+                                                    //加载失败关闭弹框
+                                                    if (!item.attrs.onSubmitCancel) {
+                                                        item.attrs.onSubmitCancel = (ev) => {
+                                                            submitCancelData.value = ev;
+                                                        }
+                                                    }
                                                     //此行代码是为了防止弹出的窗口高度 大于父级页面的高度
                                                     //暂时注释 高度由接口控制
                                                     var ph = 0;

package/src/loader/src/Cron.js

@@ -0,0 +1,11 @@
+import base from '../../loader/index';
+import valid from '../../utils//validate';
+const Cron = function (source) {
+    let rtn = { 
+       
+    };
+    rtn = base.copy(source, rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+};
+export default Cron

package/src/loader/src/DatePicker.js

@@ -41,13 +41,6 @@ const DatePicker = function (source) {
 
             if (this.flagtime) {
                 dateformat = 'HH:mm';
-                if (source.paramName1 && source.paramName1.length >= 2) {
-                    dateformat = source.paramName1;
-                }
-            }
-
-            else if (source.paramName1 && source.paramName1.length >= 10) {
-                dateformat = source.paramName1;
             }
             else if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange) {
                 dateformat = 'YYYY-MM-DD HH:mm';
@@ -55,6 +48,9 @@ const DatePicker = function (source) {
             else if (source.controlType == Enum.ControlType.DateYearMonth) {
                 dateformat = 'YYYY-MM';
             }
+            if (source.paramName1) {
+                dateformat = source.paramName1;
+            }
             return dateformat
         },
         get minuteStep() {

package/src/loader/src/Form.js

@@ -98,6 +98,9 @@ function loadFromModel(source, isFormList) {
           }
 
           rtn1[attrKey] = attrValue;
+          if (rtn1.fieldItemKey) {
+            rtn1.fieldItemKey = Math.random()
+          }
 
           if (rtn1.controlType === Enum.ControlType.Tags) {
             rtn1["value"] = JSON.parse(attrValue);
@@ -533,10 +536,12 @@ function loadFromModel(source, isFormList) {
           if (f.controlType == Enum.ControlType.Compound || f.controlType == Enum.ControlType.ContainerControl) {
             if (f.fields) {
               f.fields.forEach((v) => {
+                v.fieldItemKey = Math.random();
                 rtn._fieldsDic[v.fieldName1] = v;
               });
             }
           }
+          f.fieldItemKey = Math.random();
           rtn._fieldsDic[f.fieldName1] = f;
         });
       }
@@ -765,6 +770,12 @@ function loadFromModel(source, isFormList) {
     get tip() {
       return source.tip;
     },
+    get bottomTip() {
+      return source.bottomTip;
+    },
+    get flagFixedTabOnHorizontalLayout() {
+      return source.flagFixedTabOnHorizontalLayout === true;
+    },
     get flagAlertCloseWindowAfterSave() {
       return source.flagAlertCloseWindowAfterSave === true;
     },

package/src/loader/src/LibFunction.js

@@ -24,6 +24,7 @@ import Tags from './Tags';
 import Location from './Location';
 import AIChat from './AIChat';
 import JsonViewer from './JsonViewer';
+import Cron from './Cron';
 const LibFunction = {
     install(app) {
     },
@@ -279,6 +280,10 @@ const LibFunction = {
                 item = JsonViewer.loadJsonViewerModel(item);
                 item.is = 'ct-jsonviewer';
                 break;
+            case Enum.ControlType.Cron: //Cron表达式控件
+                item = Cron(item)
+                item.is = 'ct-cron'
+                break;
             default:
                 item = Label(item)
                 item.is = 'ct-label'
@@ -301,7 +306,7 @@ const LibFunction = {
                     else {
                         num = 24 / colNum;
                     }
-                    return num;
+                    return parseInt(num);
                 },
                 get for() {
                     return field.for;

package/src/loader/src/SliceUpload.js

@@ -1,7 +1,15 @@
-
+import common from '../../utils/common';
 async function postFile(api, data, callback) {
   var xhr = window.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP");
   xhr.open('POST', api, !0)
+  
+  // let headers=common.getDataDrivenOpts().handler.getRequestHeaders(api);
+  // if(headers){
+  //   for (const [key, value] of Object.entries(headers)) {
+  //     xhr.setRequestHeader(key,value)
+  //   }
+  // }
+
   xhr.onreadystatechange = function () {
     if (xhr.readyState != 4 || xhr.status < 200) {
       return false;

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "http://10.88.22.13:7080/ibs-api/",
+    baseUrl: "http://10.88.22.46:20808/service-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/",
@@ -65,7 +65,9 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"T5067-1993594422771769344",platform:"WEB"}',
+                
+AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI3NjY3NmE5LWE5ZDEtNDJhNy05N2UwLWZjYjM4ZmM4NGExYiJ9.NMtc9T_b_BHBj1Ru6_BsVrlkUiptS4EKrrMsx9i7FScbcpGSnQqd1JnQ0ObEu_kwkNAqvMA4LDHuve1DsS8hkA',
+              authobject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"f1fe9ca3d9c88ffd7d1298227dbb4def","token":"","random":"c6HfeQ","time":1766043585321,"sign":""}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',

package/src/utils/Enum.js

@@ -313,7 +313,12 @@ const Enum = {
     /// <summary>
     ///  Json预览控件
     /// </summary>
-    JsonViewer: 63
+    JsonViewer: 63,
+
+    /**
+     *  cron 表达式生成/选择
+     */
+    Cron:65,
   },
 
   //返回状态码

package/src/utils/common.js

@@ -278,7 +278,10 @@ const common = {
    */
   message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
     if (dataDrivenOpts.flagApp) {
-      if (this.hasHtml(message)) {
+      if (typeof duration === 'undefined') {
+        duration = 3000;
+      }
+      if (duration == 0) {
         showDialog({ message: message, allowHtml: true });
       }
       else if (type == 'error') {
@@ -287,7 +290,7 @@ const common = {
       else {
         showToast({
           message: message,
-          duration: 3000,
+          duration: duration,
         });
       }
 
@@ -303,9 +306,7 @@ const common = {
         showClose = false;
       }
       if (this.hasHtml(message)) {
-        duration = 0;
         dangerouslyUseHTMLString = true;
-        showClose = true;
       }
       ElMessage({
         message: message,//消息文字

package/src/utils/distance-utils.js

@@ -0,0 +1,84 @@
+export const useDistanceCalculator = (elementRef) => {
+  const getAllDistances = (retryCount = 0) => {
+    if (!elementRef?.value) {
+      console.warn('元素引用为空');
+      return null;
+    }
+    
+    const element = elementRef.value;
+    
+    // 检查元素是否在 DOM 中
+    if (!document.body.contains(element)) {
+      console.warn('元素不在 DOM 中');
+      return null;
+    }
+    
+    const rect = element.getBoundingClientRect();
+    const scrollTop = window.pageYOffset;
+    
+    // 检查是否有实际尺寸
+    const hasSize = rect.height > 0 && rect.width > 0;
+    
+    if (!hasSize && retryCount < 3) {
+      console.warn(`元素尺寸为 0，尝试重试 (${retryCount + 1}/3)`);
+      // 延迟重试
+      setTimeout(() => getAllDistances(retryCount + 1), 50);
+      return null;
+    }
+    
+    // 获取计算样式，检查是否隐藏
+    const computedStyle = window.getComputedStyle(element);
+    const isVisible = computedStyle.display !== 'none' && 
+                      computedStyle.visibility !== 'hidden' &&
+                      computedStyle.opacity !== '0';
+    
+    if (!isVisible) {
+      console.warn('元素不可见，无法获取尺寸');
+      return null;
+    }
+    
+    return {
+      // 到文档顶部的距离
+      toDocumentTop: rect.top + scrollTop,
+      
+      // 到视口顶部的距离
+      toViewportTop: rect.top,
+      
+      // 元素自身信息
+      elementInfo: {
+        height: rect.height,
+        width: rect.width,
+        top: rect.top,
+        right: rect.right,
+        bottom: rect.bottom,
+        left: rect.left,
+        // 添加更多诊断信息
+        hasSize,
+        isVisible,
+        displayStyle: computedStyle.display,
+        positionStyle: computedStyle.position
+      },
+      
+      // 视口信息
+      viewportInfo: {
+        height: window.innerHeight,
+        width: window.innerWidth,
+        scrollTop: scrollTop
+      }
+    };
+  };
+  
+  // 添加一个延迟获取的方法，用于异步内容
+  const getDistancesWithDelay = (delay = 100) => {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(getAllDistances());
+      }, delay);
+    });
+  };
+  
+  return { 
+    getAllDistances,
+    getDistancesWithDelay 
+  };
+};

package/src/utils/mixins.js

@@ -181,7 +181,12 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                 }
                                                             }
                                                             if (data.rtnMsg) {
-                                                                common.message(data.rtnMsg, 'success')
+                                                                if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+                                                                    common.message(data.rtnMsg, 'success', '', 0, true)
+                                                                }
+                                                                else {
+                                                                    common.message(data.rtnMsg, 'success')
+                                                                }
                                                             }
                                                             if (data.notification === Enum.ActionType.Router) {
                                                                 if (common.dialogList && common.dialogList.List.value.length > 0
@@ -242,7 +247,12 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                             }
                                                                         }
                                                                         if (data.rtnMsg) {
-                                                                            common.message(data.rtnMsg, 'success')
+                                                                            if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+                                                                                common.message(data.rtnMsg, 'success', '', 0, true)
+                                                                            }
+                                                                            else {
+                                                                                common.message(data.rtnMsg, 'success')
+                                                                            }
                                                                         }
                                                                         if (data.notification === Enum.ActionType.Router) {
                                                                             if (common.dialogList && common.dialogList.List.value.length > 0
@@ -300,6 +310,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                     }
                                                 }
                                                 model.$vue.emit('submit', { formData: model, responseData: data });
+                                            }, () => {
+                                                model.$vue.emit('submitCancel', { formData: model, responseData: data });
+                                                model.$vue.init();
                                             }).catch(() => {
                                                 model.$vue.init();
                                             });
@@ -565,7 +578,12 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                         }
                                                     }
                                                     if (data.rtnMsg) {
-                                                        common.message(data.rtnMsg, 'success')
+                                                        if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+                                                            common.message(data.rtnMsg, 'success', '', 0, true)
+                                                        }
+                                                        else {
+                                                            common.message(data.rtnMsg, 'success')
+                                                        }
                                                     }
                                                     if (field && field.callBackFunName) {
                                                         model.$vue.changeCallBackHandler(field, field.callBackFunName, data.content);
@@ -632,7 +650,12 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                     }
                                                                 }
                                                                 if (data.rtnMsg) {
-                                                                    common.message(data.rtnMsg, 'success')
+                                                                    if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+                                                                        common.message(data.rtnMsg, 'success', '', 0, true)
+                                                                    }
+                                                                    else {
+                                                                        common.message(data.rtnMsg, 'success')
+                                                                    }
                                                                 }
                                                                 if (field && field.callBackFunName) {
                                                                     model.$vue.changeCallBackHandler(field, field.callBackFunName, data.content);
@@ -768,6 +791,53 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                     }
                                     common.closeDialog(dialogOption);
                                 },
+                                onCloseDialog: (ev) => {
+                                    if (ev) {
+                                        if (source == 'table') {
+                                            if (ev.responseData.notification == Enum.ActionType.UpdateColumns) {
+                                                //更新列                            
+                                                model.$vue.refreshTableColumns();
+                                            }
+                                            else if (ev.responseData.notification == Enum.ActionType.Delete
+                                                || ev.responseData.notification == Enum.ActionType.Refersh
+                                            ) {
+                                                model.$vue.doAction(ev);
+                                                model.$vue.loadStats();
+                                            }
+                                            else {
+                                                if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                                                    model.$vue.doAction(ev);
+                                                    let response = ev;
+                                                    if (response.responseData) {
+                                                        response = response.responseData;
+                                                    }
+                                                    if (response.notification === Enum.ActionType.Delete || response.notification === Enum.ActionType.CloseTabThenDelete) {
+                                                        model.$vue.loadStats();
+                                                    }
+                                                }
+                                                model.$vue.updateCurrentRow(field, ev);
+                                                if (ev.responseData && ev.responseData.notification === Enum.ActionType.Router) {
+                                                    setTimeout(() => {
+                                                        routerClickHandler(model.getRtnRouter(ev.responseData.content), {}, action, model, source);
+                                                    });
+                                                }
+                                            }
+                                        }
+                                        else {
+                                            if (callBack) {
+                                                callBack(ev.responseData.content[0]);
+                                            }
+                                            if (ev.responseData && ev.responseData.notification === Enum.ActionType.Refersh) {
+                                                model.$vue.init();
+                                            }
+                                            else {
+                                                if (model.$vue && model.$vue.updateFields) {
+                                                    model.$vue.updateFields(ev);
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
                                 isIframe: model.isIframe,
                             },
                         }]

package/src/utils/request.js

@@ -73,11 +73,11 @@ const request = {
         //common.getDataDrivenOpts().handler.closeTab();
       }
     }
+    
     if (data.rtnCode === Enum.ReturnCode.Successful) {
       if (data.rtnMsg && common.getDataDrivenOpts().showRequestSuccessMessage) {
-        if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+        if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
           common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
-
         }
         else {
           common.message(response.data.rtnMsg, 'success')
@@ -114,7 +114,7 @@ const request = {
     }
     else {
       if (response.data.rtnMsg && common.getDataDrivenOpts().showRequestErrorMessage) {
-        if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
+        if (data.msgAlertStyle && data.msgAlertStyle == Enum.MessageAlertStyle.Dialog) {
 
           common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
         }

package/src/utils/validate.js

@@ -84,6 +84,9 @@ const actions = {
     }
   },
   numberMax(v, o) {
+    if (v.code1 == '-') {
+      return true;
+    }
     if (v.code1 <= parseFloat(v.maxValue1)) {
       return true
     }
@@ -91,7 +94,7 @@ const actions = {
       if (!v.code1) {
         return false;
       }
-      common.message("【"+v.controlLabel+"】最大值为" + v.maxValue1 + "");
+      common.message("【" + v.controlLabel + "】最大值为" + v.maxValue1 + "");
       v.code1 = o;
       return true;
     }

package/src/views/Form.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/propertyTender/readDetail'" :apiParam="apiParam"></ct-form>
+   <ct-form :api="'/jobschedulingmanage/JobManage/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
 <ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  

package/src/views/SearchList.vue

@@ -1,13 +1,15 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/UIResourceList/getLayoutOfSearch'"
-      :searchDataApi="'/UIResourceList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/comprehensive/ApplicationList/getLayoutOfSearch'"
+      
+    :searchDataApi="'/comprehensive/ApplicationList/getList'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->
 
  <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/OvertimeList/getLayoutOfSearch'"
-      :searchDataApi="'/OvertimeList/getListOfSearchModel'"></ct-searchlist>  -->
+ :searchStatsApi="'/ProfileWorklistList/getListStats'"    
+ :searchDataApi="'/OvertimeList/getListOfSearchModel'"></ct-searchlist>  -->
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>