sadais-piui 1.2.7-beta13 → 1.2.7-beta131

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.
Files changed (71) hide show
  1. package/.prettierrc +8 -0
  2. package/components/pi-badge/index.vue +11 -1
  3. package/components/pi-bottom-bar/index.vue +1 -1
  4. package/components/pi-calendar/index.vue +207 -182
  5. package/components/pi-calendar-input/index.vue +61 -30
  6. package/components/pi-calendar-panel/components/calendar-days/index.vue +91 -52
  7. package/components/pi-calendar-panel/index.vue +28 -12
  8. package/components/pi-canvas/index.vue +8 -1
  9. package/components/pi-cascader/index.vue +601 -0
  10. package/components/pi-checkbox/index.vue +8 -4
  11. package/components/pi-checkbox-group/index.vue +12 -11
  12. package/components/pi-circle-progress/index.vue +108 -21
  13. package/components/pi-code-input/index.vue +11 -3
  14. package/components/pi-collapse/index.vue +124 -0
  15. package/components/pi-collapse-item/index.vue +360 -0
  16. package/components/pi-date-picker/index.vue +512 -391
  17. package/components/pi-date-picker-input/index.vue +61 -30
  18. package/components/pi-dropdown/components/dropdown-tab.vue +33 -23
  19. package/components/pi-dropdown/index.vue +34 -19
  20. package/components/pi-dropdown-item/index.vue +70 -58
  21. package/components/pi-form-item/index.vue +99 -21
  22. package/components/pi-grid/index.vue +1 -1
  23. package/components/pi-grid-item/index.vue +4 -4
  24. package/components/pi-img/index.vue +275 -267
  25. package/components/pi-img-cropper/index.vue +110 -110
  26. package/components/pi-input/index.vue +95 -34
  27. package/components/pi-list-item/index.vue +1 -1
  28. package/components/pi-mask/index.vue +3 -1
  29. package/components/pi-pagination/index.vue +13 -0
  30. package/components/pi-popup/index.vue +4 -1
  31. package/components/pi-popup-select/index.vue +8 -1
  32. package/components/pi-radio/index.vue +12 -11
  33. package/components/pi-radio-group/index.vue +25 -5
  34. package/components/pi-regions-select/index.vue +6 -1
  35. package/components/pi-regions-select-input/index.vue +69 -31
  36. package/components/pi-search/index.vue +37 -2
  37. package/components/pi-section/index.vue +1 -1
  38. package/components/pi-select/index.vue +237 -22
  39. package/components/pi-select-input/index.vue +106 -41
  40. package/components/pi-stepper/index.vue +135 -121
  41. package/components/pi-steps/index.vue +115 -36
  42. package/components/pi-swiper/index.vue +22 -7
  43. package/components/pi-switch/index.vue +5 -1
  44. package/components/pi-table/index.vue +351 -0
  45. package/components/pi-tabs/index.vue +46 -10
  46. package/components/pi-tag/index.vue +488 -0
  47. package/components/pi-upload-img/index.vue +541 -37
  48. package/components/pi-webview/index.vue +95 -82
  49. package/config/actionSheet.js +0 -1
  50. package/config/calendarInput.js +2 -1
  51. package/config/calendarPanel.js +2 -1
  52. package/config/cascader.js +22 -0
  53. package/config/circleProgress.js +17 -10
  54. package/config/codeInput.js +2 -1
  55. package/config/collapse.js +7 -0
  56. package/config/collapseItem.js +11 -0
  57. package/config/datePicker.js +29 -24
  58. package/config/datePickerInput.js +2 -1
  59. package/config/dropdown.js +3 -1
  60. package/config/input.js +5 -3
  61. package/config/regionsSelectInput.js +2 -1
  62. package/config/select.js +13 -1
  63. package/config/selectInput.js +2 -1
  64. package/config/steps.js +1 -1
  65. package/config/table.js +9 -0
  66. package/config/tag.js +21 -0
  67. package/config/uploadImg.js +30 -11
  68. package/package.json +5 -2
  69. package/scss/common.scss +11 -14
  70. package/scss/icon/icon.scss +2 -1
  71. package/scss/mixin.scss +5 -5
@@ -1,7 +1,7 @@
1
1
  <!--
2
2
  * @Author: zhouxianpan
3
3
  * @Date: 2021-09-06 10:07:33
4
- * @LastEditTime: 2021-11-23 16:45:30
4
+ * @LastEditTime: 2023-04-20 17:11:04
5
5
  * @LastEditors: zhangzhenfei
6
6
  * @Description:
7
7
  * @FilePath: \piui-awesome\src\piui\components\pi-circle-progress\index.vue
@@ -10,9 +10,10 @@
10
10
  <view
11
11
  class="circle-progress"
12
12
  :style="{
13
- width: widthPx + 'px',
14
- height: widthPx + 'px',
15
- backgroundColor: bgColor
13
+ width: parentWidthPx + 'px',
14
+ height: parentWidthPx + 'px',
15
+ backgroundColor: getType.bgColor,
16
+ borderRadius: '50%'
16
17
  }"
17
18
  >
18
19
  <canvas
@@ -84,7 +85,17 @@ export default {
84
85
  // 主题类型
85
86
  type: {
86
87
  type: String,
87
- default: circleProgress.type
88
+ default: circleProgress.type,
89
+ validator: function(value) {
90
+ return ['success', 'error', 'info', 'primary', 'warning'].includes(value)
91
+ }
92
+ },
93
+ // 主题列表
94
+ typeList: {
95
+ type: Object,
96
+ default() {
97
+ return circleProgress.typeList
98
+ }
88
99
  },
89
100
 
90
101
  // 字体大小
@@ -96,17 +107,28 @@ export default {
96
107
  text: {
97
108
  type: String,
98
109
  default: circleProgress.text
110
+ },
111
+ linearGradient: {
112
+ type: Object,
113
+ default() {
114
+ return circleProgress.linearGradient
115
+ }
99
116
  }
100
117
  },
101
118
  data() {
102
119
  return {
120
+ // #ifdef MP-WEIXIN
103
121
  elBgId: 'pCircleProgressBgId', // 微信小程序中不能使用this.$pi形式动态生成id值,否则会报错
104
122
  elId: 'pCircleProgressElId',
123
+ // #endif
124
+ // #ifndef MP-WEIXIN
105
125
  elBgId: this.$pi.guid(), // 支付宝等小程序 动态生产ID
106
126
  elId: this.$pi.guid(),
127
+ // #endif
107
128
  progressContext: null,
108
129
  // 开始的角度
109
130
  widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
131
+ parentWidthPx: uni.upx2px(this.width - this.borderWidth), // 转成px后容器的宽度
110
132
  borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
111
133
  startAngle: -Math.PI / 2, // canvas画圆的起始角度,默认为3点钟方向,定位到12点钟方向
112
134
  newPercent: 0, // 当动态修改进度值的时候,保存进度值的变化前后值,用于比较用
@@ -114,12 +136,29 @@ export default {
114
136
  }
115
137
  },
116
138
  computed: {
117
- // 有type主题时,优先起作用
118
- circleColor() {
119
- if (['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0)
120
- return this.$u.color[this.type]
121
- else return this.activeColor
139
+ /**
140
+ * 默认使用type配套样式success
141
+ * 如果有传入 进度条底部颜色、进度条颜色、背景颜色时就使用它们的
142
+ */
143
+ getType() {
144
+ const { type, inactiveColor, activeColor, bgColor } = this
145
+ // const typeData = this.$pi.lang.mergeDeep(this.typeList[type], {
146
+ // inactiveColor,
147
+ // activeColor,
148
+ // bgColor
149
+ // })
150
+ return {
151
+ inactiveColor: inactiveColor || this.typeList[type]['inactiveColor'],
152
+ activeColor: activeColor || this.typeList[type]['activeColor'],
153
+ bgColor: bgColor || this.typeList[type]['bgColor']
154
+ }
122
155
  }
156
+ // 有type主题时,优先起作用(弃用)
157
+ // circleColor() {
158
+ // if (['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0)
159
+ // return this.$u.color[this.type]
160
+ // else return this.activeColor
161
+ // }
123
162
  },
124
163
  watch: {
125
164
  // 深度监听进度
@@ -150,10 +189,11 @@ export default {
150
189
  },
151
190
  methods: {
152
191
  drawProgressBg() {
153
- console.log(this)
192
+ // console.log(this)
154
193
  let ctx = uni.createCanvasContext(this.elBgId, this)
155
194
  ctx.setLineWidth(this.borderWidthPx) // 设置圆环宽度
156
- ctx.setStrokeStyle(this.inactiveColor) // 线条颜色
195
+ // ctx.setStrokeStyle(this.inactiveColor) // 线条颜色
196
+ ctx.setStrokeStyle(this.getType.inactiveColor) // 线条颜色
157
197
  ctx.beginPath() // 开描绘路径
158
198
  // 设置一个原点(110,110),半径为100的圆的路径到当前路径
159
199
  let radius = this.widthPx / 2
@@ -170,25 +210,51 @@ export default {
170
210
  ctx = uni.createCanvasContext(this.elId, this)
171
211
  this.progressContext = ctx
172
212
  }
213
+ let radius = this.widthPx / 2
173
214
  // 表示进度的两端为圆形
174
215
  ctx.setLineCap('round')
175
216
  // 设置线条的宽度和颜色
176
217
  ctx.setLineWidth(this.borderWidthPx)
177
- ctx.setStrokeStyle(this.circleColor)
178
- // 将总过渡时间除以100,得出每修改百分之一进度所需的时间
179
- let time = Math.floor(this.duration / 100)
180
- // 结束角的计算依据为:将2π分为100份,乘以当前的进度值,得出终止点的弧度值,加起始角,为整个圆从默认的
181
- // 3点钟方向开始画图,转为更好理解的12点钟方向开始作图,这需要起始角和终止角同时加上this.startAngle值
182
- let endAngle = ((2 * Math.PI) / 100) * progress + this.startAngle
218
+ if (
219
+ this.linearGradient &&
220
+ this.linearGradient.show &&
221
+ this.linearGradient.colorStop.length >= 2
222
+ ) {
223
+ // this.imageData.slice(pos * 4, pos * 4 + 4);
224
+ let colorData = this.createColorData()
225
+ for (let i = 0; i < progress; i++) {
226
+ const index = Math.round((i * 255) / progress)
227
+ const color = colorData.slice(index * 4, index * 4 + 4)
228
+ ctx.beginPath()
229
+
230
+ ctx.setStrokeStyle(`rgba(${color[0]},${color[1]},${color[2]},${color[3] / 255})`)
231
+ ctx.globalAlpha = color[3] / 255
232
+ let endAngle = ((2 * Math.PI) / 100) * (i + 1) + this.startAngle
233
+ let startAngle = this.startAngle + ((2 * Math.PI) / 100) * i
234
+ ctx.arc(radius, radius, radius - this.borderWidthPx, startAngle, endAngle, false)
235
+ ctx.stroke()
236
+ }
237
+ } else {
238
+ // ctx.setStrokeStyle(this.circleColor)
239
+ ctx.setStrokeStyle(this.getType.activeColor)
240
+ // 结束角的计算依据为:将2π分为100份,乘以当前的进度值,得出终止点的弧度值,加起始角,为整个圆从默认的
241
+ // 3点钟方向开始画图,转为更好理解的12点钟方向开始作图,这需要起始角和终止角同时加上this.startAngle值
242
+ let endAngle = ((2 * Math.PI) / 100) * progress + this.startAngle
243
+ ctx.beginPath()
244
+ // 半径为整个canvas宽度的一半
245
+ ctx.arc(radius, radius, radius - this.borderWidthPx, this.startAngle, endAngle, false)
246
+ ctx.stroke()
247
+ }
183
248
  ctx.beginPath()
184
- // 半径为整个canvas宽度的一半
185
- let radius = this.widthPx / 2
186
- ctx.arc(radius, radius, radius - this.borderWidthPx, this.startAngle, endAngle, false)
187
249
  ctx.textAlign = 'center'
250
+ ctx.textBaseline = 'middle'
188
251
  ctx.font = this.fontSize + ' Arial'
189
252
  ctx.fillText(this.text, radius, radius)
190
253
  ctx.stroke()
191
254
  ctx.draw()
255
+
256
+ // 将总过渡时间除以100,得出每修改百分之一进度所需的时间
257
+ let time = Math.floor(this.duration / 100)
192
258
  // 如果变更后新值大于旧值,意味着增大了百分比
193
259
  if (this.newPercent > this.oldPercent) {
194
260
  // 每次递增百分之一
@@ -204,6 +270,27 @@ export default {
204
270
  // 定时器,每次操作间隔为time值,为了让进度条有动画效果
205
271
  this.drawCircleByProgress(progress)
206
272
  }, time)
273
+ },
274
+ createColorData() {
275
+ let canvas
276
+ let ctx
277
+ // #ifndef MP-WEIXIN
278
+ canvas = document.createElement('canvas')
279
+ canvas.width = 256
280
+ canvas.height = 1
281
+ ctx = canvas.getContext('2d')
282
+ // #endif
283
+ // #ifdef MP-WEIXIN
284
+ canvas = uni.createOffscreenCanvas({ type: '2d', width: 256, height: 1 })
285
+ ctx = canvas.getContext('2d')
286
+ // #endif
287
+ const linearGradient = ctx.createLinearGradient(0, 0, 256, 1)
288
+ this.linearGradient.colorStop.forEach(color => {
289
+ linearGradient.addColorStop(color.percent, color.value)
290
+ })
291
+ ctx.fillStyle = linearGradient
292
+ ctx.fillRect(0, 0, 256, 1)
293
+ return ctx.getImageData(0, 0, 256, 1).data
207
294
  }
208
295
  }
209
296
  }
@@ -5,7 +5,7 @@
5
5
  type="number"
6
6
  :value="val"
7
7
  :focus="focus"
8
- :disabled="disabled"
8
+ :disabled="getDisabled"
9
9
  :maxlength="getLength"
10
10
  @focus="focus = true"
11
11
  @blur="focus = false"
@@ -137,12 +137,15 @@ export default {
137
137
  default() {
138
138
  return codeInput.codeFormat
139
139
  }
140
+ },
141
+ disabled: {
142
+ type: Boolean,
143
+ default: codeInput.disabled
140
144
  }
141
145
  },
142
146
  data() {
143
147
  return {
144
148
  focus: false,
145
- disabled: false,
146
149
  data() {
147
150
  return {
148
151
  val: this.value
@@ -165,7 +168,12 @@ export default {
165
168
  },
166
169
  getAlign() {
167
170
  return ALIGN_MAP[this.align]
168
- }
171
+ },
172
+ getDisabled() {
173
+ const parentFormItem = this.$pi.parent(this, 'PiFormItem')
174
+ const disabled = this.disabled || (parentFormItem && parentFormItem.getDisabled)
175
+ return disabled
176
+ },
169
177
  },
170
178
  mounted() {
171
179
  if (this.autoFocus) {
@@ -0,0 +1,124 @@
1
+ <template>
2
+ <view class="pi-collapse" :class="[customClass]" :style="[customStyle]">
3
+ <pi-divider v-if="border" />
4
+ <slot />
5
+ </view>
6
+ </template>
7
+
8
+ <script>
9
+ import ValueSync from '../../mixin/value-sync'
10
+ import { getConfig } from '../../config'
11
+ const { collapse } = getConfig()
12
+ /**
13
+ * collapse 折叠面板
14
+ * @description 通过折叠面板收纳内容区域
15
+ * @tutorial http://piui.sadais.com/docs/components/collapse.html
16
+ * @event {Function} change 当前激活面板展开时触发(如果是手风琴模式,参数activeNames类型为String,否则为Array)
17
+ * @example <pi-collapse />
18
+ */
19
+ export default {
20
+ name: 'PiCollapse',
21
+ // 混入v-model
22
+ mixins: [ValueSync],
23
+ props: {
24
+ // 当前展开面板的name,非手风琴模式:[<string | number>],手风琴模式:string | number
25
+ value: {
26
+ type: [String, Number, Array],
27
+ default: collapse.value
28
+ },
29
+ // 是否手风琴模式
30
+ accordion: {
31
+ type: Boolean,
32
+ // false
33
+ default: collapse.accordion
34
+ },
35
+ // 是否显示外边框
36
+ border: {
37
+ type: Boolean,
38
+ // true
39
+ default: collapse.border
40
+ },
41
+ // 自定义折叠面板的样式类名
42
+ customClass: {
43
+ type: String,
44
+ default: collapse.customClass
45
+ },
46
+ // 自定义折叠面板的样式
47
+ customStyle: {
48
+ type: Object,
49
+ default: () => {
50
+ return collapse.customStyle
51
+ }
52
+ }
53
+ },
54
+ computed: {
55
+ needInit() {
56
+ // 通过computed,同时监听accordion和value值的变化
57
+ // 再通过watch去执行init()方法,进行再一次的初始化
58
+ return [this.accordion, this.value]
59
+ }
60
+ },
61
+ watch: {
62
+ needInit: {
63
+ deep: true,
64
+ immediate: false,
65
+ handler(value) {
66
+ this.init()
67
+ }
68
+ },
69
+ // 当父组件需要子组件需要共享的参数发生了变化,手动通知子组件
70
+ parentData() {
71
+ if (this.children.length) {
72
+ this.children.map(child => {
73
+ // 判断子组件(pi-collapse-item)如果有updateParentData方法的话,就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
74
+ typeof child.updateParentData === 'function' && child.updateParentData()
75
+ })
76
+ }
77
+ }
78
+ },
79
+ created() {
80
+ this.children = []
81
+ },
82
+ methods: {
83
+ // 重新初始化一次内部的所有子元素
84
+ init() {
85
+ console.log('折叠面板初始化')
86
+ this.children &&
87
+ this.children.map(child => {
88
+ child.init()
89
+ })
90
+ },
91
+ /**
92
+ * collapse-item被点击时触发,由collapse统一处理各子组件的状态
93
+ * @param {Object} target 被操作的面板的实例
94
+ */
95
+ onChange(target) {
96
+ let changeArr = []
97
+ this.children.map((child, index) => {
98
+ // 如果是手风琴模式,将其他的折叠面板收起来
99
+ if (this.accordion) {
100
+ child.expanded = child === target ? !target.expanded : false
101
+ child.setContentAnimate()
102
+ } else {
103
+ if (child === target) {
104
+ child.expanded = !child.expanded
105
+ child.setContentAnimate()
106
+ }
107
+ }
108
+ // 拼接change事件中,数组元素的状态
109
+ changeArr.push({
110
+ // 如果没有定义name属性,则默认返回组件的index索引
111
+ name: child.name || index,
112
+ status: child.expanded ? 'open' : 'close'
113
+ })
114
+ })
115
+ // 触发change事件
116
+ this.val = changeArr
117
+ this.handleEmitChange()
118
+ this.$emit(target.expanded ? 'open' : 'close', target.name)
119
+ }
120
+ }
121
+ }
122
+ </script>
123
+
124
+ <style lang="scss" scoped></style>