vue2-client 1.19.0 → 1.19.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.19.0",
+  "version": "1.19.2",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/XAddNativeForm/demo.vue

@@ -11,7 +11,7 @@ export default {
     }
   },
   mounted() {
-    getConfigByNameAsync('CardSellGasForm', 'af-revenue').then(res => {
+    getConfigByNameAsync('测试Form', 'af-safecheck').then(res => {
       this.$refs.xAddFrom.init(
         Object.assign(res, {
           modifyModelData: {

package/src/base-client/components/common/XDatePicker/index.vue

@@ -199,6 +199,80 @@ export default {
         }
       }
       return {}
+    },
+    // 日期范围限制函数
+    disabledDate () {
+      // 查询模式下不进行范围限制
+      if (this.mode === '查询') {
+        return undefined
+      }
+
+      const dateRangeOption = this.attr.dateRangeOption
+      if (!dateRangeOption || !dateRangeOption.type) {
+        return undefined
+      }
+
+      const { type, beforeDays, afterDays } = dateRangeOption
+      const today = moment().startOf('day')
+
+      return (current) => {
+        // 根据组件类型处理不同的时间粒度
+        let currentDate, comparisonDate
+
+        if (['monthPicker', 'monthRangePicker'].includes(this.attr.type)) {
+          // 月份选择器：比较月份
+          currentDate = moment(current).startOf('month')
+          comparisonDate = moment(today).startOf('month')
+        } else if (['yearPicker', 'yearRangePicker'].includes(this.attr.type)) {
+          // 年份选择器：比较年份
+          currentDate = moment(current).startOf('year')
+          comparisonDate = moment(today).startOf('year')
+        } else {
+          // 日期选择器：比较日期
+          currentDate = moment(current).startOf('day')
+          comparisonDate = today
+        }
+
+        switch (type) {
+          case 'afterToday':
+            // 只能选择今天及以后的日期/月份/年份
+            return currentDate.isBefore(comparisonDate)
+          case 'beforeToday':
+            // 只能选择今天及以前的日期/月份/年份
+            return currentDate.isAfter(comparisonDate)
+          case 'custom':
+            // 自定义范围：beforeDays（今天前多少天）、afterDays（今天后多少天）
+            if (beforeDays && beforeDays > 0) {
+              let minDate
+              if (['monthPicker', 'monthRangePicker'].includes(this.attr.type)) {
+                minDate = moment(comparisonDate).subtract(beforeDays, 'months')
+              } else if (['yearPicker', 'yearRangePicker'].includes(this.attr.type)) {
+                minDate = moment(comparisonDate).subtract(beforeDays, 'years')
+              } else {
+                minDate = moment(comparisonDate).subtract(beforeDays, 'days')
+              }
+              if (currentDate.isBefore(minDate)) {
+                return true
+              }
+            }
+            if (afterDays && afterDays > 0) {
+              let maxDate
+              if (['monthPicker', 'monthRangePicker'].includes(this.attr.type)) {
+                maxDate = moment(comparisonDate).add(afterDays, 'months')
+              } else if (['yearPicker', 'yearRangePicker'].includes(this.attr.type)) {
+                maxDate = moment(comparisonDate).add(afterDays, 'years')
+              } else {
+                maxDate = moment(comparisonDate).add(afterDays, 'days')
+              }
+              if (currentDate.isAfter(maxDate)) {
+                return true
+              }
+            }
+            return false
+          default:
+            return false
+        }
+      }
     }
   },
   methods: {
@@ -234,6 +308,7 @@ export default {
     :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
+    :disabledDate="disabledDate"
     style="width: 100%"
     :showToday="true"
     placeholder="请选择日期"
@@ -251,6 +326,7 @@ export default {
     :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
+    :disabledDate="disabledDate"
     :show-time="true"
     placeholder="请选择月份"
     :valueFormat="formatType"
@@ -266,6 +342,7 @@ export default {
     :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
+    :disabledDate="disabledDate"
     format="YYYY"
     :valueFormat="formatType"
     :open="yearShowOne"
@@ -328,6 +405,7 @@ export default {
     "
     v-model="localValue"
     :disabled="disabled"
+    :disabledDate="disabledDate"
     :placeholder="placeholder"
     :show-time="
       ['yearRangePicker', 'monthRangePicker'].includes(attr.type)

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

package/src/base-client/components/his/XTitle/XTitle.vue

@@ -12,7 +12,7 @@
         <div class="title-content">
           <div class="title-dot"></div>
           <a-icon v-if="attrs.icon && !attrs.customIcon" :type="attrs.icon" class="title-icon" />
-          <XIcon v-if="attrs.customIcon" :name="attrs.customIcon" class="title-icon" />
+          <XIcon v-if="attrs.customIcon" :name="attrs.customIcon" class="title-icon"/>
           <span>{{ config.label }}</span>
         </div>
         <div
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, useAttrs } from 'vue'
+import {ref, computed, onMounted, useAttrs} from 'vue'
 import XIcon from '../XIcon/XIcon.vue'
 
 const props = defineProps({
@@ -101,11 +101,36 @@ const isShowTopLine = computed(() => {
 const isShowBottomLine = computed(() => {
   return attrs.showBottomLine === 'true' || attrs.showBottomLine === true
 })
+// 暴露方法供外部调用，动态修改标题
+const updateTitle = (newTitle) => {
+  if (newTitle !== undefined && newTitle !== null) {
+    config.value.label = String(newTitle)
+    config.value.type = 'title'
+    config.value.line = ''
+    config.value.color = ''
+    config.value.lineLength = ''
+    config.value.clickName = ''
+    // 强制更新（以防万一）
+    config.value = {...config.value}
+  }
+}
+
+// 暴露方法供外部调用，动态修改 queryParamsName
+const updateQueryParamsName = (newParams) => {
+  parseConfig(newParams)
+}
+
 const handleClick = () => {
   if (config.value.clickName) {
     emit(config.value.clickName)
   }
 }
+
+// 暴露组件方法
+defineExpose({
+  updateTitle,
+  updateQueryParamsName
+})
 const parseConfig = (data) => {
   // 如果设置了title属性，直接使用title作为标签
   if (props.title) {
@@ -156,6 +181,7 @@ const parseConfig = (data) => {
   }
 }
 
+
 onMounted(() => {
   parseConfig(props.queryParamsName)
 })
@@ -181,6 +207,7 @@ onMounted(() => {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
 .underline {
   position: absolute;
   bottom: 0;
@@ -193,6 +220,7 @@ onMounted(() => {
 .x-button-container {
   text-align: right;
 }
+
 .x-title-center {
   &.x-title-container,
   .x-title-container {
@@ -201,6 +229,7 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-littlefont {
   &.x-title-container,
   .x-title-container {
@@ -239,6 +268,7 @@ onMounted(() => {
     align-items: baseline;
   }
 }
+
 // 顶部分割线
 .top-line {
   width: 100%;
@@ -248,6 +278,7 @@ onMounted(() => {
   margin: 8px 0;
   opacity: 1;
 }
+
 .x-title-dot,
 .x-title-nodot {
   &.x-title-container,
@@ -271,12 +302,14 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-yizhu-title {
   &.x-title-container,
   .x-title-container {
     margin-top: 3px;
     margin-left: 6px;
     margin-bottom: 7px;
+
     :deep(.x-title) {
       height: 26px;
       opacity: 1;
@@ -290,10 +323,12 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-left-title {
   &.x-title-container,
   .x-title-container {
     margin: 15px auto 15px 6px;
+
     :deep(.x-title) {
       height: 26px;
       opacity: 1;
@@ -304,6 +339,7 @@ onMounted(() => {
     }
   }
 }
+
 // nodot 样式特有部分
 .x-title-nodot {
   &.x-title-container,
@@ -314,12 +350,14 @@ onMounted(() => {
     }
   }
 }
+
 .x-title-line-style {
   background: #0057FE;
   height: 2px;
 }
+
 .x-title-compact {
-  :deep(.x-title){
+  :deep(.x-title) {
     height: 23px;
     opacity: 1;
     font-family: "Source Han Sans";

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: 4640
+      workflowId: 5958
     })
   },
   methods: {

package/src/router/async/router.map.js

@@ -61,8 +61,8 @@ routerResource.example = {
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
-  component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue')
+  component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
+  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),