releases 4.0.12

x-extends · Jun 13, 2024 · 706df3d · 706df3d
1 parent 5b9a499
commit 706df3d
Show file tree

Hide file tree

Showing 35 changed files with 578 additions and 554 deletions.
diff --git a/README.en.md b/README.en.md
@@ -39,7 +39,7 @@ A [vue](https://www.npmjs.com/package/vue) based PC side component library.
 * [x] col 列
 * [ ] collapse 展开面板
 * [ ] collapse-pane 展开面板-容器
-* [x] date-input 日期选择器
+* [x] date-picker 日期选择器
 * [x] drawer 抽屉
 * [ ] flow-design 流程设计器
 * [ ] flow-view 流程设计器-视图渲染

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@
 * [x] col 列
 * [ ] collapse 展开面板
 * [ ] collapse-pane 展开面板-容器
-* [x] date-input 日期选择器
+* [x] date-picker 日期选择器
 * [x] drawer 抽屉
 * [ ] flow-design 流程设计器
 * [ ] flow-view 流程设计器-视图渲染
@@ -112,8 +112,8 @@ createApp(App).use(VxeUI).mount('#app')
 
 该群供大家交流問題，如果群人数已满，将会不定期剔除不活跃的。  
 
-![qq](https://vxetable.cn/static/donation/qq1.png)
-![qq](https://vxetable.cn/static/donation/qq2.png)
+![qq](https://vxeui.com/static/donation/qq1.png)
+![qq](https://vxeui.com/static/donation/qq2.png)
 
 ## 运行项目
 

diff --git a/README.zh-TW.md b/README.zh-TW.md
@@ -39,7 +39,7 @@
 * [x] col 列
 * [ ] collapse 展开面板
 * [ ] collapse-pane 展开面板-容器
-* [x] date-input 日期选择器
+* [x] date-picker 日期选择器
 * [x] drawer 抽屉
 * [ ] flow-design 流程设计器
 * [ ] flow-view 流程设计器-视图渲染

diff --git a/examples/App.vue b/examples/App.vue
@@ -57,7 +57,7 @@ const navList = ref([
   { name: 'InputTest', routerLink: { name: 'InputTest' } },
   { name: 'NumberInputTest', routerLink: { name: 'NumberInputTest' } },
   { name: 'PasswordInputTest', routerLink: { name: 'PasswordInputTest' } },
-  { name: 'DateInputTest', routerLink: { name: 'DateInputTest' } },
+  { name: 'DatePickerTest', routerLink: { name: 'DatePickerTest' } },
   { name: 'TextareaTest', routerLink: { name: 'TextareaTest' } },
   { name: 'SwitchTest', routerLink: { name: 'SwitchTest' } },
   { name: 'SelectTest', routerLink: { name: 'SelectTest' } },

diff --git a/examples/router/index.ts b/examples/router/index.ts
@@ -141,9 +141,9 @@ const routes: Array<RouteRecordRaw> = [
     component: () => import('../views/password-input/PasswordInputTest.vue')
   },
   {
-    path: '/component/date-input',
-    name: 'DateInputTest',
-    component: () => import('../views/date-input/DateInputTest.vue')
+    path: '/component/date-picker',
+    name: 'DatePickerTest',
+    component: () => import('../views/date-picker/DatePickerTest.vue')
   },
   {
     path: '/component/textarea',

diff --git a/examples/views/date-input/DateInputTest.vue → ...ples/views/date-picker/DatePickerTest.vue b/examples/views/date-input/DateInputTest.vue → ...ples/views/date-picker/DatePickerTest.vue
@@ -1,65 +1,65 @@
 <template>
   <div>
     <p>
-      <vxe-date-input v-model="demo1.value100" placeholder="默认尺寸"></vxe-date-input>
-      <vxe-date-input v-model="demo1.value101" placeholder="中等尺寸" size="medium"></vxe-date-input>
-      <vxe-date-input v-model="demo1.value102" placeholder="小型尺寸" size="small"></vxe-date-input>
-      <vxe-date-input v-model="demo1.value103" placeholder="超小尺寸" size="mini"></vxe-date-input>
+      <vxe-date-picker v-model="demo1.value100" placeholder="默认尺寸"></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value101" placeholder="中等尺寸" size="medium"></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value102" placeholder="小型尺寸" size="small"></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value103" placeholder="超小尺寸" size="mini"></vxe-date-picker>
     </p>
 
     <p>
-      <vxe-date-input v-model="demo1.value400" placeholder="日期选择" type="date" parse-format="yyyy-dd-MM"></vxe-date-input>
-      <vxe-date-input v-model="demo1.value401" placeholder="周选择" type="week" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value402" placeholder="月选择" type="month" valueFormat="yyyy-MM-dd"></vxe-date-input>
-      <vxe-date-input v-model="demo1.value403" placeholder="季选择" type="quarter" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value404" placeholder="年选择" type="year" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value405" placeholder="时间选择" type="time" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value406" placeholder="日期和时间选择" type="datetime" transfer></vxe-date-input>
-      <vxe-date-input v-model="demo1.value407" placeholder="禁用日期" type="date" :disabled-method="disabledDateMethod" transfer></vxe-date-input>
-      <vxe-date-input v-model="demo1.value408" placeholder="小圆点" type="date" :festival-method="festivalNoticeMethod" transfer></vxe-date-input>
-      <vxe-date-input v-model="demo1.value409" placeholder="农历节日" type="date" :festival-method="festivalCalendarMethod" transfer></vxe-date-input>
+      <vxe-date-picker v-model="demo1.value400" placeholder="日期选择" type="date" parse-format="yyyy-dd-MM"></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value401" placeholder="周选择" type="week" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value402" placeholder="月选择" type="month" valueFormat="yyyy-MM-dd"></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value403" placeholder="季选择" type="quarter" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value404" placeholder="年选择" type="year" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value405" placeholder="时间选择" type="time" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value406" placeholder="日期和时间选择" type="datetime" transfer></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value407" placeholder="禁用日期" type="date" :disabled-method="disabledDateMethod" transfer></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value408" placeholder="小圆点" type="date" :festival-method="festivalNoticeMethod" transfer></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value409" placeholder="农历节日" type="date" :festival-method="festivalCalendarMethod" transfer></vxe-date-picker>
     </p>
 
     <p>
-      <vxe-date-input v-model="demo1.value800" placeholder="日期多选" type="date" multiple></vxe-date-input>
-      <vxe-date-input v-model="demo1.value801" placeholder="日期多选" type="month" multiple></vxe-date-input>
-      <vxe-date-input v-model="demo1.value802" placeholder="日期多选" type="quarter" multiple></vxe-date-input>
-      <vxe-date-input v-model="demo1.value803" placeholder="日期多选" type="year" multiple></vxe-date-input>
-      <vxe-date-input v-model="demo1.value804" placeholder="日期多选" type="week" multiple></vxe-date-input>
-      <vxe-date-input v-model="demo1.value805" placeholder="日期多选" type="datetime" multiple></vxe-date-input>
+      <vxe-date-picker v-model="demo1.value800" placeholder="日期多选" type="date" multiple></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value801" placeholder="日期多选" type="month" multiple></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value802" placeholder="日期多选" type="quarter" multiple></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value803" placeholder="日期多选" type="year" multiple></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value804" placeholder="日期多选" type="week" multiple></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value805" placeholder="日期多选" type="datetime" multiple></vxe-date-picker>
     </p>
 
     <p>
-      <vxe-date-input v-model="demo1.value701" placeholder="周选择" type="week" :start-day="0" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value702" placeholder="周选择" type="week" :start-day="1" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value703" placeholder="周选择" type="week" :start-day="2" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value704" placeholder="周选择" type="week" :start-day="3" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value705" placeholder="周选择" type="week" :start-day="4" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value706" placeholder="周选择" type="week" :start-day="5" clearable></vxe-date-input>
-      <vxe-date-input v-model="demo1.value707" placeholder="周选择" type="week" :start-day="6" clearable></vxe-date-input>
+      <vxe-date-picker v-model="demo1.value701" placeholder="周选择" type="week" :start-day="0" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value702" placeholder="周选择" type="week" :start-day="1" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value703" placeholder="周选择" type="week" :start-day="2" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value704" placeholder="周选择" type="week" :start-day="3" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value705" placeholder="周选择" type="week" :start-day="4" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value706" placeholder="周选择" type="week" :start-day="5" clearable></vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value707" placeholder="周选择" type="week" :start-day="6" clearable></vxe-date-picker>
     </p>
 
     <p>
-      <vxe-date-input v-model="demo1.value600" placeholder="自定义前缀图标">
+      <vxe-date-picker v-model="demo1.value600" placeholder="自定义前缀图标">
         <template #prefix>
           <i class="fa fa-search my-red"></i>
         </template>
-      </vxe-date-input>
-      <vxe-date-input v-model="demo1.value601" placeholder="自定义后缀图标">
+      </vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value601" placeholder="自定义后缀图标">
         <template #suffix>
           <i class="fa fa-search my-green"></i>
         </template>
-      </vxe-date-input>
-      <vxe-date-input v-model="demo1.value602" class="my-domain" placeholder="自定义前缀模板">
+      </vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value602" class="my-domain" placeholder="自定义前缀模板">
         <template #prefix>
           <span>Http://</span>
         </template>
-      </vxe-date-input>
-      <vxe-date-input v-model="demo1.value603" class="my-search" placeholder="自定义后缀模板">
+      </vxe-date-picker>
+      <vxe-date-picker v-model="demo1.value603" class="my-search" placeholder="自定义后缀模板">
         <template #suffix>
           <i class="fa fa-search"></i>
         </template>
-      </vxe-date-input>
+      </vxe-date-picker>
     </p>
   </div>
 </template>

diff --git a/examples/views/modal/ModalTest.vue b/examples/views/modal/ModalTest.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <p>
       <vxe-button content="默认消息框" @click="openMessage({ content: '消息提示' })"></vxe-button>
       <vxe-button content="info" @click="openMessage({ content: 'info 消息提示', status: 'info' })"></vxe-button>
@@ -200,6 +201,9 @@
       </vxe-modal>
     </p>
 
+    <p>
+    <vxe-button content="点击弹出" @click="openEvent"></vxe-button>
+    </p>
   </div>
 </template>
 
@@ -305,4 +309,20 @@ const openNotification = (options: VxeModalDefines.ModalOptions) => {
 const openAlert = (options: VxeModalDefines.ModalOptions) => {
   VxeUI.modal.alert(options)
 }
+
+let num = 1
+
+const openEvent = () => {
+  VxeUI.modal.open({
+    title: `标题 ${num}`,
+    content: `我是第 ${num} 个`,
+    mask: false,
+    lockView: false,
+    escClosable: true,
+    width: 600,
+    height: 400,
+    showZoom: true
+  })
+  num++
+}
 </script>
diff --git a/gulpfile.js b/gulpfile.js
@@ -45,7 +45,7 @@ const componentList = [
   'col',
   'collapse',
   'collapse-pane',
-  'date-input',
+  'date-picker',
   'drawer',
   'flow-design',
   'flow-view',

diff --git a/helper/vetur/attributes.json b/helper/vetur/attributes.json
diff --git a/helper/vetur/tags.json b/helper/vetur/tags.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "A vue based PC side component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -25,7 +25,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "@vxe-ui/core": "^1.0.0"
+    "@vxe-ui/core": "^1.0.1"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

diff --git a/packages/components.ts b/packages/components.ts
@@ -18,7 +18,7 @@ import VxeCheckboxGroup from './checkbox-group'
 import VxeCol from './col'
 import VxeCollapse from './collapse'
 import VxeCollapsePane from './collapse-pane'
-import VxeDateInput from './date-input'
+import VxeDatePicker from './date-picker'
 import VxeDrawer, { DrawerController } from './drawer'
 import VxeForm from './form'
 import VxeFormDesign from './form-design'
@@ -84,7 +84,7 @@ const components = [
   VxeCol,
   VxeCollapse,
   VxeCollapsePane,
-  VxeDateInput,
+  VxeDatePicker,
   VxeDrawer,
   VxeForm,
   VxeFormDesign,
@@ -169,7 +169,7 @@ export * from './checkbox-group'
 export * from './col'
 export * from './collapse'
 export * from './collapse-pane'
-export * from './date-input'
+export * from './date-picker'
 export * from './drawer'
 export * from './form'
 export * from './form-design'

diff --git a/packages/date-input/index.ts b/packages/date-input/index.ts
diff --git a/packages/date-picker/index.ts b/packages/date-picker/index.ts
@@ -0,0 +1,15 @@
+import { App } from 'vue'
+import VxeDatePickerComponent from './src/date-picker'
+import { dynamicApp } from '../dynamics'
+
+export const VxeDatePicker = Object.assign({}, VxeDatePickerComponent, {
+  install (app: App) {
+    app.component(VxeDatePickerComponent.name as string, VxeDatePickerComponent)
+    app.component('VxeDateInput', VxeDatePickerComponent)
+  }
+})
+
+dynamicApp.component(VxeDatePickerComponent.name as string, VxeDatePickerComponent)
+
+export const DatePicker = VxeDatePicker
+export default VxeDatePicker