tianheng-ui 0.1.42 → 0.1.44

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 (6) hide show
  1. package/lib/tianheng-ui.js +3 -3
  2. package/package.json +1 -1
  3. package/packages/TableMaking/WidgetTools.vue +1 -1
  4. package/packages/TableMaking/custom/items/table/index-h5.vue +21 -30
  5. package/packages/TableMaking/widgetConfig.vue +44 -23
  6. package/packages/TableMaking/widgetTable.vue +36 -16
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "tianheng-ui",
3
3
  "description": "A Vue.js project",
4
- "version": "0.1.42",
4
+ "version": "0.1.44",
5
5
  "author": "shu lang <403732931@qq.com>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/packages/TableMaking/WidgetTools.vue CHANGED
@@ -229,7 +229,7 @@ export default {
229
229
  this.handleDialogClose();
230
230
  },
231
231
  handleDialogClose() {
232
- this.dialog.show = false;
232
+ this.dialog = { show: false, action: "", data: {} };
233
233
  },
234
234
  handleExcelFileChange() {},
235
235
  handleGenerateJson() {},
package/packages/TableMaking/custom/items/table/index-h5.vue CHANGED
@@ -57,48 +57,21 @@ export default {
57
57
  return [];
58
58
  },
59
59
  cellStyle() {
60
- let styleText = "";
61
60
  if (this.config.style) {
62
61
  const style = this.config.style.cell || {};
63
- const keys = Object.keys(style).filter(key => {
64
- return key !== "customStyle";
65
- });
66
- for (let key of keys) {
67
- styleText += `${key}: ${style[key]};`;
68
- }
69
- styleText += style.customStyle;
70
- styleText = styleText.replace(/rpx/g, "px");
71
- return styleText;
62
+ return this.initStyle(style);
72
63
  }
73
64
  },
74
65
  titleStyle() {
75
- let styleText = "";
76
66
  if (this.config.style) {
77
67
  const style = this.config.style.title || {};
78
- const keys = Object.keys(style).filter(key => {
79
- return key !== "customStyle";
80
- });
81
- for (let key of keys) {
82
- styleText += `${key}: ${style[key]};`;
83
- }
84
- styleText += style.customStyle;
85
- styleText = styleText.replace(/rpx/g, "px");
86
- return styleText;
68
+ return this.initStyle(style);
87
69
  }
88
70
  },
89
71
  valueStyle() {
90
- let styleText = "";
91
72
  if (this.config.style) {
92
73
  const style = this.config.style.value || {};
93
- const keys = Object.keys(style).filter(key => {
94
- return key !== "customStyle";
95
- });
96
- for (let key of keys) {
97
- styleText += `${key}: ${style[key]};`;
98
- }
99
- styleText += style.customStyle;
100
- styleText = styleText.replace(/rpx/g, "px");
101
- return styleText;
74
+ return this.initStyle(style);
102
75
  }
103
76
  }
104
77
  },
@@ -109,6 +82,24 @@ export default {
109
82
  },
110
83
  handleActionClick(action, item) {
111
84
  this.$emit("action", action, item);
85
+ },
86
+ initStyle(style) {
87
+ let styleText = "";
88
+ let customStyle = "";
89
+ for (let key of Object.keys(style)) {
90
+ const value = style[key];
91
+ if (!value) continue;
92
+ if (key === "customStyle") {
93
+ customStyle = value.replace(/{/g, "");
94
+ customStyle = customStyle.replace(/}/g, "");
95
+ customStyle = customStyle.replace(/\/n/g, "");
96
+ } else {
97
+ styleText += `${key}: ${value};`;
98
+ }
99
+ }
100
+ if (customStyle) styleText += customStyle;
101
+ styleText = styleText.replace(/rpx/g, "px");
102
+ return styleText;
112
103
  }
113
104
  }
114
105
  };
package/packages/TableMaking/widgetConfig.vue CHANGED
@@ -340,14 +340,19 @@
340
340
  clearable
341
341
  ></el-input>
342
342
  </el-form-item>
343
- <el-form-item label="自定义">
344
- <el-input
343
+ <el-form-item label-width="0">
344
+ <el-tooltip effect="light" placement="top">
345
+ <div slot="content">
346
+ <div>样式编辑器，可编写css样式</div>
347
+ <div>示例：</div>
348
+ <div v-html="cssDemo"></div>
349
+ </div>
350
+ <span style="color: #409EFF;">css样式</span>
351
+ </el-tooltip>
352
+ <th-code-editor
345
353
  v-model="config.table.style.cell.customStyle"
346
- type="textarea"
347
- :rows="2"
348
- placeholder="请输入"
349
- >
350
- </el-input>
354
+ language="css"
355
+ ></th-code-editor>
351
356
  </el-form-item>
352
357
  </el-collapse-item>
353
358
  <el-collapse-item name="group-style_title">
@@ -397,14 +402,19 @@
397
402
  clearable
398
403
  ></el-input>
399
404
  </el-form-item>
400
- <el-form-item label="自定义">
401
- <el-input
405
+ <el-form-item label-width="0">
406
+ <el-tooltip effect="light" placement="top">
407
+ <div slot="content">
408
+ <div>样式编辑器，可编写css样式</div>
409
+ <div>示例：</div>
410
+ <div v-html="cssDemo"></div>
411
+ </div>
412
+ <span style="color: #409EFF;">css样式</span>
413
+ </el-tooltip>
414
+ <th-code-editor
402
415
  v-model="config.table.style.title.customStyle"
403
- type="textarea"
404
- :rows="2"
405
- placeholder="请输入"
406
- >
407
- </el-input>
416
+ language="css"
417
+ ></th-code-editor>
408
418
  </el-form-item>
409
419
  </el-collapse-item>
410
420
  <el-collapse-item name="group-style_value">
@@ -454,14 +464,19 @@
454
464
  clearable
455
465
  ></el-input>
456
466
  </el-form-item>
457
- <el-form-item label="自定义">
458
- <el-input
467
+ <el-form-item label-width="0">
468
+ <el-tooltip effect="light" placement="top">
469
+ <div slot="content">
470
+ <div>样式编辑器，可编写css样式</div>
471
+ <div>示例：</div>
472
+ <div v-html="cssDemo"></div>
473
+ </div>
474
+ <span style="color: #409EFF;">css样式</span>
475
+ </el-tooltip>
476
+ <th-code-editor
459
477
  v-model="config.table.style.value.customStyle"
460
- type="textarea"
461
- :rows="2"
462
- placeholder="请输入"
463
- >
464
- </el-input>
478
+ language="css"
479
+ ></th-code-editor>
465
480
  </el-form-item>
466
481
  </el-collapse-item>
467
482
  </el-collapse>
@@ -686,7 +701,14 @@ export default {
686
701
  search: [],
687
702
  table: []
688
703
  },
689
- dialog: { show: false, data: null }
704
+ dialog: { show: false, data: null },
705
+ cssDemo: `
706
+ {<br>
707
+ padding: 10px;<br>
708
+ margin: 10px;<br>
709
+ color: red;<br>
710
+ }
711
+ `
690
712
  };
691
713
  },
692
714
  watch: {
@@ -768,7 +790,6 @@ export default {
768
790
  });
769
791
  this.config.table.options = nodes;
770
792
  }
771
- console.log("handleTreeCheckChange =>", nodes);
772
793
  },
773
794
  // 对外暴露表单校验
774
795
  formValidate() {
package/packages/TableMaking/widgetTable.vue CHANGED
@@ -10,14 +10,24 @@
10
10
  >
11
11
  <div class="table-item table-header">
12
12
  <div class="table-item-custom">拖动</div>
13
- <div>列名</div>
14
- <el-tooltip
15
- content="对应列内容的字段名，非必要不修改！"
16
- placement="top-start"
17
- effect="light"
18
- >
19
- <div><el-button type="text">字段</el-button></div>
20
- </el-tooltip>
13
+ <div>
14
+ <el-tooltip
15
+ content="对应列的表头名称"
16
+ placement="top-start"
17
+ effect="light"
18
+ >
19
+ <el-button type="text">列名</el-button>
20
+ </el-tooltip>
21
+ </div>
22
+ <div>
23
+ <el-tooltip
24
+ content="对应列内容的字段名，非必要不修改！"
25
+ placement="top-start"
26
+ effect="light"
27
+ >
28
+ <el-button type="text">字段</el-button>
29
+ </el-tooltip>
30
+ </div>
21
31
  <div>类型</div>
22
32
  <div>默认值</div>
23
33
  <!-- <div>数据来源</div> -->
@@ -89,14 +99,24 @@
89
99
  <div class="tableList" style="height: calc(100% - 350px);">
90
100
  <div class="table-item table-header">
91
101
  <div class="table-item-custom">拖动</div>
92
- <div>列名</div>
93
- <el-tooltip
94
- content="对应列内容的字段名，非必要不修改！"
95
- placement="top-start"
96
- effect="light"
97
- >
98
- <div><el-button type="text">字段</el-button></div>
99
- </el-tooltip>
102
+ <div>
103
+ <el-tooltip
104
+ content="对应列的表头名称"
105
+ placement="top-start"
106
+ effect="light"
107
+ >
108
+ <el-button type="text">列名</el-button>
109
+ </el-tooltip>
110
+ </div>
111
+ <div>
112
+ <el-tooltip
113
+ content="对应列内容的字段名，非必要不修改！"
114
+ placement="top-start"
115
+ effect="light"
116
+ >
117
+ <el-button type="text">字段</el-button>
118
+ </el-tooltip>
119
+ </div>
100
120
  <div>对齐</div>
101
121
  <div>宽度</div>
102
122
  <div class="table-item-custom">排序</div>