centaline-data-driven 1.6.72 → 1.6.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.6.72",
+  "version": "1.6.73",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/release-log.md

@@ -1,3 +1,22 @@
+# v1.6.73
+2026-10-10
+
+优化
+
+弹层支持拖动
+
+日期区间支持快捷选项
+
+列表行操作按钮，点击后要禁用，防止重复点击导致错误
+
+BUG
+
+刷新行数据返回0会变成空处理
+
+列表打开tab表单，tab表单再打开tab表单，最后一个tab表单保存后没有关闭tab处理
+
+表单点保存后，其他按钮没有被遮盖处理
+
 # v1.6.72
 2026-09-16
 

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/plannedfeemanage/receivecommission/getLayoutOfEdit'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "originalTraId":"1526444754463850498","columnName":"transactionNo","actionType":"1","pageStyle":"2","pageTitle":"成交报告","pageOnly":"true"
+          "commId":"2609230938188840D96DA7184C3880A2","actionType":"3","pageStyle":"2","pageOnly":"true"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -1,23 +1,25 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
 
-    <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
+    <!-- CCAI -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->    
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/profit-return/layout'"  :searchDataApi="'/api/third-dept-tran/profit-return'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/necessaryFile/importTransFile/getLayoutOfSearch'" :searchDataApi="'/api/necessaryFile/importTransFile/getTableList'"></ct-searchlist> -->    
-    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/taskManagement/WorkingCalendarList/getLayoutOfSearch'" :searchDataApi="'//taskManagement/WorkingCalendarList/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :searchConditionApi="'/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> --> 
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/taskManagement/WorkingCalendarList/getLayoutOfSearch'" :searchDataApi="'/api/taskManagement/WorkingCalendarList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/api/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/api/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/api/filemanage/batchdownlist/getList'"></ct-searchlist> --> 
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/invoice-apply/layout'"  :searchDataApi="'/api/finance/invoice-apply/list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/approveManage/contractBatchOperation/getLayoutOfSearch'"  :searchDataApi="'/api/approveManage/contractBatchOperation/getTableList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/commission-role-period/commissionRoleLayout'"  :searchDataApi="'/api/commission-role-period/commissionRoleList'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/compareList/getLayoutOfSearch'"  :searchDataApi="'/compareList/getTableList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/compareList/getLayoutOfSearch'"  :searchDataApi="'/api/compareList/getTableList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/wf/todo/layout'"  :searchDataApi="'/api/wf/todo/list'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/shift-approver/layout'"  :searchDataApi="'/api/shift-approver/list'"></ct-searchlist> -->
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
@@ -40,6 +42,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/systemmanage/CustomerTemplateList/getLayoutOfSearch'"  :searchDataApi="'/systemmanage/CustomerTemplateList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/priceuploadlist/getLayoutOfSearch'"  :searchDataApi="'//salemattersmanage/priceuploadlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/app/workbenchdetails/getContractLayoutOfSearch'"  :searchDataApi="'/app/workbenchdetails/getContractList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist> -->
@@ -48,17 +51,18 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/dealmanagementreport/StandingBookSZList/getLayoutOfSearch'"  :searchDataApi="'/dealmanagementreport/StandingBookSZList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/dealmanagementreport/standingbookreport/getLayoutOfSearch'"  :searchDataApi="'/dealmanagementreport/standingbookreport/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/saleconfigurationmanagement/CurrencyTypeExchangeRateList/getLayoutOfSearch'"  :searchDataApi="'/saleconfigurationmanagement/CurrencyTypeExchangeRateList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/saleconfigurationmanagement/CurrencyTypeExchangeRateList/getLayoutOfSearch'"  :searchDataApi="'/saleconfigurationmanagement/CurrencyTypeExchangeRateList/getListOfSearchModel'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/invoicemanage/CommissionInvoiceList/getLayoutOfSearch'"  :searchDataApi="'/invoicemanage/CommissionInvoiceList/getList'"></ct-searchlist>
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
-      :searchDataApi="'/api/transaction/adjustRecord/getTableList'">
+      :searchConditionApi="'/transaction/adjustRecord/getLayoutOfSearch'" 
+      :searchDataApi="'/transaction/adjustRecord/getTableList'">
     </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/api/transfer_subscribe_master/layout'" 
-      :searchDataApi="'/api/transfer_subscribe_master/transferSubscribeMasterList'">
+      :searchConditionApi="'/transfer_subscribe_master/layout'" 
+      :searchDataApi="'/transfer_subscribe_master/transferSubscribeMasterList'">
     </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -124,6 +128,7 @@
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportAttendanceExceptionList/getLayoutOfSearch'" :searchDataApi="'/ReportAttendanceExceptionList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PersonHolidayList/getLayoutOfSearch'" :searchDataApi="'/PersonHolidayList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearch'" :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModel'"></ct-searchlist> -->
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'" :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/HolidayTypeList/getLayoutOfSearch'" :searchDataApi="'/HolidayTypeList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceBalanceAlertList/getLayoutOfSearch'" :searchDataApi="'/AttendanceBalanceAlertList/getListOfSearchModel'"></ct-searchlist> -->

package/src/centaline/dialogList/src/dialog.vue

@@ -1,4 +1,5 @@
 <script>
+import { useDraggable } from './useDraggable.js'
 export default {
   name: 'ctDialog',
   props: {
@@ -14,6 +15,9 @@ export default {
       captionBarButtons: [],
       modelSelf: null,
       submitCancelData: null,
+      draggable: null,
+      position: { left: 0, top: 0 },
+      hasDragged: false
     };
   },
   activated() {
@@ -23,6 +27,9 @@ export default {
   },
   destroyed() {
     this.$off();
+    if (this.draggable) {
+      this.draggable.destroy()
+    }
     if (this.$el.parentNode) this.$el.parentNode.removeChild(this.$el);
     this.modelSelf = null;
     this.$el = null;
@@ -43,7 +50,28 @@ export default {
       this.contentTop = this.$refs.content.scrollTop;
       ev.cancelBubble = true;
       ev.stopPropagation();
-    },
+    }, 
+    startDrag(e) {
+      if (this.draggable) {
+        this.draggable.startDrag(e)
+      }
+    }
+  },
+  computed: {
+    containerStyle() {
+      if (this.hasDragged) {
+        return {
+          position: 'fixed',
+          left: this.position.left + 'px',
+          top: this.position.top + 'px',
+          margin: '0'
+        }
+      }
+      return {
+        margin: 'auto',
+        position: 'relative'
+      }
+    }
   },
   mounted() {
     //this.$el.parentNode.removeChild(this.$el);
@@ -53,6 +81,14 @@ export default {
     //else {
     //  document.body.appendChild(this.$el);
     //}
+    this.draggable = useDraggable('.ct-dialog_draggable', { left: 0, top: 0 })
+    // 注册更新回调，拖动时同步到组件响应式数据
+    this.draggable.onUpdate(() => {
+      const pos = this.draggable.getPosition()
+      this.position.left = pos.left
+      this.position.top = pos.top
+      this.hasDragged = this.draggable.getHasDragged()
+    })
   },
   render: function (h) {
     var self = this;
@@ -86,10 +122,14 @@ export default {
           //    'dialog-cover'
           //  ]}),
           h('div', {
+            // style: {
+            //   'margin': 'auto',
+            //   'position': 'relative'
+            // },
+            class: 'ct-dialog_draggable',   // 增加 class
             style: {
-              'margin': 'auto',
-              'position': 'relative'
-            },
+                ...this.containerStyle
+            }
             //'class': [
             //  'dialog-content '
             //]
@@ -121,8 +161,14 @@ export default {
                         style: {
                           'position': 'relative',
                           'padding': '10px 20px 10px 20px',
-                          'height': '44px'
+                          'height': '44px',
+                          'cursor': this.hasDragged ? 'move' : 'default'
                         },
+                        on: {
+                          'mousedown': (e) => {
+                            this.startDrag(e);
+                          }
+                        }
                       }, [
                         h('span',
                           {
@@ -350,4 +396,8 @@ export default {
   background-color: #e4624c;
   color: fff;
 }
+
+.ct-dialog_header{
+    cursor: move;
+}
 </style>

package/src/centaline/dialogList/src/useDraggable.js

@@ -0,0 +1,133 @@
+/**
+ * 对话框拖动工具函数 (Vue2 兼容版)
+ * @param {string} selector - 要拖动的容器选择器（默认 '.ct-dialog_draggable'）
+ * @param {Object} initialPosition - 初始位置 { left, top }
+ * @returns {Object} { startDrag, getContainerStyle, onUpdate, getPosition, getHasDragged, destroy }
+ */
+ export function useDraggable(selector = '.ct-dialog_draggable', initialPosition = { left: 0, top: 0 }) {
+  let hasDragged = false
+  let isDragging = false
+  let position = Object.assign({}, initialPosition)
+  let offset = { x: 0, y: 0 }
+  let updateCallbacks = []
+  let currentOnDrag = null
+  let currentStopDrag = null
+
+  /**
+   * 鼠标按下开始拖动
+   * @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) {
+      position.left = rect.left
+      position.top = rect.top
+      hasDragged = true
+    }
+
+    isDragging = true
+
+    // 将内部函数保存为闭包变量，以便后续销毁时移除
+    currentOnDrag = function (ev) {
+      if (!isDragging) return
+      position.left = ev.clientX - offset.x
+      position.top = ev.clientY - offset.y
+      // 通知视图更新
+      updateCallbacks.forEach(cb => cb())
+    }
+
+    currentStopDrag = function () {
+      isDragging = false
+      document.removeEventListener('mousemove', currentOnDrag)
+      document.removeEventListener('mouseup', currentStopDrag)
+      currentOnDrag = null
+      currentStopDrag = null
+    }
+
+    document.addEventListener('mousemove', currentOnDrag)
+    document.addEventListener('mouseup', currentStopDrag)
+
+    // 阻止默认行为和文本选择
+    e.preventDefault()
+  }
+
+  /**
+   * 对话框容器动态样式
+   * - 未拖动前：margin: auto; position: relative; （保持居中）
+   * - 拖动后：position: fixed; left/top 由拖动位置控制
+   */
+  function getContainerStyle() {
+    if (hasDragged) {
+      return {
+        position: 'fixed',
+        left: position.left + 'px',
+        top: position.top + 'px',
+        margin: '0'
+      }
+    }
+    return {
+      margin: 'auto',
+      position: 'relative'
+    }
+  }
+
+  /**
+   * 注册视图更新回调（组件侧调用，用于同步响应式数据）
+   */
+  function onUpdate(cb) {
+    updateCallbacks.push(cb)
+  }
+
+  /**
+   * 获取当前位置
+   */
+  function getPosition() {
+    return Object.assign({}, position)
+  }
+
+  /**
+   * 获取是否已拖动过
+   */
+  function getHasDragged() {
+    return hasDragged
+  }
+
+  /**
+   * 销毁（清理事件监听器和回调）
+   */
+  function destroy() {
+    updateCallbacks = []
+    // 清理可能残留的全局事件监听器
+    if (currentOnDrag) {
+      document.removeEventListener('mousemove', currentOnDrag)
+      currentOnDrag = null
+    }
+    if (currentStopDrag) {
+      document.removeEventListener('mouseup', currentStopDrag)
+      currentStopDrag = null
+    }
+    isDragging = false
+    hasDragged = false
+  }
+
+  return {
+    startDrag,
+    getContainerStyle,
+    onUpdate,
+    getPosition,
+    getHasDragged,
+    destroy
+  }
+}

package/src/centaline/dynamicDtd/src/dynamicDtd.vue

@@ -7,19 +7,19 @@
         </div>
         <div class="ct-datepicker" v-if="model !== null" :class="[model.showLabel?'showLabel':'']">
           <el-date-picker class="ct-date-picker-editor" v-model="model.value"
-                          v-bind="model.attrs"
+                          v-bind="model.attrs" name="startDate"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
-                          :picker-options="pickerOptions"
+                          :picker-options="startPickerOptions"
                           :placeholder="model.placeholder"
                           :disabled="model.lock">
           </el-date-picker>
           <span class="ct-date-picker-span">-</span>
           <el-date-picker class="ct-date-picker-editor" v-model="model.value1"
-                          v-bind="model.attrs"
+                          v-bind="model.attrs" name="endDate"
                           @change="changeModel($event)"
                           @clear="changeModel($event)"
-                          :picker-options="pickerOptions"
+                          :picker-options="endPickerOptions"
                           :placeholder="model.placeholder1"
                           :disabled="model.lock">
           </el-date-picker>
@@ -45,10 +45,22 @@
     },
     data() {
       return {
-        pickerOptions: this.getPickerOptions()
+        startPickerOptions: this.getPickerOptions(),
+        endPickerOptions: this.getPickerOptions(),
+        shortcutDefs : [
+          { displayName: '今日', name: '0', code: 'd' },
+          { displayName: '最近3天', name: '-3', code: 'd' },
+          { displayName: '最近7天', name: '-7', code: 'd' },
+          { displayName: '最近半月', name: '-15', code: 'd' },
+          { displayName: '最近一月', name: '-30', code: 'd' },
+          { displayName: '上周', name: '-1', code: 'w' },
+          { displayName: '本月', name: '0', code: 'm' },
+          { displayName: '上个月', name: '-1', code: 'm' },
+          { displayName: '去年', name: '-1', code: 'y' },
+        ],
       };
     },
-    mounted() {     
+    mounted() {
       var self = this;
       this.$nextTick(function () {
         if (self.vmodel) {
@@ -73,7 +85,7 @@
     },
     methods: {
       getPickerOptions() {
-        let self = this
+        let self = this;
         return {
           disabledDate(time) {
             let validate = false;
@@ -87,9 +99,97 @@
           }
         }
       },
+      calcDateRange(code, offset) {
+        /**
+         * 根据 code + name 计算日期区间 [start, end]
+         * @param {String} code - d:天 | w:周 | m:月 | y:年
+         * @param {Number} offset - 偏移量，0=当前，负数=往前推
+         * @returns {[Date, Date]} [startDate, endDate]
+         */
+        const now = new Date();
+        let start, end;
+
+        switch (code) {
+          case 'd': {
+            // 按天：end=今天零点，start=今天+offset天零点
+            end = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+            start = new Date(end);
+            if(offset !== 0){
+              start.setDate(start.getDate() + offset + 1);
+            }
+            break;
+          }
+          case 'w': {
+            // 按周：以周一为一周起始
+            // 先算出本周一
+            const dayOfWeek = now.getDay() || 7; // 周日=7
+            const thisMonday = new Date(now.getFullYear(), now.getMonth(), now.getDate() - dayOfWeek + 1);
+            // 偏移到目标周的周一
+            start = new Date(thisMonday);
+            start.setDate(start.getDate() + offset * 7);
+            // 目标周的周日
+            end = new Date(start);
+            end.setDate(end.getDate() + 6);
+            break;
+          }
+          case 'm': {
+            // 按月：目标月的1号 ~ 最后一天
+            const targetMonth = new Date(now.getFullYear(), now.getMonth() + offset, 1);
+            start = new Date(targetMonth);
+            end = new Date(targetMonth.getFullYear(), targetMonth.getMonth() + 1, 0);
+            break;
+          }
+          case 'y': {
+            // 按年：目标年的1月1日 ~ 12月31日
+            const targetYear = now.getFullYear() + offset;
+            start = new Date(targetYear, 0, 1);
+            end = new Date(targetYear, 11, 31);
+            break;
+          }
+          default:
+            end = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+            start = new Date(end);
+        }
+
+        // 统一归零时分秒，避免时间部分干扰比较
+        start.setHours(0, 0, 0, 0);
+        end.setHours(0, 0, 0, 0);
+
+        return [start, end];
+      },
+      getShortcuts(type) {
+        let self = this;
+        
+        if (!self.model || self.model.attrs.type !== 'date') return null;
+
+        // 核心改动：动态选择数据源
+        const defs = (self.model.selectItems1 && Array.isArray(self.model.selectItems1) && self.model.selectItems1.length > 0)
+          ? self.model.selectItems1
+          : self.shortcutDefs;
+
+        return defs.map(def => ({
+          text: def.displayName,
+          onClick(picker) {
+            // ⚡ 仅在用户点击时才计算日期，保证始终使用当前时间
+            const offset = parseInt(def.name, 10);
+            const [start, end] = self.calcDateRange(def.code, offset);
+
+            if (type === 'start') {
+              self.$set(self.model, 'value1', end);
+              picker.$emit('pick', start);
+            } else {
+              self.$set(self.model, 'value', start);
+              picker.$emit('pick', end);
+            }
+          }
+        }));
+      },
       load(data) {
         this.model = data;
         this.model.self=this;
+       
+        this.startPickerOptions.shortcuts = this.getShortcuts('start');
+        this.endPickerOptions.shortcuts = this.getShortcuts('end');
       },
       changeModel(event) {
         this.inputHandler(event);