ylyx-cli 1.0.16 → 1.1.1

package/templates/vue-app/files/src/utils/shortcuts.js

@@ -1,210 +1,210 @@
-import Date from './datetime.js';
-let endTime = new Date(new Date(dateToStr(new Date())).getTime() + 1000 * 60 * 60 * 24 - 1);
-// 选择过去时间包含今天
-export const calendarBaseShortcuts = [
-  {
-    text: '今天',
-    onClick(picker) {
-      const date = new Date(dateToStr(new Date()));
-      picker.$emit('pick', [date, endTime]);
-    },
-  },
-  {
-    text: '昨天',
-    onClick(picker) {
-      const start = new Date(dateToStr(new Date())).daysAgo(1);
-      picker.$emit('pick', [start, endTime.daysAgo(1)]);
-    },
-  },
-  {
-    text: '最近一周',
-    onClick(picker) {
-      const start = new Date(dateToStr(new Date())).daysAgo(6);
-      picker.$emit('pick', [start, endTime]);
-    },
-  },
-  {
-    text: '最近30天',
-    onClick(picker) {
-      const start = new Date(dateToStr(new Date())).daysAgo(29);
-      picker.$emit('pick', [start, endTime]);
-    },
-  },
-  {
-    text: '这个月',
-    onClick(picker) {
-      const start = new Date(dateToStr(new Date())).monthBegin();
-      picker.$emit('pick', [start, endTime]);
-    },
-  },
-  {
-    text: '本季度',
-    onClick(picker) {
-      const start = new Date(dateToStr(new Date())).quarterBegin();
-      picker.$emit('pick', [start, endTime]);
-    },
-  },
-];
-
-export const calendarMoveShortcuts = [
-  {
-    text: '‹ 往前一天 ',
-    onClick(picker) {
-      console.log(picker.value);
-      if (picker.value === undefined) {
-        picker.value = [new Date(dateToStr(new Date())), endTime];
-      }
-      const start = picker.value[0].daysAgo(1);
-      const end = picker.value[1].daysAgo(1);
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: ' 往后一天 ›',
-    onClick(picker) {
-      let start = new Date(dateToStr(new Date()));
-      let end = endTime;
-      if (picker.value === undefined) {
-        picker.value = [start, end];
-      }
-      if (picker.value.length > 0) {
-        if (end - picker.value[1] > 8.64e7) {
-          start = picker.value[0].daysAgo(-1);
-          end = picker.value[1].daysAgo(-1);
-        } else {
-          start = picker.value[0];
-        }
-      }
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: '« 往前一周 ',
-    onClick(picker) {
-      if (picker.value.length === 0) {
-        picker.value = [new Date(dateToStr(new Date())).daysAgo(7), endTime];
-      }
-      const start = picker.value[0].daysAgo(7);
-      const end = picker.value[1].daysAgo(7);
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: ' 往后一周 »',
-    onClick(picker) {
-      let start = new Date(dateToStr(new Date())).daysAgo(7);
-      let end = endTime;
-      if (picker.value.length > 0) {
-        if (end - picker.value[1] > 8.64e7) {
-          start = picker.value[0].daysAgo(-7);
-          end = picker.value[1].daysAgo(-7);
-        } else {
-          start = picker.value[0];
-        }
-      }
-      picker.$emit('pick', [start, end]);
-    },
-  },
-];
-
-export const calendarShortcuts = [
-  ...calendarBaseShortcuts,
-  //...calendarMoveShortcuts
-];
-
-//日期格式转换
-function dateToStr(datetime) {
-  var year = datetime.getFullYear();
-  var month = datetime.getMonth();
-  var month1 = datetime.getMonth() + 1; //js从0开始取
-  var date = datetime.getDate();
-
-  if (month < 10) {
-    month = '0' + month;
-  }
-  if (month1 < 10) {
-    month1 = '0' + month1;
-  }
-  if (date < 10) {
-    date = '0' + date;
-  }
-  return year + '/' + month1 + '/' + date;
-}
-
-// 禁止选择未来时间
-
-// 选择过去时间包含今天
-export const calendarBaseShortcutsProhibitTodayNext = [
-  {
-    text: '近一周',
-    onClick(picker) {
-      const end = new Date();
-      const start = new Date();
-      end.setTime(end.getTime() - 3600 * 1000 * 24);
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: '近一个月',
-    onClick(picker) {
-      const end = new Date();
-      const start = new Date();
-      end.setTime(end.getTime() - 3600 * 1000 * 24);
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: '近三个月',
-    onClick(picker) {
-      const end = new Date();
-      const start = new Date();
-      end.setTime(end.getTime() - 3600 * 1000 * 24);
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: '最近一年',
-    onClick: picker => {
-      const end = new Date(); // 当前日期
-      const start = new Date(); // 开始日期
-
-      end.setDate(end.getDate() - 1); // 设置结束日期为昨天
-      start.setFullYear(start.getFullYear() - 1); // 设置开始日期为一年前
-
-      picker.$emit('pick', [start, end]);
-    },
-  },
-  {
-    text: '本年度',
-    onClick: picker => {
-      const end = new Date(); // 当前日期
-      const start = new Date(); // 开始日期
-      start.setDate(1);
-      end.setDate(end.getDate() - 1); // 设置结束日期为昨天
-      start.setMonth(0); // 设置开始日期为今年的1月份
-      picker.$emit('pick', [start, end]);
-    },
-  },
-];
-
-export const calendarShortcutsProhibitTodayNext = [...calendarBaseShortcutsProhibitTodayNext];
-
-// 禁止选择包含今天未来
-export const calendarDisabledDateProhibitTodayNext = time => {
-  const today = new Date();
-  return time.getTime() >= today.setHours(0, 0, 0, 0); // (Date.now() ) ; // 不可选未来日期
-  // defaultTime 没有设置，且valueFormat 格式为 yyyy-MM-dd
-  // return time.getTime() >= (Date.now() ) ; // 不可选未来日期
-};
-
-// 禁止选择未来时间 不包含今天
-export const calendarDisabledDateProhibitNext = time => {
-  //  defaultTime 设置范围 且 valueFormat 格式为 yyyy-MM-dd HH:mm:ss
-  const today = new Date(new Date().setDate(new Date().getDate() + 1));
-  return time.getTime() >= today.setHours(0, 0, 0, 0); // (Date.now() ) ; // 不可选未来日期
-  // defaultTime 没有设置，且valueFormat 格式为 yyyy-MM-dd
-  // return time.getTime() >= (Date.now() ) ; // 不可选未来日期
-};
+import Date from './datetime.js';
+let endTime = new Date(new Date(dateToStr(new Date())).getTime() + 1000 * 60 * 60 * 24 - 1);
+// 选择过去时间包含今天
+export const calendarBaseShortcuts = [
+  {
+    text: '今天',
+    onClick(picker) {
+      const date = new Date(dateToStr(new Date()));
+      picker.$emit('pick', [date, endTime]);
+    },
+  },
+  {
+    text: '昨天',
+    onClick(picker) {
+      const start = new Date(dateToStr(new Date())).daysAgo(1);
+      picker.$emit('pick', [start, endTime.daysAgo(1)]);
+    },
+  },
+  {
+    text: '最近一周',
+    onClick(picker) {
+      const start = new Date(dateToStr(new Date())).daysAgo(6);
+      picker.$emit('pick', [start, endTime]);
+    },
+  },
+  {
+    text: '最近30天',
+    onClick(picker) {
+      const start = new Date(dateToStr(new Date())).daysAgo(29);
+      picker.$emit('pick', [start, endTime]);
+    },
+  },
+  {
+    text: '这个月',
+    onClick(picker) {
+      const start = new Date(dateToStr(new Date())).monthBegin();
+      picker.$emit('pick', [start, endTime]);
+    },
+  },
+  {
+    text: '本季度',
+    onClick(picker) {
+      const start = new Date(dateToStr(new Date())).quarterBegin();
+      picker.$emit('pick', [start, endTime]);
+    },
+  },
+];
+
+export const calendarMoveShortcuts = [
+  {
+    text: '‹ 往前一天 ',
+    onClick(picker) {
+      console.log(picker.value);
+      if (picker.value === undefined) {
+        picker.value = [new Date(dateToStr(new Date())), endTime];
+      }
+      const start = picker.value[0].daysAgo(1);
+      const end = picker.value[1].daysAgo(1);
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: ' 往后一天 ›',
+    onClick(picker) {
+      let start = new Date(dateToStr(new Date()));
+      let end = endTime;
+      if (picker.value === undefined) {
+        picker.value = [start, end];
+      }
+      if (picker.value.length > 0) {
+        if (end - picker.value[1] > 8.64e7) {
+          start = picker.value[0].daysAgo(-1);
+          end = picker.value[1].daysAgo(-1);
+        } else {
+          start = picker.value[0];
+        }
+      }
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: '« 往前一周 ',
+    onClick(picker) {
+      if (picker.value.length === 0) {
+        picker.value = [new Date(dateToStr(new Date())).daysAgo(7), endTime];
+      }
+      const start = picker.value[0].daysAgo(7);
+      const end = picker.value[1].daysAgo(7);
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: ' 往后一周 »',
+    onClick(picker) {
+      let start = new Date(dateToStr(new Date())).daysAgo(7);
+      let end = endTime;
+      if (picker.value.length > 0) {
+        if (end - picker.value[1] > 8.64e7) {
+          start = picker.value[0].daysAgo(-7);
+          end = picker.value[1].daysAgo(-7);
+        } else {
+          start = picker.value[0];
+        }
+      }
+      picker.$emit('pick', [start, end]);
+    },
+  },
+];
+
+export const calendarShortcuts = [
+  ...calendarBaseShortcuts,
+  //...calendarMoveShortcuts
+];
+
+//日期格式转换
+function dateToStr(datetime) {
+  var year = datetime.getFullYear();
+  var month = datetime.getMonth();
+  var month1 = datetime.getMonth() + 1; //js从0开始取
+  var date = datetime.getDate();
+
+  if (month < 10) {
+    month = '0' + month;
+  }
+  if (month1 < 10) {
+    month1 = '0' + month1;
+  }
+  if (date < 10) {
+    date = '0' + date;
+  }
+  return year + '/' + month1 + '/' + date;
+}
+
+// 禁止选择未来时间
+
+// 选择过去时间包含今天
+export const calendarBaseShortcutsProhibitTodayNext = [
+  {
+    text: '近一周',
+    onClick(picker) {
+      const end = new Date();
+      const start = new Date();
+      end.setTime(end.getTime() - 3600 * 1000 * 24);
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: '近一个月',
+    onClick(picker) {
+      const end = new Date();
+      const start = new Date();
+      end.setTime(end.getTime() - 3600 * 1000 * 24);
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: '近三个月',
+    onClick(picker) {
+      const end = new Date();
+      const start = new Date();
+      end.setTime(end.getTime() - 3600 * 1000 * 24);
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: '最近一年',
+    onClick: picker => {
+      const end = new Date(); // 当前日期
+      const start = new Date(); // 开始日期
+
+      end.setDate(end.getDate() - 1); // 设置结束日期为昨天
+      start.setFullYear(start.getFullYear() - 1); // 设置开始日期为一年前
+
+      picker.$emit('pick', [start, end]);
+    },
+  },
+  {
+    text: '本年度',
+    onClick: picker => {
+      const end = new Date(); // 当前日期
+      const start = new Date(); // 开始日期
+      start.setDate(1);
+      end.setDate(end.getDate() - 1); // 设置结束日期为昨天
+      start.setMonth(0); // 设置开始日期为今年的1月份
+      picker.$emit('pick', [start, end]);
+    },
+  },
+];
+
+export const calendarShortcutsProhibitTodayNext = [...calendarBaseShortcutsProhibitTodayNext];
+
+// 禁止选择包含今天未来
+export const calendarDisabledDateProhibitTodayNext = time => {
+  const today = new Date();
+  return time.getTime() >= today.setHours(0, 0, 0, 0); // (Date.now() ) ; // 不可选未来日期
+  // defaultTime 没有设置，且valueFormat 格式为 yyyy-MM-dd
+  // return time.getTime() >= (Date.now() ) ; // 不可选未来日期
+};
+
+// 禁止选择未来时间 不包含今天
+export const calendarDisabledDateProhibitNext = time => {
+  //  defaultTime 设置范围 且 valueFormat 格式为 yyyy-MM-dd HH:mm:ss
+  const today = new Date(new Date().setDate(new Date().getDate() + 1));
+  return time.getTime() >= today.setHours(0, 0, 0, 0); // (Date.now() ) ; // 不可选未来日期
+  // defaultTime 没有设置，且valueFormat 格式为 yyyy-MM-dd
+  // return time.getTime() >= (Date.now() ) ; // 不可选未来日期
+};

package/templates/vue-app/files/src/utils/upload.js

@@ -1,12 +1,12 @@
-import axios from 'axios';
-import { getToken } from '@/utils/auth';
-
-export function upload(api, file, fileName) {
-  var data = new FormData();
-  data.append('file', file);
-  data.append('prefix', fileName);
-  const config = {
-    headers: { Authorization: getToken() },
-  };
-  return axios.post(api, data, config);
-}
+import axios from 'axios';
+import { getToken } from '@/utils/auth';
+
+export function upload(api, file, fileName) {
+  var data = new FormData();
+  data.append('file', file);
+  data.append('prefix', fileName);
+  const config = {
+    headers: { Authorization: getToken() },
+  };
+  return axios.post(api, data, config);
+}