theluyuan/layui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: theluyuan:92fa833be79e2fe72561294853320ea3a4453dd6
Branches Tags
theluyuan:v1.7.0
..
compare: theluyuan:71a3b6f1c43d380a3969ebb4389caaf058e951a2
Branches Tags
theluyuan:v1.7.0

No commits in common. "92fa833be79e2fe72561294853320ea3a4453dd6" and "71a3b6f1c43d380a3969ebb4389caaf058e951a2" have entirely different histories.
92fa833be7 ... 71a3b6f1c4

7 changed files with 69 additions and 102 deletions
Show Stats Expand all files Collapse all files

5
package/component/es/table/index.js
View File

@ -1058,7 +1058,7 @@ const _sfc_main = defineComponent({
}); });
}; };
findFinalNode(0, tableColumns.value); findFinalNode(0, tableColumns.value);
const tableSelectedKeys = ref(props.selectedKeys); const tableSelectedKeys = ref([...props.selectedKeys]);
const tableExpandKeys = ref([...props.expandKeys]); const tableExpandKeys = ref([...props.expandKeys]);
watch(() => props.selectedKeys, () => { watch(() => props.selectedKeys, () => {
tableSelectedKeys.value = props.selectedKeys; tableSelectedKeys.value = props.selectedKeys;
@ -1102,10 +1102,7 @@ const _sfc_main = defineComponent({
} else { } else {
hasChecked.value = false; hasChecked.value = false;
} }
if (tableSelectedKeys.value != props.selectedKeys) {
console.log("\u521D\u59CB\u5316\u8D4B\u503C\u89E6\u53D1\u4FEE\u6539", tableSelectedKeys.value, props.selectedKeys);
emit("update:selectedKeys", tableSelectedKeys.value); emit("update:selectedKeys", tableSelectedKeys.value);
}
}, { deep: true, immediate: true }); }, { deep: true, immediate: true });
watch(tableExpandKeys, () => { watch(tableExpandKeys, () => {
emit("update:expandKeys", tableExpandKeys.value); emit("update:expandKeys", tableExpandKeys.value);

14
package/component/es/tree/index.js
View File

@ -1,5 +1,5 @@
import { w as withInstall } from "../badge/index2.js"; import { w as withInstall } from "../badge/index2.js";
import { defineComponent, useSlots, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, createVNode, unref, withModifiers, createBlock, createCommentVNode, renderSlot, createTextVNode, toDisplayString, withCtx, createSlots, ref, watch, nextTick, onMounted } from "vue"; import { defineComponent, useSlots, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, createVNode, unref, withModifiers, createBlock, createCommentVNode, renderSlot, createTextVNode, toDisplayString, withCtx, createSlots, ref, watch, onMounted, nextTick } from "vue";
import { _ as _sfc_main$2E, a as _sfc_main$2 } from "../checkbox/index2.js"; import { _ as _sfc_main$2E, a as _sfc_main$2 } from "../checkbox/index2.js";
import { _ as _sfc_main$3 } from "../transition/index2.js"; import { _ as _sfc_main$3 } from "../transition/index2.js";
const _hoisted_1 = ["onClick"]; const _hoisted_1 = ["onClick"];
@ -65,9 +65,6 @@ const _sfc_main$1 = defineComponent({
if (!node.isDisabled) { if (!node.isDisabled) {
emit("node-click", node); emit("node-click", node);
} }
if (props.showCheckbox) {
node.isChecked = !node.isChecked;
}
} }
function handleRowClick(node) { function handleRowClick(node) {
if (!props.showLine) { if (!props.showLine) {
@ -149,7 +146,7 @@ const _sfc_main$1 = defineComponent({
class: normalizeClass({ class: normalizeClass({
"layui-tree-txt": true, "layui-tree-txt": true,
"layui-disabled": node.isDisabled, "layui-disabled": node.isDisabled,
"layui-this": __props.selectedKey === node.id || node.isChecked "layui-this": __props.selectedKey === node.id
}), }),
onClick: withModifiers(($event) => handleTitleClick(node), ["stop"]) onClick: withModifiers(($event) => handleTitleClick(node), ["stop"])
}, [ }, [
@ -421,21 +418,18 @@ const _sfc_main = defineComponent({
loadNodeList(); loadNodeList();
}, { deep: true, immediate: true }); }, { deep: true, immediate: true });
watch(() => props.checkedKeys, () => { watch(() => props.checkedKeys, () => {
console.log(tree.value);
if (!unWatch.value) { if (!unWatch.value) {
loadNodeList(); loadNodeList();
} }
}, {
deep: true
}); });
watch(tree, () => { watch(tree, () => {
if (initStatus.value) { if (initStatus.value) {
const { checkedKeys } = tree.value.getKeys(); const { checkedKeys } = tree.value.getKeys();
unWatch.value = true; unWatch.value = true;
emit("update:checkedKeys", checkedKeys); emit("update:checkedKeys", checkedKeys);
nextTick(() => { setTimeout(() => {
unWatch.value = false; unWatch.value = false;
}); }, 0);
} }
}, { deep: true }); }, { deep: true });
onMounted(() => { onMounted(() => {

17
package/component/lib/index.js
View File

@ -17662,9 +17662,6 @@ const _sfc_main$K = defineComponent({
if (!node.isDisabled) { if (!node.isDisabled) {
emit("node-click", node); emit("node-click", node);
} }
if (props.showCheckbox) {
node.isChecked = !node.isChecked;
}
} }
function handleRowClick(node) { function handleRowClick(node) {
if (!props.showLine) { if (!props.showLine) {
@ -17746,7 +17743,7 @@ const _sfc_main$K = defineComponent({
class: normalizeClass({ class: normalizeClass({
"layui-tree-txt": true, "layui-tree-txt": true,
"layui-disabled": node.isDisabled, "layui-disabled": node.isDisabled,
"layui-this": __props.selectedKey === node.id || node.isChecked "layui-this": __props.selectedKey === node.id
}), }),
onClick: withModifiers(($event) => handleTitleClick(node), ["stop"]) onClick: withModifiers(($event) => handleTitleClick(node), ["stop"])
}, [ }, [
@ -18018,21 +18015,18 @@ const _sfc_main$J = defineComponent({
loadNodeList(); loadNodeList();
}, { deep: true, immediate: true }); }, { deep: true, immediate: true });
watch(() => props.checkedKeys, () => { watch(() => props.checkedKeys, () => {
console.log(tree.value);
if (!unWatch.value) { if (!unWatch.value) {
loadNodeList(); loadNodeList();
} }
}, {
deep: true
}); });
watch(tree, () => { watch(tree, () => {
if (initStatus.value) { if (initStatus.value) {
const { checkedKeys } = tree.value.getKeys(); const { checkedKeys } = tree.value.getKeys();
unWatch.value = true; unWatch.value = true;
emit("update:checkedKeys", checkedKeys); emit("update:checkedKeys", checkedKeys);
nextTick(() => { setTimeout(() => {
unWatch.value = false; unWatch.value = false;
}); }, 0);
} }
}, { deep: true }); }, { deep: true });
onMounted(() => { onMounted(() => {
@ -19498,7 +19492,7 @@ const _sfc_main$D = defineComponent({
}); });
}; };
findFinalNode(0, tableColumns.value); findFinalNode(0, tableColumns.value);
const tableSelectedKeys = ref(props.selectedKeys); const tableSelectedKeys = ref([...props.selectedKeys]);
const tableExpandKeys = ref([...props.expandKeys]); const tableExpandKeys = ref([...props.expandKeys]);
watch(() => props.selectedKeys, () => { watch(() => props.selectedKeys, () => {
tableSelectedKeys.value = props.selectedKeys; tableSelectedKeys.value = props.selectedKeys;
@ -19542,10 +19536,7 @@ const _sfc_main$D = defineComponent({
} else { } else {
hasChecked.value = false; hasChecked.value = false;
} }
if (tableSelectedKeys.value != props.selectedKeys) {
console.log("\u521D\u59CB\u5316\u8D4B\u503C\u89E6\u53D1\u4FEE\u6539", tableSelectedKeys.value, props.selectedKeys);
emit("update:selectedKeys", tableSelectedKeys.value); emit("update:selectedKeys", tableSelectedKeys.value);
}
}, { deep: true, immediate: true }); }, { deep: true, immediate: true });
watch(tableExpandKeys, () => { watch(tableExpandKeys, () => {
emit("update:expandKeys", tableExpandKeys.value); emit("update:expandKeys", tableExpandKeys.value);

10
package/component/src/component/table/index.vue
View File

@ -238,8 +238,7 @@ const findFinalNode = (level: number, columns: any[]) => {
findFinalNode(0, tableColumns.value); findFinalNode(0, tableColumns.value);
// 你浅拷贝他干什么呀 const tableSelectedKeys = ref<Recordable[]>([...props.selectedKeys]);
const tableSelectedKeys = ref<Recordable[]>(props.selectedKeys);
const tableExpandKeys = ref<Recordable[]>([...props.expandKeys]); const tableExpandKeys = ref<Recordable[]>([...props.expandKeys]);
watch( watch(
@ -314,14 +313,7 @@ watch(
} else { } else {
hasChecked.value = false; hasChecked.value = false;
} }
if (tableSelectedKeys.value != props.selectedKeys) {
console.log(
"初始化赋值触发修改",
tableSelectedKeys.value,
props.selectedKeys
);
emit("update:selectedKeys", tableSelectedKeys.value); emit("update:selectedKeys", tableSelectedKeys.value);
}
}, },
{ deep: true, immediate: true } { deep: true, immediate: true }
); );

5
package/component/src/component/tree/TreeNode.vue
View File

@ -101,9 +101,6 @@ function handleTitleClick(node: TreeData) {
if (!node.isDisabled) { if (!node.isDisabled) {
emit("node-click", node); emit("node-click", node);
} }
if (props.showCheckbox) {
node.isChecked = !node.isChecked;
}
} }
function handleRowClick(node: TreeData) { function handleRowClick(node: TreeData) {
@ -185,7 +182,7 @@ const isChildAllSelected = computed(() => {
:class="{ :class="{
'layui-tree-txt': true, 'layui-tree-txt': true,
'layui-disabled': node.isDisabled, 'layui-disabled': node.isDisabled,
'layui-this': selectedKey === node.id || node.isChecked, 'layui-this': selectedKey === node.id,
}" }"
@click.stop="handleTitleClick(node)" @click.stop="handleTitleClick(node)"
> >

8
package/component/src/component/tree/index.vue
View File

@ -103,13 +103,9 @@ watch(
watch( watch(
() => props.checkedKeys, () => props.checkedKeys,
() => { () => {
console.log(tree.value);
if (!unWatch.value) { if (!unWatch.value) {
loadNodeList(); loadNodeList();
} }
},
{
deep: true,
} }
); );
@ -120,9 +116,9 @@ watch(
const { checkedKeys } = tree.value.getKeys(); const { checkedKeys } = tree.value.getKeys();
unWatch.value = true; unWatch.value = true;
emit("update:checkedKeys", checkedKeys); emit("update:checkedKeys", checkedKeys);
nextTick(() => { setTimeout(() => {
unWatch.value = false; unWatch.value = false;
}); }, 0);
} }
}, },
{ deep: true } { deep: true }

106
package/component/umd/index.js
View File

File diff suppressed because one or more lines are too long