@leevan/jtui 2.0.15 → 2.0.18
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/examples/tableTest/table-dsj.vue +2 -2
- package/examples/tableTest/table-ptbg.vue +3 -3
- package/examples/tableTest/table-tree.vue +6 -4
- package/lib/jtui.common.js +18 -11
- package/lib/jtui.css +1 -1
- package/lib/jtui.umd.js +18 -11
- package/lib/jtui.umd.min.js +1 -1
- package/package.json +1 -1
- package/packages/jt-form-pc/JtFormPc.vue +1 -0
- package/packages/jt-table/index.vue +21 -0
- package/packages/jt-table-pc/data2.js +25 -4
package/package.json
CHANGED
|
@@ -64,6 +64,7 @@
|
|
|
64
64
|
<!-- 选择器 -->
|
|
65
65
|
<el-select
|
|
66
66
|
v-if="item.type === 'select'"
|
|
67
|
+
default-first-option
|
|
67
68
|
:style="{width:item.width ? item.width === 'auto' ? item.width : item.width + 'px' : '200px'}"
|
|
68
69
|
v-model="model[item.modelKey]"
|
|
69
70
|
:disabled="item.disabled ? item.disabled : false"
|
|
@@ -1079,6 +1079,21 @@ export default {
|
|
|
1079
1079
|
} else if (data.htmlType == "a") {
|
|
1080
1080
|
let item = data.html.find((item) => item.value == cellValue);
|
|
1081
1081
|
return item ? `<a href="javascript:">${cellValue}</a>` : cellValue;
|
|
1082
|
+
}else if(data.htmlType == 'tag'){
|
|
1083
|
+
let item = data.html.find((item) => item.value == cellValue);
|
|
1084
|
+
return item ? `<span style="
|
|
1085
|
+
display:inline-block;
|
|
1086
|
+
background-color: #fdf6ec;
|
|
1087
|
+
height: 26px;
|
|
1088
|
+
padding: 0 10px;
|
|
1089
|
+
line-height: 26px;
|
|
1090
|
+
font-size: 12px;
|
|
1091
|
+
color: #e6a23c;
|
|
1092
|
+
border: 1px solid #d9ecff;
|
|
1093
|
+
border-radius: 4px;
|
|
1094
|
+
box-sizing: border-box;
|
|
1095
|
+
white-space: nowrap;
|
|
1096
|
+
">${item.label}</span>` : cellValue;
|
|
1082
1097
|
}
|
|
1083
1098
|
} else if (data && "enum" in data) {
|
|
1084
1099
|
let item = data.enum.find((item) => item.value == cellValue);
|
|
@@ -1673,4 +1688,10 @@ export default {
|
|
|
1673
1688
|
.has-sub-header {
|
|
1674
1689
|
background: #fff;
|
|
1675
1690
|
}
|
|
1691
|
+
.vxe-table--render-default .vxe-tree--btn-wrapper{
|
|
1692
|
+
top:63% !important;
|
|
1693
|
+
}
|
|
1694
|
+
.vxe-table--render-default .vxe-body--column{
|
|
1695
|
+
line-height:normal !important;
|
|
1696
|
+
}
|
|
1676
1697
|
</style>
|
|
@@ -207,8 +207,8 @@ export function data7() {
|
|
|
207
207
|
}, {
|
|
208
208
|
"isSort": false,
|
|
209
209
|
"isIcon": false, "format": "NULL", "label": "状态",
|
|
210
|
-
"type": "String", "align": "center",
|
|
211
|
-
"filterRender": "", "
|
|
210
|
+
"type": "String", "align": "center", "htmlType": 'tag',
|
|
211
|
+
"filterRender": "", "html": [{ "label": "冻结", "value": "0" },
|
|
212
212
|
{ "label": "正常", "value": "1" }, { "label": "修改密码-正常", "value": "2" },
|
|
213
213
|
{ "label": "分组部门", "value": "4" }], "prop": "status",
|
|
214
214
|
"isFilter": false, "width": 50, "isSpan": false, "isFixed": ""
|
|
@@ -233,7 +233,16 @@ export function data7() {
|
|
|
233
233
|
"pkid": "123",
|
|
234
234
|
loginkey: "12313",
|
|
235
235
|
"name": "所有部门",
|
|
236
|
-
"status": "
|
|
236
|
+
"status": "0"
|
|
237
|
+
},{
|
|
238
|
+
"onlct": "0", "path": "NULLL",
|
|
239
|
+
"inBottons": [{ "funcode": "dept_add", "name": "新增部门", "icon": "-" }],
|
|
240
|
+
"icon": "iconwenjianjia yhgl-first-xc", "usrid": "10",
|
|
241
|
+
"pid": "-1",
|
|
242
|
+
"pkid": "123",
|
|
243
|
+
loginkey: "12313",
|
|
244
|
+
"name": "所有部门",
|
|
245
|
+
"status": "0"
|
|
237
246
|
}], "Result": 1
|
|
238
247
|
}]
|
|
239
248
|
}
|
|
@@ -253,7 +262,19 @@ export function data10() {
|
|
|
253
262
|
|
|
254
263
|
|
|
255
264
|
export function data22() {
|
|
256
|
-
return [{
|
|
265
|
+
return [{
|
|
266
|
+
"retjson": {
|
|
267
|
+
"isEnums": true, "isHaveHead": true, "header": [
|
|
268
|
+
{ "isSort": true, "prop": "JSBH", "width": 110, "label": "教室编号", "type": "String", "align": "center", "enum": [] }, { "isSort": true, "prop": "JSH", "width": 90, "label": "教室号", "type": "String", "align": "center", "enum": [] }, { "isSort": true, "prop": "JSLXM", "width": 100, "label": "教室类型", "type": "String", "align": "center", "enum": [] }, { "isSort": true, "prop": "ZWS", "width": 80, "label": "座位数", "type": "String", "align": "center", "enum": [] }, { "isSort": false, "prop": "JSMC", "width": 90, "label": "位置", "type": "String", "align": "center", "enum": [] }, { "isSort": true, "prop": "STATUS", "width": 0, "label": "设备状态", "type": "String", "align": "center", "enum": [] }, { "isSort": true, "prop": "INSTALL", "width": 0, "label": "安装情况", "type": "String", "align": "center", "enum": [] },
|
|
269
|
+
{
|
|
270
|
+
"htmlType": "icon", "prop": "JSSB", "width": -1, "html": [{ "size": "20", "color": "#2c2c2c", "icon": "iconmbClose", "label": "幕布", "value": "MB1-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "iconmbOpen", "label": "幕布", "value": "MB1-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "iconmbClose", "label": "幕布", "value": "MB2-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "iconmbOpen", "label": "幕布", "value": "MB2-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "icondnClose", "label": "电脑", "value": "DN1-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "icondnOpen", "label": "电脑", "value": "DN1-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "icondnClose", "label": "电脑", "value": "DN2-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "icondnOpen", "label": "电脑", "value": "DN2-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "icontyyClose", "label": "投影仪", "value": "TYY1-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "icontyyOpen", "label": "投影仪", "value": "TYY1-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "icontyyClose", "label": "投影仪", "value": "TYY2-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "icontyyOpen", "label": "投影仪", "value": "TYY2-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "iconsyClose", "label": "音频", "value": "SPK1-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "iconsyOpen", "label": "音频", "value": "SPK1-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "iconmaikefeng2", "label": "麦克风", "value": "MCP1-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "iconmaikefeng1", "label": "麦克风", "value": "MCP1-OPEN" }, { "size": "20", "color": "#2c2c2c", "icon": "iconspClose", "label": "视频", "value": "SPJZ1-CLOSE" }, { "size": "20", "color": "#ffffff", "icon": "iconspOpen", "label": "视频", "value": "SPJZ1-OPEN" }],
|
|
271
|
+
"label": "教室设备",
|
|
272
|
+
"align": "center"
|
|
273
|
+
}],
|
|
274
|
+
"isPages": false
|
|
275
|
+
},
|
|
276
|
+
"DataArray": [{ "JSLXM": "多媒体", "JSZT": "OFF", "STATUS": {}, "INSTALL": "DN1,DY1,MB1,PM1,SPJZ1,TYY1,YPJZ1", "inBottons": [{ "funcode": "opr", "color": "#2c2c2c", "size": "14", "name": "操作面板", "icon": "iconbanlijindu" }], "ZWS": "266", "JSSB": ["DN1-CLOSE", "DY1-CLOSE", "MB1-CLOSE", "PM1-CLOSE", "SPJZ1-CLOSE", "TYY1-CLOSE", "YPJZ1-CLOSE"], "JSBH": "11104A0106", "JSMC": "4-A106", "JSH": "4-A106" }, { "JSLXM": "多媒体", "JSZT": "OFF", "STATUS": {}, "INSTALL": "DN1,DY1,MB1,PM1,SPJZ1,TYY1,YPJZ1", "inBottons": [{ "funcode": "opr", "color": "#2c2c2c", "size": "14", "name": "操作面板", "icon": "iconbanlijindu" }], "ZWS": "116", "JSSB": ["DN1-CLOSE", "DY1-CLOSE", "MB1-CLOSE", "PM1-CLOSE", "SPJZ1-CLOSE", "TYY1-CLOSE", "YPJZ1-CLOSE"], "JSBH": "11104B0205", "JSMC": "4-B205", "JSH": "4-B205" }, { "JSLXM": "多媒体", "JSZT": "OFF", "STATUS": {}, "INSTALL": "DN1,DY1,MB1,PM1,SPJZ1,TYY1,YPJZ1", "inBottons": [{ "funcode": "opr", "color": "#2c2c2c", "size": "14", "name": "操作面板", "icon": "iconbanlijindu" }], "ZWS": "114", "JSSB": ["DN1-CLOSE", "DY1-CLOSE", "MB1-CLOSE", "PM1-CLOSE", "SPJZ1-CLOSE", "TYY1-CLOSE", "YPJZ1-CLOSE"], "JSBH": "11104B0405", "JSMC": "4-B405", "JSH": "4-B405" }, { "JSLXM": "多媒体", "JSZT": "OFF", "STATUS": {}, "INSTALL": "DN1,DY1,MB1,PM1,SPJZ1,TYY1,YPJZ1", "inBottons": [{ "funcode": "opr", "color": "#2c2c2c", "size": "14", "name": "操作面板", "icon": "iconbanlijindu" }], "ZWS": "116", "JSSB": ["DN1-CLOSE", "DY1-CLOSE", "MB1-CLOSE", "PM1-CLOSE", "SPJZ1-CLOSE", "TYY1-CLOSE", "YPJZ1-CLOSE"], "JSBH": "11104B0407", "JSMC": "4-B407", "JSH": "4-B407" }], "Result": 4
|
|
277
|
+
}]
|
|
257
278
|
}
|
|
258
279
|
|
|
259
280
|
export function data23() {
|