el-plus-crud 0.1.13 → 0.1.14

package/example/App.vue

@@ -1,252 +1,252 @@
-<template>
-  <el-config-provider :locale="zhCn">
-    <div class="layout-padding">
-      <ElPlusTable ref="listTableRef" :tableConfig="tableConfig" colMinWidth="100px" :isIndex="false" headerAlign="center"></ElPlusTable>
-
-      <ElPlusFormGroup v-model="formData" :formGroup="formGroupConfig">
-        <template #default0>default0插槽</template>
-        <template #default1>default1插槽</template>
-        <template #default2>default2插槽</template>
-      </ElPlusFormGroup>
-    </div>
-  </el-config-provider>
-</template>
-
-<script setup lang="ts" name="systemUser">
-import { reactive, ref, onMounted } from 'vue'
-import zhCn from 'element-plus/es/locale/lang/zh-cn'
-import { ElMessage } from 'element-plus'
-import { IFormBack, IFormDesc, IFormGroupConfig, ITableConfig } from 'types'
-
-let formData = reactive({
-  name: ''
-} as any)
-const formGroupConfig = ref({
-  column: 2,
-  // requestFn: () => {},
-  beforeRequest: (data: any) => {
-    return data
-  },
-  success: (formBack: IFormBack) => {
-    ElMessage.success('保存成功~')
-    // 表单回调
-    formBack.callBack && formBack.callBack()
-  },
-  group: [
-    {
-      title: '基本信息',
-      formDesc: {
-        name: { type: 'input', label: '名称', require: true, attrs: { maxlength: 30 } },
-        contactsName: { type: 'input', label: '联系人', require: true, attrs: { maxlength: 20 } },
-        contactsPhone: { type: 'input', label: '联系电话', rules: 'phone', require: true }
-      } as IFormDesc
-    },
-    {
-      title: '地址信息',
-      formDesc: {
-        // _area: { type: 'area', label: '所在地区', require: true },
-        address: { type: 'input', label: '详细地址', require: true, attrs: { maxlength: 50 } }
-      } as IFormDesc
-    },
-    // {
-    //   title: '文件上传',
-    //   formDesc: {
-    //     businessLicense: { type: 'upload', label: '营业执照', require: true, colspan: 2 },
-    //     appendix: { type: 'upload', upType: 'file', label: '附件', multiple: true, require: true, colspan: 2 }
-    //   } as IFormDesc
-    // },
-    {
-      title: '备注信息',
-      formDesc: {
-        remark: { type: 'textarea', label: '备注', colspan: 2, require: true }
-      } as IFormDesc
-    }
-  ]
-} as IFormGroupConfig)
-
-const tableConfig = ref({
-  // fetch: queryDistributorPage,
-  // tbName: 'goodsList',
-  column: [
-    { prop: 'distributorName', label: '二级企业名称', width: '120px', fixed: 'left' },
-    { prop: 'distributorName', label: '经营主体', width: '160px', fixed: 'left' },
-    {
-      label: '合同执行',
-      children: [
-        {
-          label: '采购业务',
-          children: [
-            {
-              label: '本月发生',
-              children: [
-                { prop: 'goodsName', label: '数量（万吨）' },
-                { prop: 'goodsName', label: '金额（万元）' }
-              ]
-            },
-            {
-              label: '本年累计数',
-              children: [
-                {
-                  label: '上游供应',
-                  children: [
-                    { prop: 'goodsName', label: '区域' },
-                    { prop: 'goodsName', label: '供应方性质' }
-                  ]
-                },
-                {
-                  label: '数量（万吨）',
-                  children: [
-                    { prop: 'goodsName', label: '数值' },
-                    { prop: 'goodsName', label: '去年金额' },
-                    { prop: 'goodsName', label: '同比' }
-                  ]
-                },
-                {
-                  label: '金额（万元）',
-                  children: [
-                    { prop: 'goodsName', label: '数值' },
-                    { prop: 'goodsName', label: '去年金额' },
-                    { prop: 'goodsName', label: '同比' }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          label: '销售业务',
-          children: [
-            {
-              label: '本月发生',
-              children: [
-                { prop: 'goodsName', label: '数量（万吨）' },
-                { prop: 'goodsName', label: '金额（万元）' }
-              ]
-            },
-            {
-              label: '本年累计数',
-              children: [
-                {
-                  label: '上游供应',
-                  children: [
-                    { prop: 'goodsName', label: '区域' },
-                    { prop: 'goodsName', label: '供应方性质' }
-                  ]
-                },
-                {
-                  label: '数量（万吨）',
-                  children: [
-                    { prop: 'goodsName', label: '数值' },
-                    { prop: 'goodsName', label: '去年金额' },
-                    { prop: 'goodsName', label: '同比' }
-                  ]
-                },
-                {
-                  label: '金额（万元）',
-                  children: [
-                    { prop: 'goodsName', label: '数值' },
-                    { prop: 'goodsName', label: '去年金额' },
-                    { prop: 'goodsName', label: '同比' }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      label: '财务数据',
-      children: [
-        {
-          label: '营业收入',
-          children: [
-            {
-              label: '本月发生',
-              children: [
-                { prop: 'goodsName', label: '数量（万吨）' },
-                { prop: 'goodsName', label: '金额（万元）' }
-              ]
-            },
-            {
-              label: '本年累计数',
-              children: [
-                { prop: 'goodsName', label: '数量（万吨）' },
-                { prop: 'goodsName', label: '金额（万元）' },
-                { prop: 'goodsName', label: '去年金额' },
-                { prop: 'goodsName', label: '同比' }
-              ]
-            }
-          ]
-        },
-        {
-          label: '营业成本',
-          children: [
-            {
-              label: '本月发生',
-              children: [
-                { prop: 'goodsName', label: '数量（万吨）' },
-                { prop: 'goodsName', label: '金额（万元）' }
-              ]
-            },
-            {
-              label: '本年累计数',
-              children: [
-                { prop: 'goodsName', label: '数量（万吨）' },
-                { prop: 'goodsName', label: '金额（万元）' },
-                { prop: 'goodsName', label: '去年金额' },
-                { prop: 'goodsName', label: '同比' }
-              ]
-            }
-          ]
-        },
-        {
-          label: '业务毛利率',
-          children: [
-            { prop: 'goodsName', label: '数值' },
-            { prop: 'goodsName', label: '去年数值' },
-            { prop: 'goodsName', label: '同比' }
-          ]
-        },
-        {
-          label: '营业利润',
-          children: [
-            { prop: 'goodsName', label: '金额（万元）' },
-            { prop: 'goodsName', label: '去年金额' },
-            { prop: 'goodsName', label: '同比' }
-          ]
-        }
-      ]
-    },
-    {
-      label: '操作',
-      fixed: 'right',
-      type: 'btns',
-      btns: []
-    }
-  ],
-  queryMap: {},
-  toolbar: {
-    // 功能按钮列表
-    btns: [{ label: '新增商品', type: 'add', on: { click: () => {} } }],
-    formConfig: {
-      beforeRequest: (data: any) => {
-        if (data.goodsKinds) {
-          data.goodsKinds = data.goodsKinds[data.goodsKinds.length - 1]
-        }
-        return data
-      },
-      formDesc: {
-        searchKey: { type: 'input', label: '输入查询', placeholder: '物料编码、商品条码、商品名称、自编码、属性' }
-        // enabled: { type: 'select', label: '状态', options: 'enabledList' }
-      }
-    }
-    // 导出信息
-    // export: { url: exportUrl, name: '商品信息导出' }
-  }
-} as ITableConfig)
-
-onMounted(async () => {
-  // 初始化部门列表
-})
-</script>
+<template>
+  <el-config-provider :locale="zhCn">
+    <div class="layout-padding">
+      <ElPlusTable ref="listTableRef" :tableConfig="tableConfig" colMinWidth="100px" :isIndex="false" headerAlign="center"></ElPlusTable>
+
+      <ElPlusFormGroup v-model="formData" :formGroup="formGroupConfig">
+        <template #default0>default0插槽</template>
+        <template #default1>default1插槽</template>
+        <template #default2>default2插槽</template>
+      </ElPlusFormGroup>
+    </div>
+  </el-config-provider>
+</template>
+
+<script setup lang="ts" name="systemUser">
+import { reactive, ref, onMounted } from 'vue'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
+import { ElMessage } from 'element-plus'
+import { IFormBack, IFormDesc, IFormGroupConfig, ITableConfig } from 'types'
+
+let formData = reactive({
+  name: ''
+} as any)
+const formGroupConfig = ref({
+  column: 2,
+  // requestFn: () => {},
+  beforeRequest: (data: any) => {
+    return data
+  },
+  success: (formBack: IFormBack) => {
+    ElMessage.success('保存成功~')
+    // 表单回调
+    formBack.callBack && formBack.callBack()
+  },
+  group: [
+    {
+      title: '基本信息',
+      formDesc: {
+        name: { type: 'input', label: '名称', require: true, attrs: { maxlength: 30 } },
+        contactsName: { type: 'input', label: '联系人', require: true, attrs: { maxlength: 20 } },
+        contactsPhone: { type: 'input', label: '联系电话', rules: 'phone', require: true }
+      } as IFormDesc
+    },
+    {
+      title: '地址信息',
+      formDesc: {
+        // _area: { type: 'area', label: '所在地区', require: true },
+        address: { type: 'input', label: '详细地址', require: true, attrs: { maxlength: 50 } }
+      } as IFormDesc
+    },
+    // {
+    //   title: '文件上传',
+    //   formDesc: {
+    //     businessLicense: { type: 'upload', label: '营业执照', require: true, colspan: 2 },
+    //     appendix: { type: 'upload', upType: 'file', label: '附件', multiple: true, require: true, colspan: 2 }
+    //   } as IFormDesc
+    // },
+    {
+      title: '备注信息',
+      formDesc: {
+        remark: { type: 'textarea', label: '备注', colspan: 2, require: true }
+      } as IFormDesc
+    }
+  ]
+} as IFormGroupConfig)
+
+const tableConfig = ref({
+  // fetch: queryDistributorPage,
+  // tbName: 'goodsList',
+  column: [
+    { prop: 'distributorName', label: '二级企业名称', width: '120px', fixed: 'left' },
+    { prop: 'distributorName', label: '经营主体', width: '160px', fixed: 'left' },
+    {
+      label: '合同执行',
+      children: [
+        {
+          label: '采购业务',
+          children: [
+            {
+              label: '本月发生',
+              children: [
+                { prop: 'goodsName', label: '数量（万吨）' },
+                { prop: 'goodsName', label: '金额（万元）' }
+              ]
+            },
+            {
+              label: '本年累计数',
+              children: [
+                {
+                  label: '上游供应',
+                  children: [
+                    { prop: 'goodsName', label: '区域' },
+                    { prop: 'goodsName', label: '供应方性质' }
+                  ]
+                },
+                {
+                  label: '数量（万吨）',
+                  children: [
+                    { prop: 'goodsName', label: '数值' },
+                    { prop: 'goodsName', label: '去年金额' },
+                    { prop: 'goodsName', label: '同比' }
+                  ]
+                },
+                {
+                  label: '金额（万元）',
+                  children: [
+                    { prop: 'goodsName', label: '数值' },
+                    { prop: 'goodsName', label: '去年金额' },
+                    { prop: 'goodsName', label: '同比' }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          label: '销售业务',
+          children: [
+            {
+              label: '本月发生',
+              children: [
+                { prop: 'goodsName', label: '数量（万吨）' },
+                { prop: 'goodsName', label: '金额（万元）' }
+              ]
+            },
+            {
+              label: '本年累计数',
+              children: [
+                {
+                  label: '上游供应',
+                  children: [
+                    { prop: 'goodsName', label: '区域' },
+                    { prop: 'goodsName', label: '供应方性质' }
+                  ]
+                },
+                {
+                  label: '数量（万吨）',
+                  children: [
+                    { prop: 'goodsName', label: '数值' },
+                    { prop: 'goodsName', label: '去年金额' },
+                    { prop: 'goodsName', label: '同比' }
+                  ]
+                },
+                {
+                  label: '金额（万元）',
+                  children: [
+                    { prop: 'goodsName', label: '数值' },
+                    { prop: 'goodsName', label: '去年金额' },
+                    { prop: 'goodsName', label: '同比' }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      label: '财务数据',
+      children: [
+        {
+          label: '营业收入',
+          children: [
+            {
+              label: '本月发生',
+              children: [
+                { prop: 'goodsName', label: '数量（万吨）' },
+                { prop: 'goodsName', label: '金额（万元）' }
+              ]
+            },
+            {
+              label: '本年累计数',
+              children: [
+                { prop: 'goodsName', label: '数量（万吨）' },
+                { prop: 'goodsName', label: '金额（万元）' },
+                { prop: 'goodsName', label: '去年金额' },
+                { prop: 'goodsName', label: '同比' }
+              ]
+            }
+          ]
+        },
+        {
+          label: '营业成本',
+          children: [
+            {
+              label: '本月发生',
+              children: [
+                { prop: 'goodsName', label: '数量（万吨）' },
+                { prop: 'goodsName', label: '金额（万元）' }
+              ]
+            },
+            {
+              label: '本年累计数',
+              children: [
+                { prop: 'goodsName', label: '数量（万吨）' },
+                { prop: 'goodsName', label: '金额（万元）' },
+                { prop: 'goodsName', label: '去年金额' },
+                { prop: 'goodsName', label: '同比' }
+              ]
+            }
+          ]
+        },
+        {
+          label: '业务毛利率',
+          children: [
+            { prop: 'goodsName', label: '数值' },
+            { prop: 'goodsName', label: '去年数值' },
+            { prop: 'goodsName', label: '同比' }
+          ]
+        },
+        {
+          label: '营业利润',
+          children: [
+            { prop: 'goodsName', label: '金额（万元）' },
+            { prop: 'goodsName', label: '去年金额' },
+            { prop: 'goodsName', label: '同比' }
+          ]
+        }
+      ]
+    },
+    {
+      label: '操作',
+      fixed: 'right',
+      type: 'btns',
+      btns: []
+    }
+  ],
+  queryMap: {},
+  toolbar: {
+    // 功能按钮列表
+    btns: [{ label: '新增商品', type: 'add', on: { click: () => {} } }],
+    formConfig: {
+      beforeRequest: (data: any) => {
+        if (data.goodsKinds) {
+          data.goodsKinds = data.goodsKinds[data.goodsKinds.length - 1]
+        }
+        return data
+      },
+      formDesc: {
+        searchKey: { type: 'input', label: '输入查询', placeholder: '物料编码、商品条码、商品名称、自编码、属性' }
+        // enabled: { type: 'select', label: '状态', options: 'enabledList' }
+      }
+    }
+    // 导出信息
+    // export: { url: exportUrl, name: '商品信息导出' }
+  }
+} as ITableConfig)
+
+onMounted(async () => {
+  // 初始化部门列表
+})
+</script>

package/example/main.js

@@ -1,18 +1,18 @@
-import { createApp } from 'vue'
-import './style.css'
-import App from './App.vue'
-
-import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
-
-import ElPlusCurd from '@/index'
-
-const app = createApp(App)
-
-// import(/* webpackChunkName: "ElPlusCurd" */ '@/index').then((components) => {
-//   app.use(components.default)
-// })
-
-app.use(ElPlusCurd)
-
-app.use(ElementPlus).mount('#app')
+import { createApp } from 'vue'
+import './style.css'
+import App from './App.vue'
+
+import ElementPlus from 'element-plus'
+import 'element-plus/dist/index.css'
+
+import ElPlusCurd from '@/index'
+
+const app = createApp(App)
+
+// import(/* webpackChunkName: "ElPlusCurd" */ '@/index').then((components) => {
+//   app.use(components.default)
+// })
+
+app.use(ElPlusCurd)
+
+app.use(ElementPlus).mount('#app')

package/example/style.css

@@ -1,5 +1,5 @@
-html,body,#app {
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
+html,body,#app {
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
 }

package/index.html

@@ -1,13 +1,13 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Vue</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/example/main.js"></script>
-  </body>
-</html>
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + Vue</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/example/main.js"></script>
+  </body>
+</html>

package/lib/components/el-plus-form/ElPlusForm.vue

@@ -533,13 +533,10 @@ const handelValToForm = (desc: IFormDescItem, field: string, val: any) => {
     if (val && val.length === 2) {
       const startTimeKey = desc.startTimeKey ? desc.startTimeKey : desc.propPrefix ? desc.propPrefix + 'StartTime' : 'startTime'
       const endTimeKey = desc.endTimeKey ? desc.endTimeKey : desc.propPrefix ? desc.propPrefix + 'EndTime' : 'endTime'
-      result[startTimeKey] = val[0]
-      if (typeof val[1] === 'string') {
-        result[endTimeKey] = new Date(val[1]).getTime()
-      } else {
-        result[endTimeKey] = val[1]
-      }
-      result[endTimeKey] = result[endTimeKey] + (24 * 60 * 60 - 1) * 1000
+      // 获取0点数据
+      result[startTimeKey] = new Date(new Date(val[0]).setHours(0, 0, 0, 0))
+      // 获取每天结束时间
+      result[endTimeKey] = new Date(new Date(val[1]).setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1)
       // 再处理一下时间戳
       result[startTimeKey] = time(result[startTimeKey], desc.valueFormat)
       result[endTimeKey] = time(result[endTimeKey], desc.valueFormat)