feat: 优化表格条件渲染

liuhanchen
1 parent d497786e
Showing 1 changed file with 6 additions and 2 deletions Show diff stats
packages/table/editor.vue
@@ -108,6 +108,9 @@ function editorRender(h, context, item) {
   const contentProps = context.props || {};
   return function(scope) {
     const value = get(scope.row, item.prop);
+    if (item.if === false) {
+      return cellRender(h, context, item)(scope);
+    }
     if (item.if && typeof item.if === 'function') {
       const showEditor = item.if({ item, value, index: scope.$index, ...scope });
       if (!showEditor) {
@@ -118,7 +121,7 @@ function editorRender(h, context, item) {
     // 默认
     const setValue = val => {
       if (get(contentProps, 'editor.force') === true) {
-        vnode.componentInstance.$set(scope.row, item.prop, val);
+        if (vnode.componentInstance) vnode.componentInstance.$set(scope.row, item.prop, val);
       } else {
         scope.row[item.prop] = val;
       }
@@ -136,7 +139,7 @@ function editorRender(h, context, item) {
           const bindProp = path[0];
           const propValue = cloneDeep(scope.row);
           set(propValue, item.prop, val);
-          vnode.componentInstance.$set(scope.row, bindProp, propValue[bindProp]);
+          if (vnode.componentInstance) vnode.componentInstance.$set(scope.row, bindProp, propValue[bindProp]);
         } else {
           setValue(val);
         }
@@ -256,6 +259,7 @@ export default {
 <style lang="scss">
 .z-table-editor {
   .column-editor {
+    padding: 0;
     .cell {
       padding: 2px;
       .el-form-item {