vue2-client 1.16.86 → 1.16.88

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

@@ -459,7 +459,6 @@ export default {
       letter-spacing: 0px;
       font-feature-settings: "kern" on;
       color: #313131;
-      padding: 11px 0 2px 0;
       margin: 0 !important;
       width: auto;
       text-align: center;

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

@@ -1,181 +1,194 @@
-<template>
-  <div class="x-checkbox-container" :class="wrapperClassObject()">
-    <a-checkbox-group v-model="innerValue" @change="onChange" class="x-checkbox-group">
-      <div v-for="item in data" :key="item.value" class="x-checkbox-item-container">
-        <a-checkbox :value="item.value" class="x-checkbox-item">
-          {{ item.label }}
-        </a-checkbox>
-      </div>
-    </a-checkbox-group>
-  </div>
-</template>
-
-<script>
-import { getConfigByName } from '@vue2-client/services/api/common'
-import { Checkbox } from 'ant-design-vue'
-
-export default {
-  name: 'XCheckbox',
-  components: {
-    ACheckboxGroup: Checkbox.Group,
-    ACheckbox: Checkbox
-  },
-  props: {
-    queryParamsName: {
-      type: Object,
-      default: null
-    },
-    value: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data () {
-    return {
-      data: [],
-      innerValue: [],
-      config: null
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  watch: {
-    value: {
-      handler (val) {
-        this.innerValue = val
-      },
-      deep: true
-    }
-  },
-  emits: ['change', 'init'],
-  methods: {
-    async getData (data) {
-      getConfigByName(data, 'af-his', res => {
-        // 1. 加载选项
-        if (res.checkbox && Array.isArray(res.checkbox)) {
-          this.data = res.checkbox
-          // 2. 初始化默认值（优先级： 配置defaultValue > 空数组）
-          if (res.defaultValue !== undefined && Array.isArray(res.defaultValue)) {
-            this.innerValue = res.defaultValue
-          }
-          // 3. 触发初始化事件
-          this.$emit('init', {
-            config: res,
-            options: this.data,
-            value: this.innerValue
-          })
-        } else {
-          this.$message.error('配置错误，checkbox字段不是数组')
-        }
-      })
-    },
-    wrapperClassObject () {
-      const attrs = this.$attrs || {}
-      const classes = {}
-      const booleanStyleKeys = [
-        'compact', 'out-checkbox'
-      ]
-      booleanStyleKeys.forEach(key => {
-        const val = attrs[key]
-        const truthy = val === true || val === '' || val === 'true'
-        if (truthy) classes[`x-checkbox-${key}`] = true
-      })
-      return classes
-    },
-    onChange (checkedValues) {
-      this.innerValue = checkedValues
-      this.$emit('change', checkedValues)
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.x-checkbox-container {
-  display: flex;
-  flex-direction: column;
-}
-
-.x-checkbox-group {
-  display: flex;
-  justify-content: space-around;
-}
-
-.x-checkbox-item-container {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  text-align: center;
-  padding: 0 8px;
-  box-sizing: border-box;
-}
-
-.x-checkbox-item {
-  margin-bottom: 8px;
-}
-.x-checkbox-compact {
-  &.x-checkbox-container,
-  .x-checkbox-container {
-    :deep(.x-checkbox-item-container){
-      padding: 0px !important;
-      flex: auto !important;
-    }
-    :deep(.x-checkbox-item){
-      margin: 0px;
-    }
-    :deep(.x-checkbox-item) > span:last-child {
-      padding-right: 2px;
-      padding-left: 2px;
-    }
-  }
-}
-
-/* out-checkbox：外排版紧凑风格，与表单风格配置保持一致的布尔开关用法 */
-.x-checkbox-container.x-checkbox-out-checkbox {
-  margin-top: 9px;
-
-  :deep(.x-checkbox-group) {
-    justify-content: flex-start;
-    flex-wrap: wrap;
-    gap: 0 46px;
-  }
-
-  :deep(.x-checkbox-item-container) {
-    flex: 0 0 auto;
-    align-items: flex-start;
-    text-align: left;
-    padding: 0;
-  }
-
-  :deep(.x-checkbox-item) {
-    margin: 0;
-    display: flex;
-    align-items: center;
-
-    .ant-checkbox {
-      width: 20px;
-      height: 20px;
-      margin-right: 10px;
-
-      .ant-checkbox-inner {
-        width: 20px;
-        height: 20px;
-      }
-    }
-
-    /* 文字标签样式 */
-    span {
-      height: 23px;
-      opacity: 1;
-      font-family: 'Source Han Sans', sans-serif;
-      font-size: 16px;
-      font-weight: normal;
-      line-height: normal;
-      letter-spacing: 0em;
-      color: #313131;
-    }
-  }
-}
-</style>
+<template>
+  <div class="x-checkbox-container" :class="wrapperClassObject()">
+    <a-checkbox-group v-model="innerValue" @change="onChange" class="x-checkbox-group">
+      <div v-for="item in data" :key="item.value" class="x-checkbox-item-container">
+        <a-checkbox :value="item.value" class="x-checkbox-item">
+          {{ item.label }}
+        </a-checkbox>
+      </div>
+    </a-checkbox-group>
+  </div>
+</template>
+
+<script>
+import { getConfigByName } from '@vue2-client/services/api/common'
+import { Checkbox } from 'ant-design-vue'
+
+export default {
+  name: 'XCheckbox',
+  components: {
+    ACheckboxGroup: Checkbox.Group,
+    ACheckbox: Checkbox
+  },
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    },
+    value: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data () {
+    return {
+      data: [],
+      innerValue: [],
+      config: null
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  watch: {
+    value: {
+      handler (val) {
+        this.innerValue = val
+      },
+      deep: true
+    }
+  },
+  emits: ['change', 'init'],
+  methods: {
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+        // 1. 加载选项
+        if (res.checkbox && Array.isArray(res.checkbox)) {
+          this.data = res.checkbox
+          // 2. 初始化默认值（优先级： 配置defaultValue > 空数组）
+          if (res.defaultValue !== undefined && Array.isArray(res.defaultValue)) {
+            this.innerValue = res.defaultValue
+          }
+          // 3. 触发初始化事件
+          this.$emit('init', {
+            config: res,
+            options: this.data,
+            value: this.innerValue
+          })
+        } else {
+          this.$message.error('配置错误，checkbox字段不是数组')
+        }
+      })
+    },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'compact', 'out-checkbox', 'justify-content-start'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-checkbox-${key}`] = true
+      })
+      return classes
+    },
+    onChange (checkedValues) {
+      this.innerValue = checkedValues
+      this.$emit('change', checkedValues)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.x-checkbox-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.x-checkbox-group {
+  display: flex;
+  justify-content: space-around;
+}
+
+.x-checkbox-item-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  padding: 0 8px;
+  box-sizing: border-box;
+}
+
+.x-checkbox-item {
+  margin-bottom: 8px;
+}
+.x-checkbox-compact {
+  &.x-checkbox-container,
+  .x-checkbox-container {
+    :deep(.x-checkbox-item-container){
+      padding: 0px !important;
+      flex: auto !important;
+    }
+    :deep(.x-checkbox-item){
+      margin: 0px;
+    }
+    :deep(.x-checkbox-item) > span:last-child {
+      padding-right: 2px;
+      padding-left: 2px;
+    }
+  }
+}
+
+/* out-checkbox：外排版紧凑风格，与表单风格配置保持一致的布尔开关用法 */
+.x-checkbox-container.x-checkbox-out-checkbox {
+  margin-top: 9px;
+
+  :deep(.x-checkbox-group) {
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    gap: 0 46px;
+  }
+
+  :deep(.x-checkbox-item-container) {
+    flex: 0 0 auto;
+    align-items: flex-start;
+    text-align: left;
+    padding: 0;
+  }
+
+  :deep(.x-checkbox-item) {
+    margin: 0;
+    display: flex;
+    align-items: center;
+
+    .ant-checkbox {
+      width: 20px;
+      height: 20px;
+      margin-right: 10px;
+
+      .ant-checkbox-inner {
+        width: 20px;
+        height: 20px;
+      }
+    }
+
+    /* 文字标签样式 */
+    span {
+      height: 23px;
+      opacity: 1;
+      font-family: 'Source Han Sans', sans-serif;
+      font-size: 16px;
+      font-weight: normal;
+      line-height: normal;
+      letter-spacing: 0em;
+      color: #313131;
+    }
+  }
+}
+// 从左到右右排列
+.x-checkbox-justify-content-start{
+  &.x-checkbox-container,
+  .x-checkbox-container {
+    :deep(.x-checkbox-group){
+      display: flex;
+      justify-content: start;
+    }
+    :deep(.x-checkbox-item-container){
+      flex-direction: row
+    }
+  }
+}
+</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="import-button">
+  <div class="import-button" :class="wrapperClassObject">
     <a-button
       type="type"
       ref="importExcelButton"
@@ -37,6 +37,23 @@ export default {
   components: {
     XFrontImportExcel
   },
+  computed: {
+    // 参考 HForm 的 wrapperClassObject 规则，支持通过组件属性动态控制样式
+    wrapperClassObject () {
+      const a = this.$attrs || {}
+      const classes = {}
+      // 多个布尔型样式开关（存在且为真则生效）
+      const booleanStyleKeys = [
+        'fill-container'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = a[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-import-button-${key}`] = true
+      })
+      return classes
+    }
+  },
   data () {
     return {
       // 图标样式
@@ -99,5 +116,32 @@ export default {
   },
 }
 </script>
-<style scoped>
+<style scoped lang="less">
+.import-button {
+  // 基础样式
+  :deep(.ant-btn) {
+      border-radius: 6px;
+      background-color: #FFFFFF;
+      //border: 1px solid #9499A0;
+      //color: #313131;
+      font-weight: normal;
+      letter-spacing: 0em;
+      width: 110px;
+      font-size: 16px;
+      font-family: "Source Han Sans";
+      line-height: normal;
+      margin-right: 25px;
+      height: 32px;
+      border: 1px solid #CDCDCD;
+      color: #5D5C5C;
+      text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
+      box-shadow: 0 2px 0 rgba(0, 0, 0, 0.045);
+  }
+}
+.x-import-button-fill-container {
+  :deep(.ant-btn) {
+    width: 100%;
+    margin-right: 0px
+  }
+}
 </style>