vue2-client 1.10.33 → 1.10.35

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

@@ -1,157 +1,157 @@
-<template>
-  <a-col :style="computedStyles">
-    <div
-      class="x-form-col-wrapper"
-      :style="computedWrapperStyles"
-    >
-      <slot></slot>
-    </div>
-  </a-col>
-</template>
-
-<script>
-const BREAKPOINTS = {
-  xs: 576,
-  sm: 768,
-  md: 992,
-  lg: 1200,
-  xl: 1600,
-}
-
-const defaultFlex = {
-  xs: 24,
-  sm: 24,
-  md: 8,
-  lg: 8,
-  xl: 6,
-  xxl: 6,
-}
-
-function debounce (fn, delay) {
-  let timeout = null
-  return function (...args) {
-    if (timeout) clearTimeout(timeout)
-    timeout = setTimeout(() => {
-      fn.apply(this, args)
-    }, delay)
-  }
-}
-
-export default {
-  name: 'XFormCol',
-  props: {
-    flex: {
-      type: Object,
-      default: () => ({
-        xs: 24,
-        sm: 24,
-        md: 8,
-        lg: 6,
-        xl: 6,
-        xxl: 6,
-      }),
-    },
-    occupyCol: {
-      type: Number,
-      default: 1,
-    },
-    layout: {
-      type: String,
-      default: 'horizontal',
-    },
-    labelCol: {
-      type: Object,
-      default: () => { return { span: 8 } }
-    }
-  },
-  computed: {
-    computedFlex () {
-      const parentWidth = this.parentWidth
-      return this.getFlex(parentWidth, this.flex)
-    },
-    computedWrapperStyles () {
-      const realFlex = this.flex.fullWidth ? this.getFlex(this.parentWidth) : this.computedFlex
-      // 1. 计算列数
-      const columnsCount = 24 / realFlex
-      // 2. 计算基准列宽
-      const baseColumnWidth = (this.parentWidth / columnsCount) - ((columnsCount - 1) * 16)
-      // 3. 计算label宽度
-      const labelWidth = Math.max(baseColumnWidth / (24 / this.labelCol.span), 80)
-      // 计算左右偏移量
-      const offset = this.labelCol.offset ? (this.labelCol.offset / 24) * 100 : 0
-      if (this.layout === 'vertical') {
-        return {
-          '--form-label-width': '',
-          '--form-offset': '',
-        }
-      }
-      return {
-        '--form-label-width': `${labelWidth}px`,
-        '--form-offset': `${offset}%`,
-      }
-    },
-    computedStyles () {
-      const realFlex = Math.min(this.computedFlex * this.occupyCol, 24)
-      const flexValue = (realFlex / 24) * 100
-
-      return {
-        flex: `0 0 ${flexValue}%`,
-        maxWidth: `${flexValue}%`,
-      }
-    },
-  },
-  data () {
-    return {
-      parentWidth: 0,
-    }
-  },
-  methods: {
-    getFlex (parentWidth, flex = defaultFlex) {
-      if (parentWidth === 0) {
-        return flex.md
-      }
-      if (parentWidth < BREAKPOINTS.xs) return flex.xs
-      if (parentWidth < BREAKPOINTS.sm) return flex.sm
-      if (parentWidth < BREAKPOINTS.md) return flex.md
-      if (parentWidth < BREAKPOINTS.lg) return flex.lg
-      if (parentWidth < BREAKPOINTS.xl) return flex.xl
-      return flex.xxl
-    },
-  },
-  mounted () {
-    // 根据父容器宽度响应式
-    this.$nextTick(() => {
-      const container = this.$el.parentNode
-      this.parentWidth = container.offsetWidth
-      const updateWidth = debounce((width) => {
-        this.parentWidth = width
-      }, 100)
-
-      this.resizeObserver = new ResizeObserver((entries) => {
-        for (const entry of entries) {
-          updateWidth(entry.contentRect.width)
-        }
-      })
-      this.resizeObserver.observe(container)
-    })
-  },
-  beforeUnmount () {
-    if (this.resizeObserver) {
-      this.resizeObserver.disconnect()
-    }
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.x-form-col-wrapper {
-  :deep(.ant-form-item) {
-    .ant-form-item-label {
-      max-width: var(--form-label-width);
-    }
-    .ant-form-item-control-wrapper {
-      width: calc(100% - var(--form-label-width) - var(--form-offset) - var(--form-offset));
-    }
-  }
-}
-</style>
+<template>
+  <a-col :style="computedStyles">
+    <div
+      class="x-form-col-wrapper"
+      :style="computedWrapperStyles"
+    >
+      <slot></slot>
+    </div>
+  </a-col>
+</template>
+
+<script>
+const BREAKPOINTS = {
+  xs: 576,
+  sm: 768,
+  md: 992,
+  lg: 1200,
+  xl: 1600,
+}
+
+const defaultFlex = {
+  xs: 24,
+  sm: 24,
+  md: 8,
+  lg: 8,
+  xl: 6,
+  xxl: 6,
+}
+
+function debounce (fn, delay) {
+  let timeout = null
+  return function (...args) {
+    if (timeout) clearTimeout(timeout)
+    timeout = setTimeout(() => {
+      fn.apply(this, args)
+    }, delay)
+  }
+}
+
+export default {
+  name: 'XFormCol',
+  props: {
+    flex: {
+      type: Object,
+      default: () => ({
+        xs: 24,
+        sm: 24,
+        md: 8,
+        lg: 6,
+        xl: 6,
+        xxl: 6,
+      }),
+    },
+    occupyCol: {
+      type: Number,
+      default: 1,
+    },
+    layout: {
+      type: String,
+      default: 'horizontal',
+    },
+    labelCol: {
+      type: Object,
+      default: () => { return { span: 8 } }
+    }
+  },
+  computed: {
+    computedFlex () {
+      const parentWidth = this.parentWidth
+      return this.getFlex(parentWidth, this.flex)
+    },
+    computedWrapperStyles () {
+      const realFlex = this.flex.fullWidth ? this.getFlex(this.parentWidth) : this.computedFlex
+      // 1. 计算列数
+      const columnsCount = 24 / realFlex
+      // 2. 计算基准列宽
+      const baseColumnWidth = (this.parentWidth / columnsCount) - ((columnsCount - 1) * 16)
+      // 3. 计算label宽度
+      const labelWidth = Math.max(baseColumnWidth / (24 / this.labelCol.span), 80)
+      // 计算左右偏移量
+      const offset = this.labelCol.offset ? (this.labelCol.offset / 24) * 100 : 0
+      if (this.layout === 'vertical') {
+        return {
+          '--form-label-width': '',
+          '--form-offset': '',
+        }
+      }
+      return {
+        '--form-label-width': `${labelWidth}px`,
+        '--form-offset': `${offset}%`,
+      }
+    },
+    computedStyles () {
+      const realFlex = Math.min(this.computedFlex * this.occupyCol, 24)
+      const flexValue = (realFlex / 24) * 100
+
+      return {
+        flex: `0 0 ${flexValue}%`,
+        maxWidth: `${flexValue}%`,
+      }
+    },
+  },
+  data () {
+    return {
+      parentWidth: 0,
+    }
+  },
+  methods: {
+    getFlex (parentWidth, flex = defaultFlex) {
+      if (parentWidth === 0) {
+        return flex.md
+      }
+      if (parentWidth < BREAKPOINTS.xs) return flex.xs
+      if (parentWidth < BREAKPOINTS.sm) return flex.sm
+      if (parentWidth < BREAKPOINTS.md) return flex.md
+      if (parentWidth < BREAKPOINTS.lg) return flex.lg
+      if (parentWidth < BREAKPOINTS.xl) return flex.xl
+      return flex.xxl
+    },
+  },
+  mounted () {
+    // 根据父容器宽度响应式
+    this.$nextTick(() => {
+      const container = this.$el.parentNode
+      this.parentWidth = container.offsetWidth
+      const updateWidth = debounce((width) => {
+        this.parentWidth = width
+      }, 100)
+
+      this.resizeObserver = new ResizeObserver((entries) => {
+        for (const entry of entries) {
+          updateWidth(entry.contentRect.width)
+        }
+      })
+      this.resizeObserver.observe(container)
+    })
+  },
+  beforeUnmount () {
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.x-form-col-wrapper {
+  :deep(.ant-form-item) {
+    .ant-form-item-label {
+      max-width: var(--form-label-width);
+    }
+    .ant-form-item-control-wrapper {
+      width: calc(100% - var(--form-label-width) - var(--form-offset) - var(--form-offset));
+    }
+  }
+}
+</style>

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

@@ -159,6 +159,18 @@ export default {
         return null
       },
     },
+    setGlobalData: {
+      default: () => () => {
+        console.warn('setGlobalData is not provided.')
+        return null
+      },
+    },
+    getGlobalData: {
+      default: () => () => {
+        console.warn('getGlobalData is not provided.')
+        return null
+      },
+    },
     getSelectedData: {
       default: () => () => {
         console.warn('getSelectedData is not provided.')

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

@@ -1,121 +1,121 @@
-<template>
-  <div>
-    <!-- 新增/修改模式 -->
-    <a-input
-      v-if="mode === '新增/修改'"
-      v-model="singleValue"
-      :read-only="readOnly"
-      :disabled="disabled"
-      style="width:100%"
-      :placeholder="placeholder"
-      @blur="handleBlur"
-      @change="handleSingleChange"/>
-    <!-- 查询模式 -->
-    <a-input-group v-else compact>
-      <a-input
-        v-model="localValue[0]"
-        class="intervalPicker-begin"
-        :placeholder="startPlaceholder"
-        @change="handleChange"/>
-      <a-input
-        class="intervalPicker-center"
-        style="backgroundColor: #fff"
-        placeholder="~"
-        disabled
-      />
-      <a-input
-        v-model="localValue[1]"
-        class="intervalPicker-end"
-        :placeholder="endPlaceholder"
-        @change="handleChange"/>
-    </a-input-group>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'XIntervalPicker',
-  props: {
-    value: {
-      type: [Array, String, Number],
-      default: () => undefined
-    },
-    mode: {
-      type: String,
-      default: '查询'
-    },
-    readOnly: {
-      type: Boolean,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    placeholder: {
-      type: String,
-      default: '请输入'
-    },
-    startPlaceholder: {
-      type: String,
-      default: '起始值'
-    },
-    endPlaceholder: {
-      type: String,
-      default: '结束值'
-    }
-  },
-  data () {
-    return {
-      localValue: ['', ''],
-      singleValue: ''
-    }
-  },
-  watch: {
-    value: {
-      handler (newVal) {
-        if (this.mode === '新增/修改') {
-          this.singleValue = newVal || ''
-        } else {
-          this.localValue = Array.isArray(newVal) ? [...newVal] : ['', '']
-        }
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    handleChange () {
-      // 如果两个输入框都为空或undefined，则发出undefined
-      if (!this.localValue[0] && !this.localValue[1]) {
-        this.$emit('input', undefined)
-        return
-      }
-      // 否则发出当前数组值
-      this.$emit('input', this.localValue)
-    },
-    handleSingleChange () {
-      this.$emit('input', this.singleValue || undefined)
-    },
-    handleBlur (e) {
-      this.$emit('blur', e)
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.intervalPicker-begin {
-  width: calc(50% - 14px);
-}
-
-.intervalPicker-center {
-  width: 30px;
-  border-left: 0;
-  pointer-events: none;
-}
-
-.intervalPicker-end {
-  width: calc(50% - 14px);
-  border-left: 0;
-}
-</style>
+<template>
+  <div>
+    <!-- 新增/修改模式 -->
+    <a-input
+      v-if="mode === '新增/修改'"
+      v-model="singleValue"
+      :read-only="readOnly"
+      :disabled="disabled"
+      style="width:100%"
+      :placeholder="placeholder"
+      @blur="handleBlur"
+      @change="handleSingleChange"/>
+    <!-- 查询模式 -->
+    <a-input-group v-else compact>
+      <a-input
+        v-model="localValue[0]"
+        class="intervalPicker-begin"
+        :placeholder="startPlaceholder"
+        @change="handleChange"/>
+      <a-input
+        class="intervalPicker-center"
+        style="backgroundColor: #fff"
+        placeholder="~"
+        disabled
+      />
+      <a-input
+        v-model="localValue[1]"
+        class="intervalPicker-end"
+        :placeholder="endPlaceholder"
+        @change="handleChange"/>
+    </a-input-group>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'XIntervalPicker',
+  props: {
+    value: {
+      type: [Array, String, Number],
+      default: () => undefined
+    },
+    mode: {
+      type: String,
+      default: '查询'
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    startPlaceholder: {
+      type: String,
+      default: '起始值'
+    },
+    endPlaceholder: {
+      type: String,
+      default: '结束值'
+    }
+  },
+  data () {
+    return {
+      localValue: ['', ''],
+      singleValue: ''
+    }
+  },
+  watch: {
+    value: {
+      handler (newVal) {
+        if (this.mode === '新增/修改') {
+          this.singleValue = newVal || ''
+        } else {
+          this.localValue = Array.isArray(newVal) ? [...newVal] : ['', '']
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    handleChange () {
+      // 如果两个输入框都为空或undefined，则发出undefined
+      if (!this.localValue[0] && !this.localValue[1]) {
+        this.$emit('input', undefined)
+        return
+      }
+      // 否则发出当前数组值
+      this.$emit('input', this.localValue)
+    },
+    handleSingleChange () {
+      this.$emit('input', this.singleValue || undefined)
+    },
+    handleBlur (e) {
+      this.$emit('blur', e)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.intervalPicker-begin {
+  width: calc(50% - 14px);
+}
+
+.intervalPicker-center {
+  width: 30px;
+  border-left: 0;
+  pointer-events: none;
+}
+
+.intervalPicker-end {
+  width: calc(50% - 14px);
+  border-left: 0;
+}
+</style>

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

@@ -81,7 +81,7 @@ export default {
       currUser: this.currUser
     }
   },
-  inject: ['getParentComponentByName'],
+  inject: ['getParentComponentByName', 'setGlobalData', 'getGlobalData'],
   computed: {
     businessTitle () {
       return this.businessType + this.title