@tongfun/tf-widget 0.1.131 → 0.1.132

package/lib/tf-widget.common.js

@@ -137195,8 +137195,9 @@ const getTableConfig = (el, binding, vNode) => {
 
   vm.$watch(() => {
     return tableInstance.getTableColumn().fullColumn.length;
-  }, () => {
-    initTableConfigList();
+  }, async () => {
+    await initTableConfigList();
+    reloadColumns(el, binding, vNode);
   }, {
     immediate: true
   });
@@ -137218,6 +137219,15 @@ const reloadColumns = (el, binding, vNode) => {
   }
 
   fullColumn.map(column => {
+    const enums = {
+      'checkbox': -2,
+      'index': -1
+    };
+
+    if (Object.keys(enums).indexOf(column.type)) {
+      column.fieldIndex = enums[column.type];
+    }
+
     const current = configData.find(d => d.field === column.property);
 
     if (current) {
@@ -137263,12 +137273,15 @@ const umyTableSetting = {
 
     let init = false;
     const vm = vNode.context;
-    const tableInstance = vNode.componentInstance; // 动态列组件生成
+    const tableInstance = vNode.componentInstance; // 表格设置组件生成
 
     const header = vm.$createElement('i', {
       class: 'el-icon-setting',
       style: {
-        cursor: 'pointer'
+        'display': 'flex',
+        'cursor': 'pointer',
+        'align-items': 'center',
+        'justify-content': 'center'
       },
       on: {
         click() {
@@ -137294,16 +137307,32 @@ const umyTableSetting = {
 
       if (newVal !== 0 && !init) {
         init = true;
-        const columns = tableInstance.getTableColumn().fullColumn; // 动态列组件挂载
+        const columns = tableInstance.getTableColumn().fullColumn;
+        const settingColumn = columns.find(d => d.type === 'index'); // 表格设置组件挂载
 
-        tableInstance.loadColumn([...columns, {
-          fixed: 'right',
-          align: 'center',
-          width: '60',
-          slots: {
-            header: () => [header]
-          }
-        }]);
+        if (settingColumn) {
+          columns.splice(columns.findIndex(d => d.type === 'index'), 1);
+          tableInstance.loadColumn([...columns, { ...settingColumn,
+            width: '40',
+            slots: {
+              header: () => [header]
+            }
+          }]);
+        } else {
+          tableInstance.loadColumn([...columns, {
+            fixed: 'left',
+            align: 'center',
+            type: 'index',
+            width: '40',
+            slots: {
+              header: () => [header]
+            }
+          }]);
+        }
+
+        vm.$nextTick(() => {
+          console.log(tableInstance.getTableColumn().fullColumn);
+        });
       }
     }, {
       immediate: true
@@ -152218,7 +152247,6 @@ if (typeof window !== 'undefined') {
 
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(3797);
-var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/t-input/index.vue?vue&type=template&id=454d6aaf&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.entity || _vm.notForm)?_c(_vm.typeRelations[_vm.type],_vm._b({tag:"component",class:['common-input' ,_vm.entity?'no-border': ''],attrs:{"value":_vm.value,"target":_vm.target,"show-field":_vm.showField,"common-flag":_vm.commonFlag,"append-to-body":_vm.notFormBasicAppendBody,"modal-append-to-body":true},on:{"selected":_vm.handleSelected,"handleSelected":_vm.handleSelected,"input":_vm.handleInput,"isDel":_vm.handleDel,"change":_vm.handleChange,"delete":function($event){return _vm.$emit('delete')},"suggestSelected":function($event){return _vm.$emit('suggestSelected',$event)},"basicConfigLoad":function($event){return _vm.$emit('basicConfigLoad',$event)}}},'component',_vm.property,false)):_c('el-form-item',{attrs:{"label-width":_vm.labelWidth,"prop":_vm.prop},scopedSlots:_vm._u([{key:"label",fn:function(){return [_c('el-tooltip',{attrs:{"effect":"dark","content":_vm.title,"placement":"top"}},[_c('span',[_vm._v(_vm._s(_vm.title))])])]},proxy:true}])},[(_vm.type !== 'basicCus')?_c(_vm.typeRelations[_vm.type],_vm._b({tag:"component",staticClass:"common-input",attrs:{"value":_vm.value,"target":_vm.target,"show-field":_vm.showField,"common-flag":_vm.commonFlag,"append-to-body":true,"modal-append-to-body":false},on:{"isDel":_vm.handleDel,"selected":_vm.handleSelected,"handleSelected":_vm.handleSelected,"input":_vm.handleInput,"change":_vm.handleChange,"delete":function($event){return _vm.$emit('delete')},"suggestSelected":function($event){return _vm.$emit('suggestSelected',$event)}}},'component',_vm.property,false)):_vm._e(),_vm._t("default")],2)],1)}
 var staticRenderFns = []
@@ -232759,14 +232787,14 @@ var tf_basic_table_list = __webpack_require__(6816);
 
 
 
-external_commonjs_vue_commonjs2_vue_root_Vue_default().directive('umy-column-width', directives/* umyColumnWidth */.AB);
-external_commonjs_vue_commonjs2_vue_root_Vue_default().directive('umy-table-setting', directives/* umyTableSetting */.b$);
 const components = [package_t_input, svg_icon, package_tf_widget, package_tf_layout, package_form_body, t_data_list, package_tf_icon_picker, package_form_body_item, package_form_body_item_custom, tf_input/* default */.Z, tf_table/* default */.Z, tf_vxe_table, tf_splitter/* default */.Z, tf_tab_table/* default */.Z, tf_form_body, tf_table_list, tf_plan_filter/* default */.Z, tf_button_group/* default */.Z, tf_fuzzy_search/* default */.Z, tf_ag_grid_table/* default */.Z, tf_form_body_item, tf_condition_input/* default */.Z, tf_basic_table_list/* default */.Z, tf_print_render];
 
 const install = function (Vue) {
   components.forEach(component => {
     Vue.component(component.name, component);
   });
+  Vue.directive('umyColumnWidth', directives/* umyColumnWidth */.AB);
+  Vue.directive('umyTableSetting', directives/* umyTableSetting */.b$);
 };
 
 /* harmony default export */ var src_0 = ({

package/lib/tf-widget.umd.js

@@ -137205,8 +137205,9 @@ const getTableConfig = (el, binding, vNode) => {
 
   vm.$watch(() => {
     return tableInstance.getTableColumn().fullColumn.length;
-  }, () => {
-    initTableConfigList();
+  }, async () => {
+    await initTableConfigList();
+    reloadColumns(el, binding, vNode);
   }, {
     immediate: true
   });
@@ -137228,6 +137229,15 @@ const reloadColumns = (el, binding, vNode) => {
   }
 
   fullColumn.map(column => {
+    const enums = {
+      'checkbox': -2,
+      'index': -1
+    };
+
+    if (Object.keys(enums).indexOf(column.type)) {
+      column.fieldIndex = enums[column.type];
+    }
+
     const current = configData.find(d => d.field === column.property);
 
     if (current) {
@@ -137273,12 +137283,15 @@ const umyTableSetting = {
 
     let init = false;
     const vm = vNode.context;
-    const tableInstance = vNode.componentInstance; // 动态列组件生成
+    const tableInstance = vNode.componentInstance; // 表格设置组件生成
 
     const header = vm.$createElement('i', {
       class: 'el-icon-setting',
       style: {
-        cursor: 'pointer'
+        'display': 'flex',
+        'cursor': 'pointer',
+        'align-items': 'center',
+        'justify-content': 'center'
       },
       on: {
         click() {
@@ -137304,16 +137317,32 @@ const umyTableSetting = {
 
       if (newVal !== 0 && !init) {
         init = true;
-        const columns = tableInstance.getTableColumn().fullColumn; // 动态列组件挂载
+        const columns = tableInstance.getTableColumn().fullColumn;
+        const settingColumn = columns.find(d => d.type === 'index'); // 表格设置组件挂载
 
-        tableInstance.loadColumn([...columns, {
-          fixed: 'right',
-          align: 'center',
-          width: '60',
-          slots: {
-            header: () => [header]
-          }
-        }]);
+        if (settingColumn) {
+          columns.splice(columns.findIndex(d => d.type === 'index'), 1);
+          tableInstance.loadColumn([...columns, { ...settingColumn,
+            width: '40',
+            slots: {
+              header: () => [header]
+            }
+          }]);
+        } else {
+          tableInstance.loadColumn([...columns, {
+            fixed: 'left',
+            align: 'center',
+            type: 'index',
+            width: '40',
+            slots: {
+              header: () => [header]
+            }
+          }]);
+        }
+
+        vm.$nextTick(() => {
+          console.log(tableInstance.getTableColumn().fullColumn);
+        });
       }
     }, {
       immediate: true
@@ -152228,7 +152257,6 @@ if (typeof window !== 'undefined') {
 
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(7203);
-var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/t-input/index.vue?vue&type=template&id=454d6aaf&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.entity || _vm.notForm)?_c(_vm.typeRelations[_vm.type],_vm._b({tag:"component",class:['common-input' ,_vm.entity?'no-border': ''],attrs:{"value":_vm.value,"target":_vm.target,"show-field":_vm.showField,"common-flag":_vm.commonFlag,"append-to-body":_vm.notFormBasicAppendBody,"modal-append-to-body":true},on:{"selected":_vm.handleSelected,"handleSelected":_vm.handleSelected,"input":_vm.handleInput,"isDel":_vm.handleDel,"change":_vm.handleChange,"delete":function($event){return _vm.$emit('delete')},"suggestSelected":function($event){return _vm.$emit('suggestSelected',$event)},"basicConfigLoad":function($event){return _vm.$emit('basicConfigLoad',$event)}}},'component',_vm.property,false)):_c('el-form-item',{attrs:{"label-width":_vm.labelWidth,"prop":_vm.prop},scopedSlots:_vm._u([{key:"label",fn:function(){return [_c('el-tooltip',{attrs:{"effect":"dark","content":_vm.title,"placement":"top"}},[_c('span',[_vm._v(_vm._s(_vm.title))])])]},proxy:true}])},[(_vm.type !== 'basicCus')?_c(_vm.typeRelations[_vm.type],_vm._b({tag:"component",staticClass:"common-input",attrs:{"value":_vm.value,"target":_vm.target,"show-field":_vm.showField,"common-flag":_vm.commonFlag,"append-to-body":true,"modal-append-to-body":false},on:{"isDel":_vm.handleDel,"selected":_vm.handleSelected,"handleSelected":_vm.handleSelected,"input":_vm.handleInput,"change":_vm.handleChange,"delete":function($event){return _vm.$emit('delete')},"suggestSelected":function($event){return _vm.$emit('suggestSelected',$event)}}},'component',_vm.property,false)):_vm._e(),_vm._t("default")],2)],1)}
 var staticRenderFns = []
@@ -232769,14 +232797,14 @@ var tf_basic_table_list = __webpack_require__(8815);
 
 
 
-external_commonjs_vue_commonjs2_vue_root_Vue_default().directive('umy-column-width', directives/* umyColumnWidth */.AB);
-external_commonjs_vue_commonjs2_vue_root_Vue_default().directive('umy-table-setting', directives/* umyTableSetting */.b$);
 const components = [package_t_input, svg_icon, package_tf_widget, package_tf_layout, package_form_body, t_data_list, package_tf_icon_picker, package_form_body_item, package_form_body_item_custom, tf_input/* default */.Z, tf_table/* default */.Z, tf_vxe_table, tf_splitter/* default */.Z, tf_tab_table/* default */.Z, tf_form_body, tf_table_list, tf_plan_filter/* default */.Z, tf_button_group/* default */.Z, tf_fuzzy_search/* default */.Z, tf_ag_grid_table/* default */.Z, tf_form_body_item, tf_condition_input/* default */.Z, tf_basic_table_list/* default */.Z, tf_print_render];
 
 const install = function (Vue) {
   components.forEach(component => {
     Vue.component(component.name, component);
   });
+  Vue.directive('umyColumnWidth', directives/* umyColumnWidth */.AB);
+  Vue.directive('umyTableSetting', directives/* umyTableSetting */.b$);
 };
 
 /* harmony default export */ var src_0 = ({