meixioacomponent 0.3.41 → 0.3.45

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 (27) hide show
  1. package/lib/meixioacomponent.common.js +798 -750
  2. package/lib/meixioacomponent.umd.js +798 -750
  3. package/lib/meixioacomponent.umd.min.js +28 -28
  4. package/lib/style/element/index.css +7 -22
  5. package/lib/style/index.less +5 -1
  6. package/package.json +1 -1
  7. package/packages/components/base/baseArea/baseArea.vue +109 -108
  8. package/packages/components/base/baseIcon/index.vue +49 -45
  9. package/packages/components/base/baseLineInfoGroup/baseLineInfoGroup.vue +17 -14
  10. package/packages/components/base/baseLineInfoItem/baseLineInfoItem.vue +54 -31
  11. package/packages/components/base/basePopoverButton/index.vue +15 -19
  12. package/packages/components/base/baseUpload/baseUpload.vue +15 -12
  13. package/packages/components/base/baseUpload/baseUploadItem.vue +73 -70
  14. package/packages/components/base/baseUpload/mixins.js +10 -3
  15. package/packages/components/proForm/proForm/pro_form_item.vue +5 -1
  16. package/packages/components/proPageTable/oa_pro_colum_config.vue +81 -92
  17. package/packages/components/proPageTable/oa_pro_handle_table_border.vue +45 -38
  18. package/packages/components/proPageTable/oa_pro_table-header.vue +23 -21
  19. package/packages/components/proPageTable/oa_pro_table.vue +120 -98
  20. package/packages/components/style/element/index.css +7 -22
  21. package/packages/components/style/index.less +5 -1
  22. package/src/App.vue +34 -13
  23. package/src/component/test.vue +46 -190
  24. package/src/config/CompanyInfoConfig.js +26 -0
  25. package/src/config/linkViewClass.js +71 -0
  26. package/src/main.js +1 -1
  27. package/src/test.js +3 -3
@@ -13,6 +13,10 @@ body {
13
13
  margin: 0px;
14
14
  --footer-height: 40px;
15
15
  --header-height: 63px;
16
+
17
+ .popper__arrow {
18
+ display: none !important;
19
+ }
16
20
  }
17
21
 
18
22
  html {
@@ -109,4 +113,4 @@ h6 {
109
113
 
110
114
  #nprogress .bar {
111
115
  background: var(--color-primary) !important;
112
- }
116
+ }
package/src/App.vue CHANGED
@@ -1,36 +1,57 @@
1
1
  <template>
2
2
  <div id="app">
3
- <div style="height: 100vh">
4
-
3
+ <div style="height: 100vh;">
4
+ <test></test>
5
+ <!-- <base-upload v-model="test"></base-upload> -->
5
6
  </div>
6
7
  </div>
7
8
  </template>
8
9
 
9
10
  <script>
10
- import test from "./component/test.vue";
11
+ import test from './component/test.vue'
11
12
 
12
- import BaseArea from "../packages/components/base/baseArea/baseArea.vue";
13
- import BaseTimeLine from "../packages/components/base/baseTimeLine/baseTimeLine.vue";
13
+ import BaseArea from '../packages/components/base/baseArea/baseArea.vue'
14
+ import BaseTimeLine from '../packages/components/base/baseTimeLine/baseTimeLine.vue'
15
+ import BaseUpload from '../packages/components/base/baseUpload/baseUpload.vue'
14
16
  export default {
15
- components: { test, BaseArea, BaseTimeLine },
17
+ components: { test, BaseArea, BaseTimeLine, BaseUpload },
16
18
  data() {
17
19
  return {
18
20
  test: [],
19
21
  items: [
20
- { type: "", label: "标签一" },
21
- { type: "success", label: "标签二" },
22
- { type: "info", label: "标签三" },
23
- { type: "danger", label: "标签四" },
24
- { type: "warning", label: "标签五" },
22
+ { type: '', label: '标签一' },
23
+ { type: 'success', label: '标签二' },
24
+ { type: 'info', label: '标签三' },
25
+ { type: 'danger', label: '标签四' },
26
+ { type: 'warning', label: '标签五' },
25
27
  ],
26
28
  value: [],
27
29
  value2: [],
28
30
  value3: [],
29
- };
31
+
32
+ flag: false,
33
+ infoList: [
34
+ {
35
+ label: '手机号(登录名)',
36
+ value: '18626860059',
37
+ key: 'phone',
38
+ },
39
+ {
40
+ label: '姓名',
41
+ value: '余群',
42
+ key: 'accountname',
43
+ },
44
+ {
45
+ label: '部门',
46
+ value: '技术部',
47
+ key: 'deptName',
48
+ },
49
+ ],
50
+ }
30
51
  },
31
52
  mounted() {},
32
53
  methods: {},
33
- };
54
+ }
34
55
  </script>
35
56
 
36
57
  <style lang="less" scoped>
@@ -312,7 +312,7 @@ export default {
312
312
  </style> -->
313
313
 
314
314
  <template>
315
- <div class="page-table-wrap" ref="pageTableWrap">
315
+ <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
316
316
  <base-pro-table
317
317
  :align="`left`"
318
318
  v-model="keyWords"
@@ -368,6 +368,8 @@ export default {
368
368
 
369
369
  <script>
370
370
  import tableTable from '../test'
371
+ import companyInfoConfig from '../config/CompanyInfoConfig'
372
+ import componentConfig from '../../packages/config/componentConfig'
371
373
  export default {
372
374
  data() {
373
375
  return {
@@ -424,19 +426,9 @@ export default {
424
426
  },
425
427
  ],
426
428
 
427
- // 分页属性
428
- /* 分页属性 */
429
- pageProps: {
430
- pageSize: 15,
431
- pageNum: 1,
432
- total: 100,
433
- },
434
- // 分页配置
435
- pageConfig: {
436
- size: 'pageSize',
437
- page: 'pageNum',
438
- total: 'total',
439
- },
429
+ show: true,
430
+
431
+ one: true,
440
432
  }
441
433
  },
442
434
  created() {
@@ -456,6 +448,7 @@ export default {
456
448
  width: 150,
457
449
  template: false,
458
450
  screen: true,
451
+ toolTip: true,
459
452
  },
460
453
  {
461
454
  label: '合同名称',
@@ -486,10 +479,32 @@ export default {
486
479
  width: 280,
487
480
  template: false,
488
481
  },
482
+ {
483
+ label: '审核状态2',
484
+ key: 'status1',
485
+ lock: false,
486
+ width: 280,
487
+ template: false,
488
+ },
489
+ {
490
+ label: '审核状态3',
491
+ key: 'status2',
492
+ lock: false,
493
+ width: 280,
494
+ template: false,
495
+ },
496
+ {
497
+ label: '审核状态4',
498
+ key: 'status3',
499
+ lock: false,
500
+ width: 280,
501
+ template: false,
502
+ },
489
503
  {
490
504
  label: '签署时间',
491
505
  key: 'gmtCreate',
492
- lock: false,
506
+ lock: 'right',
507
+ // lock: false,
493
508
  width: 280,
494
509
  template: false,
495
510
  },
@@ -498,13 +513,25 @@ export default {
498
513
  mounted() {
499
514
  this.pageHeight = this.$refs.pageTableWrap.clientHeight
500
515
  },
516
+ computed: {
517
+ pageProps() {
518
+ return companyInfoConfig.getPageProps()
519
+ },
520
+ pageConfig() {
521
+ return companyInfoConfig.getPageConfig()
522
+ },
523
+ },
501
524
  components: {},
502
525
  methods: {
503
526
  async httpRequire(screenCofig) {
504
- let result = null
527
+ companyInfoConfig.setTable()
505
528
  try {
506
- // result = await test(screenCofig)
507
- this.pageProps.total = 20
529
+ // result = await test(screenCofig);
530
+ if (this.one) {
531
+ this.pageProps.total = 100
532
+ } else {
533
+ this.pageProps.total = 20
534
+ }
508
535
  } catch (error) {
509
536
  return new Promise((resolve, reject) => {
510
537
  this.pageProps.total = 0
@@ -512,7 +539,7 @@ export default {
512
539
  })
513
540
  }
514
541
  return new Promise((resolve, reject) => {
515
- resolve(tableTable)
542
+ resolve(companyInfoConfig.getTableData())
516
543
  })
517
544
  },
518
545
  rowClick(row) {
@@ -531,177 +558,6 @@ export default {
531
558
  </style>
532
559
 
533
560
  <!-- 普通表单 -->
534
- <!-- <template>
535
- <div class="add-company-step-two-wrap">
536
- <base-form
537
- :footer="false"
538
- :rules="rules"
539
- :rowNumber="1"
540
- @onCancel="onCancel"
541
- v-model="formList"
542
- :labelWidth="`200px`"
543
- :labelPosition="`right`"
544
- @formSubmit="formSubmit"
545
- >
546
- <template v-slot:form-businessLicense="data">
547
-
548
- <div class="upload-wrap">
549
- <base-upload-item
550
- :shape="`pro`"
551
- :fileType="`img`"
552
- @uploadEd="uploadEd"
553
- :uploadType="`single`"
554
- v-model="data.scope[3].value"
555
- >
556
- </base-upload-item>
557
- </div>
558
- </template>
559
- <template v-slot:form-idPositive="data">
560
-
561
- <div class="upload-wrap">
562
- <base-upload-item
563
- :shape="`pro`"
564
- :fileType="`img`"
565
- @uploadEd="uploadEd"
566
- :uploadType="`single`"
567
- v-model="data.scope[4].value"
568
- >
569
- </base-upload-item>
570
- </div>
571
- </template>
572
- <template v-slot:form-idBack="data">
573
-
574
- <div class="upload-wrap">
575
- <base-upload-item
576
- :shape="`pro`"
577
- :fileType="`img`"
578
- @uploadEd="uploadEd"
579
- :uploadType="`single`"
580
- v-model="data.scope[5].value"
581
- >
582
- </base-upload-item>
583
- </div>
584
- </template>
585
- </base-form>
586
- </div>
587
- </template> -->
588
-
589
- <!-- <script>
590
- export default {
591
- data() {
592
- return {
593
- formList: [
594
- {
595
- value: "",
596
- key: "companyName",
597
- type: "input",
598
- label: "企业名称",
599
- },
600
- {
601
- value: "",
602
- key: "companyAddress",
603
- type: "area",
604
- label: "通讯地址",
605
- },
606
- {
607
- value: "",
608
- key: "companyDetail",
609
- type: "textarea",
610
- label: "详细地址",
611
- },
612
- {
613
- value: [],
614
- key: "businessLicense",
615
- type: "template",
616
- label: "营业执照正面彩照",
617
- },
618
- {
619
- value: [],
620
- key: "idPositive",
621
- type: "template",
622
- label: "法人身份证人像照",
623
- },
624
- {
625
- value: [],
626
- key: "idBack",
627
- type: "template",
628
- label: "法人身份证国徽照",
629
- },
630
- ],
631
- rules: {
632
- companyName: [
633
- {
634
- required: true,
635
- message: "请输入企业名称",
636
- trigger: "blur",
637
- },
638
- ],
639
- companyAddress: [
640
- {
641
- required: true,
642
- message: "请输入通讯地址",
643
- trigger: "blur",
644
- },
645
- ],
646
- companyDetail: [
647
- {
648
- required: true,
649
- message: "请输入详细地址",
650
- trigger: "blur",
651
- },
652
- ],
653
- businessLicense: [
654
- {
655
- required: true,
656
- message: "请上传营业彩照",
657
- trigger: "blur",
658
- },
659
- ],
660
- idPositive: [
661
- {
662
- required: true,
663
- message: "请上传法人身份证人像照",
664
- trigger: "blur",
665
- },
666
- ],
667
- idBack: [
668
- {
669
- required: true,
670
- message: "请上传法人身份证国徽照",
671
- trigger: "blur",
672
- },
673
- ],
674
- },
675
- };
676
- },
677
- methods: {
678
- onCancel() {},
679
- formSubmit() {},
680
- uploadEd(value) {
681
- console.log(value);
682
- console.log(this.formList);
683
- },
684
- },
685
- };
686
- </script>
687
-
688
- <style lang="less" scoped>
689
- .add-company-step-two-wrap {
690
- width: 60%;
691
- height: 100%;
692
- overflow-y: auto;
693
- .upload-wrap {
694
- width: 100%;
695
- height: 170px;
696
- display: flex;
697
- align-items: center;
698
- justify-content: center;
699
- /deep/ .base-upload-item-wrap {
700
- margin: 0px;
701
- }
702
- }
703
- }
704
- </style> -->
705
561
 
706
562
  <!-- 上传表单 -->
707
563
  <!-- <template>
@@ -0,0 +1,26 @@
1
+ import { reactive } from 'vue'
2
+ import LinkViewClass from './linkViewClass'
3
+
4
+ class CompanyInfoConfig extends LinkViewClass {
5
+ constructor() {
6
+ super()
7
+ this.dynamicMount = null
8
+ this.drawerContent = null
9
+
10
+ this.tableData = []
11
+ }
12
+ setTable() {
13
+ this.tableData = [
14
+ { firmName: 1 },
15
+ { firmName: '这是一段八个字的文字' },
16
+ { firmName: 3 },
17
+ { firmName: 4 },
18
+ { firmName: 5 },
19
+ { firmName: 6 },
20
+ { firmName: 7 },
21
+ ]
22
+ }
23
+ }
24
+
25
+ const companyInfoConfig = reactive(new CompanyInfoConfig())
26
+ export default companyInfoConfig
@@ -0,0 +1,71 @@
1
+ class LinkViewClass {
2
+ constructor(params) {
3
+ this.tableData = []
4
+ this.refreshTableData = null
5
+ this.pageProps = {}
6
+ this.pageConfig = {}
7
+ this.activeIndex = 0
8
+ this.init()
9
+ }
10
+
11
+ init() {
12
+ this.tableData = []
13
+ this.activeIndex = 0
14
+ this.refreshTableData = null
15
+ this.pageProps = {
16
+ size: 15,
17
+ total: 100,
18
+ current: 1,
19
+ }
20
+ this.pageConfig = {
21
+ size: 'size',
22
+ page: 'current',
23
+ total: 'total',
24
+ }
25
+ }
26
+ onHandNextData() {
27
+ if (this.hasNextTableData()) {
28
+ this.activeIndex += 1
29
+ return
30
+ }
31
+ this.activeIndex = this.tableData.length - 1
32
+ }
33
+
34
+ onHandPreData() {
35
+ if (this.hasPreTableData()) {
36
+ this.activeIndex -= 1
37
+ }
38
+ this.activeIndex = 0
39
+ }
40
+
41
+ hasNextTableData() {
42
+ return this.tableData.length > 0
43
+ ? this.activeIndex == this.tableData.length - 1
44
+ ? false
45
+ : true
46
+ : false
47
+ }
48
+ hasPreTableData() {
49
+ return this.activeIndex <= 0 ? false : true
50
+ }
51
+ getTableDataForActiveIndex() {
52
+ return this.tableData[this.activeIndex]
53
+ }
54
+
55
+ getPageProps() {
56
+ return this.pageProps
57
+ }
58
+
59
+ getTableData() {
60
+ this.activeIndex = 0
61
+ return {
62
+ _class: this,
63
+ tableData: this.tableData,
64
+ }
65
+ }
66
+ getPageConfig() {
67
+ return this.pageConfig
68
+ }
69
+ }
70
+
71
+ export default LinkViewClass
package/src/main.js CHANGED
@@ -8,7 +8,7 @@ import testSelectStore from "./component/testSelectStore";
8
8
  import "../packages/components/style/index.less";
9
9
  meixioacomponent.componentConfig.initConfig(store, router);
10
10
  meixioacomponent.componentConfig.setUploadPrefix(
11
- "http://192.168.31.156:9999/files/files"
11
+ "http://gateway.wubangtu.xyz:9999/files/files"
12
12
  );
13
13
 
14
14
  Vue.use(ElementUI);
package/src/test.js CHANGED
@@ -1,8 +1,8 @@
1
- import { reactive } from "vue"
1
+ import { reactive, ref } from "vue"
2
2
 
3
3
 
4
- let tableTable = reactive([{ firmName: 1 },
5
- { firmName: 2 },
4
+ let tableTable = ref([{ firmName: 1 },
5
+ { firmName: '这是一段八个字的文字' },
6
6
  { firmName: 3 },
7
7
  { firmName: 4 },
8
8
  { firmName: 5 },