tenghui-ui 2.3.0 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tenghui-ui",
3
- "version": "2.3.0",
3
+ "version": "2.3.2",
4
4
  "description": "vue 2x, tenghui-ui",
5
5
  "files": [
6
6
  "dist",
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <el-dialog
3
3
  append-to-body
4
- :custom-class="`drag-dialog drag-dialog--${dgFlag}`"
4
+ :custom-class="`drag-dialog drag-dialog--${dgFlagId}`"
5
5
  :top="top"
6
6
  :title="title"
7
7
  :visible="visible"
@@ -21,7 +21,6 @@
21
21
  </template>
22
22
  <script>
23
23
  import Draggabilly from 'draggabilly';
24
- const DragFlag = `dgflag${Math.ceil(Math.random() * 1000)}`
25
24
  export default {
26
25
  name: 'ComDialog',
27
26
  props: {
@@ -59,7 +58,7 @@ export default {
59
58
  data() {
60
59
  return {
61
60
  show: false,
62
- dgFlag: DragFlag
61
+ dgFlagId: Math.ceil(Math.random() * 1000)
63
62
  }
64
63
  },
65
64
  methods: {
@@ -78,7 +77,8 @@ export default {
78
77
  },
79
78
 
80
79
  handleBindDragEvent() {
81
- new Draggabilly( `.drag-dialog--${DragFlag}`, {
80
+
81
+ const DG = new Draggabilly( `.drag-dialog--${this.dgFlagId}`, {
82
82
  handle: '.el-dialog__header'
83
83
  });
84
84
  }
@@ -147,6 +147,27 @@
147
147
  </el-date-picker>
148
148
  </div>
149
149
  </template>
150
+ <template v-else-if="type === 'daterangesplit'">
151
+ <span v-if="inlineLabel" class="inline_label" :style="{ width: labelWidth }">{{ inlineLabel }}</span>
152
+ <div class="flex" style="align-items: baseline;">
153
+ <div :class="{ 'ui-item-prepend': !!$slots.prepend }">
154
+ <slot name="prepend"></slot>
155
+ </div>
156
+ <el-date-picker :class="{ inline_content: inlineLabel }" :ref="type"
157
+ v-model="modelForm[0]"
158
+ v-bind="{ ...setDefaultAttrs($attrs), type: 'date', defaultTime: defaultTime ? defaultTime[0] : '' }"
159
+ placeholder="请选择开始日期"
160
+ v-on="$listeners">
161
+ </el-date-picker>
162
+ <span style="color: #dcdfe6">-</span>
163
+ <el-date-picker :class="{ inline_content: inlineLabel }" :ref="type"
164
+ v-model="modelForm[1]"
165
+ v-bind="{ ...setDefaultAttrs($attrs), type: 'date', defaultTime: defaultTime ? defaultTime[1] : '' }"
166
+ placeholder="请选择结束日期"
167
+ v-on="$listeners">
168
+ </el-date-picker>
169
+ </div>
170
+ </template>
150
171
  <template v-else-if="type === 'datetimerangesplit'">
151
172
  <span v-if="inlineLabel" class="inline_label" :style="{ width: labelWidth }">{{ inlineLabel }}</span>
152
173
  <div class="flex" style="align-items: baseline;">