vue2-client 1.12.2 → 1.12.3-9.alpha.1

package/src/base-client/components/common/XDataCard/XDataCard.vue

@@ -2,21 +2,11 @@
   <div>
     <div v-if="render" class="XCard">
       <template v-for="(card, itemIndex) in data">
-        <a-card :key="'card' + itemIndex" class="data-card">
-          <!-- 绑带 -->
-          <!--          <div class="ribbon" v-for="column in tableColumns" v-if="column.dataIndex === item.key" :key="column.dataIndex">-->
-          <!--            <template v-if="column.slotType === 'badge'">-->
-          <!--              <x-badge-->
-          <!--                :service-name="serviceName"-->
-          <!--                :env="env"-->
-          <!--                :dataCard="true"-->
-          <!--                :badge-key="column.slotKeyMap"-->
-          <!--                :value="card[item.key]" />-->
-          <!--            </template>-->
-          <!--            <template v-else>-->
-          <!--              <slot :name="column.slots.customRender">{{ card[config.bandage] }}</slot>-->
-          <!--            </template>-->
-          <!--          </div>-->
+        <a-card
+          :key="'card' + itemIndex"
+          class="data-card"
+          :class="{ 'card-clicked': card.isClicked }"
+        >
           <div
             v-if="config && card[config.ribbon]"
             class="ribbon"
@@ -25,7 +15,7 @@
           </div>
           <!-- 自定义标题 -->
           <template #title>
-            <div class="custom-title">
+            <div class="custom-title" @click="clickFooter(card, 'cardclick', itemIndex)">
               <a-tooltip placement="top">
                 <template #title>{{ card[config.id] }}</template>
                 <div class="title-id" v-if="card[config.id]">{{ card[config.id] }}</div>
@@ -51,7 +41,7 @@
             </div>
           </template>
           <!-- 主体 -->
-          <div class="body">
+          <div class="body" v-if="card[config.text] || (config.content && config.content.length > 0)">
             <div class="body-text" v-if="card[config.text]">
               <a-tooltip :title="card[config.text]">
                 <span class="text-ellipsis">{{ card[config.text] }}</span>
@@ -97,9 +87,9 @@
           </div>
           <!-- 下方按钮 -->
           <template #actions>
-            <a-row align="middle" class="custom-actions">
+            <a-row align="middle" class="custom-actions" v-if="config && config.footer && config.footer.length > 0">
               <template v-for="(item, footerIndex) in config.footer">
-                <a-col :key="'footer_' + footerIndex" class="footer-item" :span="11" @click="clickFooter(card, item.emit)">
+                <a-col :key="'footer_' + footerIndex" class="footer-item" :span="11" @click="clickFooter(card, item.emit, itemIndex)">
                   <span>
                     <a-icon :type="item.icon" class="footer-icon" />
                     <span>{{ item.label }}</span>
@@ -189,6 +179,7 @@ export default {
       default: false
     }
   },
+  inject: ['getConfigByName'],
   data () {
     return {
       // 配置
@@ -204,7 +195,10 @@ export default {
       // 分页大小选项
       pageSizeOptions: ['4', '6', '8', '10'],
       // 数据总数
-      total: 0
+      total: 0,
+      activeCardIndex: null, // 新增：记录当前激活的卡片索引
+      // 混入插槽组件的数据
+      mixinData: {},
     }
   },
   created () {
@@ -314,7 +308,28 @@ export default {
       return result
     },
     // 点击按钮
-    clickFooter (data, eventName) {
+    async clickFooter (data, eventName, index) {
+      if (eventName === 'cardclick') {
+        // 先触发 beforeSwitch 事件
+        if (this.data && Array.isArray(this.data)) {
+          for (const item of this.data) {
+            if (item.isClicked) {
+              // 等待 beforeSwitch 事件处理完成
+              await this.$emit('cardEmit', item, 'beforeSwitch')
+            }
+          }
+        }
+        // 清除所有卡片的点击状态
+        if (this.data && Array.isArray(this.data)) {
+          this.data.forEach(item => {
+            if (item.isClicked) {
+              this.$set(item, 'isClicked', false)
+            }
+          })
+        }
+        // 设置当前卡片的点击状态
+        this.$set(data, 'isClicked', true)
+      }
       this.$emit('cardEmit', data, eventName)
     },
     // 获取数据
@@ -470,6 +485,13 @@ export default {
         color: black;
       }
     }
+
+    &.card-clicked {
+      :deep(.ant-card-head) {
+        background-color: #e6f7ff;
+        transition: background-color 0.3s ease;
+      }
+    }
   }
 
   .custom-title {
@@ -477,6 +499,10 @@ export default {
     align-items: center;
     gap: 12px;
 
+    &:hover {
+      cursor: pointer;
+    }
+
     .title-id {
       flex-shrink: 0;
       width: 65px;

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

@@ -45,7 +45,8 @@ export default {
     prop: 'value',
     event: 'change',
   },
-  mounted () {},
+  mounted () {
+  },
   computed: {
     localValue: {
       get () {
@@ -59,7 +60,8 @@ export default {
               return this.value[0]
             }
           }
-        } catch (e) {}
+        } catch (e) {
+        }
         return this.value
       },
       set (val) {
@@ -158,6 +160,14 @@ export default {
         return false
       }
     },
+    otherattr () {
+      if (['yearRangePicker', 'monthRangePicker'].includes(this.attr.type)) {
+        return {
+          mode: this.showMode
+        }
+      }
+      return {}
+    }
   },
   methods: {
     moment,
@@ -249,10 +259,10 @@ export default {
     "
     :ranges="ranges"
     style="width: 100%"
-    :mode="showMode"
     :format="formatType"
     @panelChange="RangePanelChange"
     @change="RangePanelChange"
+    v-bind="otherattr"
   />
 </template>
 

package/src/base-client/components/common/XForm/XForm.vue

@@ -37,7 +37,7 @@
             v-show="advanced"
             v-for="(item, index) in realJsonData.slice(7)"
             :showLabel="!simpleMode"
-            :key="'advanced'+index"
+            :key="`advanced-${queryParamsName}-item-${index}`"
             :attr="item"
             :form="form"
             :service-name="serviceName"

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -77,7 +77,7 @@
   </x-form-col>
   <!-- 下拉框 -->
   <x-form-col
-    v-else-if="(attr.type === 'select' || (attr.type === 'rate' && mode==='查询')) && show"
+    v-else-if="attr.type === 'select' && show"
     :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
@@ -535,8 +535,14 @@
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model">
-      <a-rate
+      <x-rate
         v-model="form[attr.model]"
+        :mode="mode"
+        :disabled="disabled"
+        :query-type="attr.queryType"
+        :max-count="attr.maxCount"
+        :allow-half="attr.allowHalf"
+        :placeholder="attr.placeholder ? attr.placeholder : '请选择'+attr.name.replace(/\s*/g, '')"
         @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
       />
     </a-form-model-item>
@@ -644,6 +650,7 @@ import XClickChangeBtn from './itemComponent/XClickChangeBtn'
 import 'moment/locale/zh-cn'
 import XFormDatePicker from '@vue2-client/base-client/components/common/XDatePicker/index.vue'
 import XIntervalPicker from '@vue2-client/base-client/components/common/XIntervalPicker/XIntervalPicker.vue'
+import XRate from '@vue2-client/base-client/components/common/XRate/index.vue'
 
 export default {
   name: 'XFormItem',
@@ -662,7 +669,8 @@ export default {
     Upload,
     XStatusButton,
     XClickChangeBtn,
-    XIntervalPicker
+    XIntervalPicker,
+    XRate
   },
   data () {
     // 检索去抖
@@ -813,7 +821,7 @@ export default {
     }
     // xTreeSelect 自己调用 mounted
     if (this.attr.type !== 'treeSelect') {
-      this.$emit('mounted')
+      this.$emit('mounted', this.attr)
     }
   },
   computed: {
@@ -963,12 +971,14 @@ export default {
     // 更新人员下拉框数据
     async updateResOptions (type) {
       if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString()?.endsWith(`]联动${type}`)) {
-        const searchData = { source: `获取${type}`, userid: this.currUser.id }
         const startIndex = this.attr.keyName.indexOf('[') + 1
         const endIndex = this.attr.keyName.indexOf(']', startIndex)
         const fromModel = this.attr.keyName.substring(startIndex, endIndex).replace('.', '_')
-        const formModelData = this.form[fromModel]
+        const formModelData = Array.isArray(this.form[fromModel])
+          ? this.form[fromModel]
+          : [this.form[fromModel]]
         if (fromModel?.length && formModelData?.length) {
+          const searchData = { source: `获取${type}`, userid: this.currUser.id, filter: formModelData, filterType: fromModel.indexOf('org') > -1 ? 'org' : 'dep' }
           await searchToListOption(searchData, res => {
             this.getDataCallback(
               res.filter(h => {
@@ -1241,7 +1251,7 @@ export default {
     getPopupContainer (triggerNode) {
       return document.body
       // return triggerNode.parentNode
-    }
+    },
   }
 }
 </script>