byt-ui 0.0.16 → 0.0.17

package/README.md

@@ -2,7 +2,7 @@
  * @Description: 
  * @Author: 王国火
  * @Date: 2022-09-15 16:57:23
- * @LastEditTime: 2022-10-25 10:01:51
+ * @LastEditTime: 2023-06-07 09:05:18
  * @LastEditors: 王国火
 -->
 # byt-ui
@@ -26,11 +26,25 @@ import {utils} from "byt-ui"
 
 ## 组件调用示例
 ```html
-<base-view 
-  :table-data="tableData" 
-  :columns="columns"
+  <byt-base-view
+    :label-width="100"
+    :search-list="searchList"
+    :fetch="getTableData"
+    :table-data="tableData"
+    :columns="columns"
+    :pagination="pagination"
+    ref="baseView"
   >
-</base-view>
+    <template #btns>
+      <el-button type="primary" icon="el-icon-plus">新增</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="onClear">初始化表单</el-button>
+    </template>
+
+    <template #actions>
+      <el-button type="text" icon="el-icon-edit">编辑</el-button>
+      <el-button type="text" class="el-button-delete" icon="el-icon-delete">删除</el-button>
+    </template>
+  </byt-base-view>
 ```
 
 ```javascript
@@ -38,11 +52,95 @@ export default {
   name: 'App',
   data(){
     return{
-      tableData:[],
-      columns:[
-        {key:"111",label:"aaa"},
-        {key:"111",label:"bbb"}
-      ]
+      searchList: [
+        {
+          label: '输入框',
+          key: 'input',
+          type: 'input',
+          default:"abc"
+        },
+        {
+          label: '下拉框',
+          key: 'select',
+          type: 'select',
+          default:1,
+          options:[
+            {label:"a",value:1},
+            {label:"b",value:2},
+            {label:"c",value:3},
+            {label:"d",value:4}
+          ]
+        },
+        {
+          label: '级联选择',
+          key: 'cascader',
+          type: 'cascader',
+          default:"yizhi",
+          options:[{
+            value: 'zhinan',
+            label: '指南',
+            children: [{
+              value: 'shejiyuanze',
+              label: '设计原则',
+              children: [{
+                value: 'yizhi',
+                label: '一致'
+              }, {
+                value: 'fankui',
+                label: '反馈'
+              }, {
+                value: 'xiaolv',
+                label: '效率'
+              }, {
+                value: 'kekong',
+                label: '可控'
+              }]
+            }]
+          }]
+        },
+        {
+          label: '年月日',
+          key: 'date',
+          type: 'datepicker',
+          default:moment().format("YYYY-MM-DD")
+        },
+        {
+          label: '年月',
+          key: 'month',
+          type: 'datepicker',
+          fields:"month",
+          default:moment().format("YYYY-MM")
+        },
+        {
+          label: '年',
+          key: 'year',
+          type: 'datepicker',
+          fields:"year",
+          default:moment().format("YYYY")
+        },
+        {
+          label: '日期区间',
+          key: 'daterange',
+          type: 'daterange',
+          default:["2023-06-05","2023-06-07"]
+        }
+      ],
+      tableData: [],
+      columns: [
+        { label: '头像', slot: 'avatar', fixed: 'left' },
+        { label: '用户名', key: 'username', fixed: 'left' },
+        { label: '姓名', key: 'name' },
+        { label: '手机号', key: 'phone' },
+        { label: '昵称', key: 'nickname' },
+        { label: '邮箱', key: 'email' },
+        { label: '状态', slot: 'lockFlag' },
+        { label: '创建时间', key: 'createTime' },
+        { label: '操作', key: 'actions', slot: 'actions', width: 160, fixed: 'right' }
+      ],
+      loading: false,
+      pagination: {
+        total: 0
+      }
     }
   }
 }

package/lib/byt-ui.common.js

@@ -127143,7 +127143,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/basic-view/index.vue?vue&type=template&id=0edabe78&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/basic-view/index.vue?vue&type=template&id=52e02bd1&scoped=true&
 var render = function render() {
   var _vm = this,
       _c = _vm._self._c;
@@ -127161,7 +127161,8 @@ var render = function render() {
     },
     on: {
       "search": _vm.onSearch,
-      "reset": _vm.onReset
+      "reset": _vm.onReset,
+      "init": _vm.init
     },
     model: {
       value: _vm.searchForm,
@@ -127284,8 +127285,8 @@ var render = function render() {
 
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/form-view/index.vue?vue&type=template&id=d9efa21c&scoped=true&
-var form_viewvue_type_template_id_d9efa21c_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/form-view/index.vue?vue&type=template&id=440764bc&scoped=true&
+var form_viewvue_type_template_id_440764bc_scoped_true_render = function render() {
   var _vm = this,
       _c = _vm._self._c;
 
@@ -127398,7 +127399,7 @@ var form_viewvue_type_template_id_d9efa21c_scoped_true_render = function render(
   }, [_vm._v("重置")])], 1)], 2);
 };
 
-var form_viewvue_type_template_id_d9efa21c_scoped_true_staticRenderFns = [];
+var form_viewvue_type_template_id_440764bc_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/moment/moment.js
 var moment = __webpack_require__(30381);
@@ -127526,15 +127527,46 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
           if (v) resolve(v);
         });
       });
+    },
+
+    setDefaultVal(el) {
+      // 处理默认值,可拓展
+      const dval = el.default; // 默认值
+
+      switch (el.type) {
+        case 'input':
+        case 'select':
+          return dval === 0 || dval === '0' ? dval : dval || '';
+
+        case 'inputNumber':
+          return dval === 0 ? dval : dval || null;
+
+        case 'treeSelect':
+          return [];
+
+        default:
+          return dval === 0 || dval === '0' ? dval : dval || '';
+      }
+    },
+
+    formatForm(list) {
+      //有些查询条件初始携带默认值，需要处理；
+      this.form = Object.assign({}, this.form, list.reduce((obj, el) => {
+        obj[el.key] = this.setDefaultVal(el);
+        return obj;
+      }, {}));
+    },
+
+    init() {
+      this.formatForm(this.searchList);
+      this.$emit('init', this.form);
     }
 
   },
   watch: {
-    value: {
-      handler(val) {
-        if (JSON.stringify(val) != JSON.stringify(this.form)) {
-          this.form = Object.assign({}, this.form, val);
-        }
+    searchList: {
+      handler() {
+        this.init();
       },
 
       immediate: true,
@@ -127663,11 +127695,11 @@ function normalizeComponent(
 ;
 var component = normalizeComponent(
   components_form_viewvue_type_script_lang_js_,
-  form_viewvue_type_template_id_d9efa21c_scoped_true_render,
-  form_viewvue_type_template_id_d9efa21c_scoped_true_staticRenderFns,
+  form_viewvue_type_template_id_440764bc_scoped_true_render,
+  form_viewvue_type_template_id_440764bc_scoped_true_staticRenderFns,
   false,
   null,
-  "d9efa21c",
+  "440764bc",
   null
   
 )
@@ -127767,12 +127799,15 @@ var component = normalizeComponent(
     };
   },
 
-  mounted() {
-    // 有些特殊情况需要手动请求列表数据
-    if (this.autoLoad) this.fetchData();
-  },
+  mounted() {},
 
   methods: {
+    init(form) {
+      this.searchForm = Object.assign({}, this.searchForm, form); // 有些特殊情况需要手动请求列表数据
+
+      if (this.autoLoad) this.fetchData();
+    },
+
     onSelectAllEvent(list) {
       /** 多选框全选触发
       * @event checkbox-all
@@ -127841,6 +127876,10 @@ var component = normalizeComponent(
       this.fetchData();
     },
 
+    clear() {
+      this.$refs.search.init();
+    },
+
     onSizeChange(size) {
       this.pageOpt.pageSize = size;
       this.pageOpt.page = 1;
@@ -127854,14 +127893,6 @@ var component = normalizeComponent(
       this.$nextTick(() => {
         this.fetchData();
       });
-    },
-
-    initForm(list) {
-      list.map(v => {
-        if (v.value || v.value == 0) {
-          this.$set(this.searchForm, v.key, v.value);
-        }
-      });
     }
 
   },
@@ -127873,14 +127904,6 @@ var component = normalizeComponent(
         }
       },
 
-      immediate: true,
-      deep: true
-    },
-    searchList: {
-      handler(val) {
-        this.initForm(val);
-      },
-
       immediate: true,
       deep: true
     }
@@ -127888,10 +127911,10 @@ var component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./packages/components/basic-view/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_basic_viewvue_type_script_lang_js_ = (basic_viewvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/basic-view/index.vue?vue&type=style&index=0&id=0edabe78&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/basic-view/index.vue?vue&type=style&index=0&id=52e02bd1&prod&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/components/basic-view/index.vue?vue&type=style&index=0&id=0edabe78&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./packages/components/basic-view/index.vue?vue&type=style&index=0&id=52e02bd1&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./packages/components/basic-view/index.vue
 
@@ -127908,7 +127931,7 @@ var basic_view_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "0edabe78",
+  "52e02bd1",
   null
   
 )