cloud-web-corejs-haier 1.0.19 → 1.0.20
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,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloud-web-corejs-haier",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.20",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"dev": "vue-cli-service serve",
|
|
7
7
|
"lint": "eslint --ext .js,.vue src",
|
|
@@ -161,6 +161,7 @@
|
|
|
161
161
|
"src/components/xform",
|
|
162
162
|
"src/components/xhsPrint",
|
|
163
163
|
"src/components/langTag",
|
|
164
|
+
"src/components/luckysheet",
|
|
164
165
|
"src/api",
|
|
165
166
|
"src/views/bd",
|
|
166
167
|
"src/views/support",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Vue from "vue";
|
|
2
|
-
import CellSlot from "
|
|
2
|
+
import CellSlot from "@base/components/table/CellSlot.vue";
|
|
3
3
|
|
|
4
4
|
let instance = null;
|
|
5
5
|
|
|
@@ -28,9 +28,16 @@ export function getCellValue(obj) {
|
|
|
28
28
|
let cellValue;
|
|
29
29
|
if (column.slots && column.slots.filterVal) {
|
|
30
30
|
cellValue = column.slots.filterVal(params);
|
|
31
|
-
} else {
|
|
31
|
+
} else if(column.renderCell){
|
|
32
32
|
let result = column.renderCell(h, params);
|
|
33
33
|
cellValue = vNodeRender(result);
|
|
34
|
+
}else{
|
|
35
|
+
if(column.slots?.default){
|
|
36
|
+
let result = column.slots.default(obj, h);
|
|
37
|
+
cellValue = vNodeRender(result);
|
|
38
|
+
}else{
|
|
39
|
+
cellValue = obj.row[column.field];
|
|
40
|
+
}
|
|
34
41
|
}
|
|
35
42
|
return cellValue;
|
|
36
43
|
}
|
|
@@ -314,7 +321,7 @@ function domRender(dom) {
|
|
|
314
321
|
});
|
|
315
322
|
return arr.join("");
|
|
316
323
|
} else {
|
|
317
|
-
if (item.nodeName == "INPUT") {
|
|
324
|
+
if (item.nodeName == "INPUT" || item.nodeName == "TEXTAREA") {
|
|
318
325
|
return item.value;
|
|
319
326
|
} else if (item.innerText != null && item.innerText != "") {
|
|
320
327
|
return item.innerText;
|