cnhis-design-vue 3.1.18-beta.5 → 3.1.18-beta.8

package/es/shared/utils/utilExpand.js

@@ -34,25 +34,25 @@ const expandXEUtils = (() => {
     getConnection: function(cObj, fVal, field) {
       let con = cObj.con;
       let value = cObj.value;
-      if ("NULL" == con) {
+      if (con == "NULL") {
         if (fVal) {
           return false;
         }
-      } else if ("NOT_NULL" == con) {
+      } else if (con == "NOT_NULL") {
         if (!fVal) {
           return false;
         }
       }
-      if ("TEXT" == field.fieldType) {
-        if ("CL" == con) {
+      if (field.fieldType == "TEXT") {
+        if (con == "CL") {
           if (fVal.indexOf(value) == -1) {
             return false;
           }
-        } else if ("NC" == con) {
+        } else if (con == "NC") {
           if (fVal.indexOf(value) != -1) {
             return false;
           }
-        } else if ("EQ" == con || "QUOTE" == con) {
+        } else if (con == "EQ" || con == "QUOTE") {
           if (value.indexOf("|#|") != -1) {
             for (let kw in value.split("|#|")) {
               if (fVal.indexOf(kw) == -1) {
@@ -64,17 +64,17 @@ const expandXEUtils = (() => {
               return false;
             }
           }
-        } else if ("NEQ" == con) {
+        } else if (con == "NEQ") {
           if (fVal == value) {
             return false;
           }
         }
       } else {
-        if ("NUMBER" == field.fieldType) {
+        if (field.fieldType == "NUMBER") {
           if (!XEUtils.isNumber(fVal)) {
             return false;
           }
-          if ("EQ" == con || "QUOTE" == con) {
+          if (con == "EQ" || con == "QUOTE") {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 != value * 1) {
                 return false;
@@ -84,19 +84,19 @@ const expandXEUtils = (() => {
                 return false;
               }
             }
-          } else if ("NEQ" == con) {
+          } else if (con == "NEQ") {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 == value * 1) {
                 return false;
               }
             }
-          } else if ("BIG" == con) {
+          } else if (con == "BIG") {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 <= value * 1) {
                 return false;
               }
             }
-          } else if ("LESS" == con) {
+          } else if (con == "LESS") {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 >= value * 1) {
                 return false;
@@ -104,7 +104,7 @@ const expandXEUtils = (() => {
             }
           }
         } else {
-          if ("TODAY" == con || "TOMORROW" == con || "YESTERDAY" == con || "THIS_WEEK" == con || "NEXT_WEEK" == con || "UP_WEEK" == con || "THIS_MONTH" == con || "NEXT_MONTH" == con || "UP_MONTH" == con || "THIS_SEASON" == con || "NEXT_SEASON" == con || "UP_SEASON" == con || "THIS_YEAR" == con || "NEXT_YEAR" == con || "UP_YEAR" == con) {
+          if (con == "TODAY" || con == "TOMORROW" || con == "YESTERDAY" || con == "THIS_WEEK" || con == "NEXT_WEEK" || con == "UP_WEEK" || con == "THIS_MONTH" || con == "NEXT_MONTH" || con == "UP_MONTH" || con == "THIS_SEASON" || con == "NEXT_SEASON" || con == "UP_SEASON" || con == "THIS_YEAR" || con == "NEXT_YEAR" || con == "UP_YEAR") {
             if (XEUtils.isDate(fVal)) {
               let curDate = new Date();
               let startDate;
@@ -112,72 +112,72 @@ const expandXEUtils = (() => {
               let oneDayTime = 24 * 60 * 60 * 1e3;
               let fDate = XEUtils.convertDate(fVal);
               let curDateStr = XEUtils.toDateString(curDate, "yyyy-MM-dd");
-              if ("TODAY" == con) {
+              if (con == "TODAY") {
                 startDate = XEUtils.convertDate(curDateStr + " 00:00:00");
                 endDate = XEUtils.convertDate(curDateStr + " 23:59:59");
-              } else if ("TOMORROW" == con) {
+              } else if (con == "TOMORROW") {
                 let tomorrowDate = XEUtils.addDate(curDate, 1, "D");
                 let dateStr = tomorrowDate.format("yyyy-MM-dd");
                 startDate = XEUtils.convertDate(dateStr + " 00:00:00");
                 endDate = XEUtils.convertDate(dateStr + " 23:59:59");
-              } else if ("YESTERDAY" == con) {
+              } else if (con == "YESTERDAY") {
                 let tomorrowDate = XEUtils.addDate(curDate, -1, "D");
                 let dateStr = tomorrowDate.format("yyyy-MM-dd");
                 startDate = XEUtils.convertDate(dateStr + " 00:00:00");
                 endDate = XEUtils.convertDate(dateStr + " 23:59:59");
-              } else if ("THIS_WEEK" == con) {
+              } else if (con == "THIS_WEEK") {
                 let day = curDate.getDay() || 7;
                 let mondayTime = curDate.getTime() - (day - 1) * oneDayTime;
                 let mundayTime = curDate.getTime() + (7 - day) * oneDayTime;
                 startDate = new Date(mondayTime);
                 endDate = new Date(mundayTime);
-              } else if ("NEXT_WEEK" == con) {
+              } else if (con == "NEXT_WEEK") {
                 let sevenDays = XEUtils.addDate(curDate, 1, "W");
                 let day = sevenDays.getDay() || 7;
                 let mondayTime = sevenDays.getTime() - (day - 1) * oneDayTime;
                 let mundayTime = sevenDays.getTime() + (7 - day) * oneDayTime;
                 startDate = new Date(mondayTime);
                 endDate = new Date(mundayTime);
-              } else if ("UP_WEEK" == con) {
+              } else if (con == "UP_WEEK") {
                 let sevenDays = XEUtils.addDate(curDate, -1, "W");
                 let day = sevenDays.getDay() || 7;
                 let mondayTime = sevenDays.getTime() - (day - 1) * oneDayTime;
                 let mundayTime = sevenDays.getTime() + (7 - day) * oneDayTime;
                 startDate = new Date(mondayTime);
                 endDate = new Date(mundayTime);
-              } else if ("THIS_MONTH" == con) {
+              } else if (con == "THIS_MONTH") {
                 let date = new Date();
                 date.setDate(1);
                 startDate = date;
                 endDate = XEUtils.addDate(date, 1, "M");
-              } else if ("NEXT_MONTH" == con) {
+              } else if (con == "NEXT_MONTH") {
                 let date = new Date();
                 date.setDate(1);
                 startDate = XEUtils.addDate(date, 1, "M");
                 endDate = XEUtils.addDate(date, 2, "M");
-              } else if ("UP_MONTH" == con) {
+              } else if (con == "UP_MONTH") {
                 let date = new Date();
                 date.setDate(1);
                 startDate = XEUtils.addDate(date, -1, "M");
                 endDate = date;
-              } else if ("THIS_SEASON" == con) {
+              } else if (con == "THIS_SEASON") {
                 startDate = XEUtils.getCurSeasonFirstDay();
                 endDate = XEUtils.addDate(startDate, 3, "M");
-              } else if ("NEXT_SEASON" == con) {
+              } else if (con == "NEXT_SEASON") {
                 startDate = XEUtils.addDate(XEUtils.getCurSeasonFirstDay(), 3, "M");
                 endDate = XEUtils.addDate(startDate, 3, "M");
-              } else if ("UP_SEASON" == con) {
+              } else if (con == "UP_SEASON") {
                 endDate = XEUtils.getCurSeasonFirstDay();
                 startDate = XEUtils.addDate(endDate, -3, "M");
-              } else if ("THIS_YEAR" == con) {
+              } else if (con == "THIS_YEAR") {
                 let date = new Date();
                 startDate = new Date(date.getFullYear() + "/01/01");
                 endDate = XEUtils.addDate(startDate, 1, "Y");
-              } else if ("NEXT_YEAR" == con) {
+              } else if (con == "NEXT_YEAR") {
                 let date = new Date();
                 startDate = XEUtils.addDate(new Date(date.getFullYear() + "/01/01"), 1, "Y");
                 endDate = XEUtils.addDate(startDate, 1, "Y");
-              } else if ("UP_YEAR" == con) {
+              } else if (con == "UP_YEAR") {
                 let date = new Date();
                 endDate = new Date(date.getFullYear() + "/01/01");
                 startDate = XEUtils.addDate(endDate, -1, "Y");
@@ -190,51 +190,51 @@ const expandXEUtils = (() => {
             } else {
               return false;
             }
-          } else if ("L_" == con || "N_" == con || "IN_THE_PAST" == con || "IN_THE_FUTURE" == con || "IN_THE_PAST_DI" == con || "IN_THE_FUTURE_DI" == con) {
+          } else if (con == "L_" || con == "N_" || con == "IN_THE_PAST" || con == "IN_THE_FUTURE" || con == "IN_THE_PAST_DI" || con == "IN_THE_FUTURE_DI") {
             if (cObj["unit"] && XEUtils.isNumber(value)) {
               if (XEUtils.isDate(fVal)) {
                 let fDate = XEUtils.convertDate(fVal);
                 let curDate = new Date();
                 let unit = cObj["unit"];
-                if ("DAY" == unit || "WEEK" == unit || "MONTH" == unit || "QUARTER" == unit || "YEAR" == unit || "HOUR" == unit) {
+                if (unit == "DAY" || unit == "WEEK" || unit == "MONTH" || unit == "QUARTER" || unit == "YEAR" || unit == "HOUR") {
                   let type = "D";
-                  if ("WEEK" == unit) {
+                  if (unit == "WEEK") {
                     type = "W";
-                  } else if ("MONTH" == unit) {
+                  } else if (unit == "MONTH") {
                     type = "M";
-                  } else if ("QUARTER" == unit) {
+                  } else if (unit == "QUARTER") {
                     type = "Q";
-                  } else if ("YEAR" == unit) {
+                  } else if (unit == "YEAR") {
                     type = "Y";
-                  } else if ("HOUR" == unit) {
+                  } else if (unit == "HOUR") {
                     type = "H";
                   }
                   let count = value * 1;
-                  if ("L_" == con) {
+                  if (con == "L_") {
                     let targetDate = XEUtils.addDate(new Date(), count * -1, type);
                     if (fDate.getTime() < targetDate.getTime()) {
                       return false;
                     }
-                  } else if ("N_" == con) {
+                  } else if (con == "N_") {
                     let targetDate = XEUtils.addDate(new Date(), count, type);
                     if (fDate.getTime() > targetDate.getTime()) {
                       return false;
                     }
-                  } else if ("IN_THE_PAST" == con) {
+                  } else if (con == "IN_THE_PAST") {
                     let curTime = fDate.getTime();
                     let endTime = curDate.getTime();
                     let startTime = XEUtils.addDate(curDate, count * -1, type).getTime();
                     if (curTime < startTime || curTime > endTime) {
                       return false;
                     }
-                  } else if ("IN_THE_FUTURE" == con) {
+                  } else if (con == "IN_THE_FUTURE") {
                     let curTime = fDate.getTime();
                     let startTime = curDate.getTime();
                     let endTime = XEUtils.addDate(curDate, count, type).getTime();
                     if (curTime < startTime || curTime > endTime) {
                       return false;
                     }
-                  } else if ("IN_THE_PAST_DI" == con || "IN_THE_FUTURE_DI" == con) {
+                  } else if (con == "IN_THE_PAST_DI" || con == "IN_THE_FUTURE_DI") {
                     let curTime = fDate.getTime();
                     let useType = con == "IN_THE_FUTURE_DI" ? "add" : "subtract";
                     let { startTime, endTime } = XEUtils.addDiDate(curDate, count, unit, useType);
@@ -247,7 +247,7 @@ const expandXEUtils = (() => {
                 return false;
               }
             }
-          } else if ("IN" == con) {
+          } else if (con == "IN") {
             if (XEUtils.isDate(fVal)) {
               let fDate = XEUtils.convertDate(fVal);
               if (!value) {
@@ -289,8 +289,8 @@ const expandXEUtils = (() => {
           }
         }
       }
-      if ("compare" == con) {
-        if ("TEXT" == field.fieldType) {
+      if (con == "compare") {
+        if (field.fieldType == "TEXT") {
           if (value.indexOf("|#|") != -1) {
             for (let kw in value.split("|#|")) {
               if (fVal.indexOf(kw) == -1) {
@@ -298,7 +298,7 @@ const expandXEUtils = (() => {
               }
             }
           } else {
-            if (cObj["mk"] && "like" == cObj["mk"]) {
+            if (cObj["mk"] && cObj["mk"] == "like") {
               if (fVal.indexOf(value) == -1) {
                 return false;
               }
@@ -308,7 +308,7 @@ const expandXEUtils = (() => {
               }
             }
           }
-        } else if ("NUMBER" == field.fieldType()) {
+        } else if (field.fieldType() == "NUMBER") {
           if (XEUtils.isNumber(value) && XEUtils.isNumber(fVal)) {
             if (fVal * 1 != value * 1) {
               return false;
@@ -328,7 +328,7 @@ const expandXEUtils = (() => {
       if (value && value.indexOf("~") != -1 && value.split("~").length == 2) {
         let start = value.split("~")[0];
         let end = value.split("~")[1];
-        if ("number" == type) {
+        if (type == "number") {
           if (XEUtils.isNumber(start) && XEUtils.isNumber(end)) {
             return start * 1 <= comVal * 1 && comVal * 1 < end * 1;
           }
@@ -708,6 +708,7 @@ const expandXEUtils = (() => {
     }
   });
   return () => {
+    return false;
   };
 })();
 

package/es/shared/utils/vexutils.js

@@ -2,27 +2,6 @@ import XEUtils from 'xe-utils';
 export { default } from 'xe-utils';
 export { default as moment } from 'moment';
 
-function formatReleaseTime(type, time) {
-  if (time < 0) {
-    return "";
-  }
-  let format = "";
-  switch (type) {
-    case "DATE":
-      format = "yyyy-MM-dd";
-      break;
-    case "DATETIMENew":
-      format = "yyyy-MM-dd HH:mm";
-      break;
-    case "DATETIME":
-      format = "yyyy-MM-dd HH:mm:ss";
-      break;
-    case "TIME":
-      format = "HH:mm:ss";
-      break;
-  }
-  return XEUtils.toDateString(time, format);
-}
 function handleLabelColor(item, isSelect) {
   var _a;
   let tempColor = "#5585f5";
@@ -77,4 +56,4 @@ function handleLabelColor(item, isSelect) {
   }
 }
 
-export { formatReleaseTime, handleLabelColor };
+export { handleLabelColor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.18-beta.5",
+  "version": "3.1.18-beta.8",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -13,7 +13,7 @@
     "es"
   ],
   "peerDependencies": {
-    "naive-ui": "^2.29.0",
+    "naive-ui": "^2.29.1",
     "vue": "^3.2.0"
   },
   "dependencies": {
@@ -42,7 +42,7 @@
     "min-dash": "^3.8.1",
     "min-dom": "^3.2.1",
     "moment": "^2.29.1",
-    "naive-ui": "^2.29.0",
+    "naive-ui": "^2.29.1",
     "rimraf": "^3.0.2",
     "spark-md5": "^3.0.2",
     "tiny-svg": "^2.2.4",
@@ -65,5 +65,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "c8b9bdb41b7894057f6f772db6c18f2f267cb61a"
+  "gitHead": "2e7d8e7d603d5ebc5ce29df93b9f0f9a3d4f6d41"
 }

package/es/components/big-table/src/components/edit-form/edit-select-table.js

@@ -1,149 +0,0 @@
-import { defineComponent, reactive, createVNode } from 'vue';
-import { NSelect, NPagination, NEmpty, NSpin, NSpace } from 'naive-ui';
-import Grid from '../../../../grid/index.js';
-import XEUtils from 'xe-utils';
-import 'moment';
-
-var editSelectTable = defineComponent({
-  name: "EditSelectTable",
-  inheritAttrs: false,
-  components: {
-    NSelect,
-    CGrid: Grid,
-    NPagination,
-    NEmpty,
-    NSpin,
-    NSpace
-  },
-  props: {
-    row: {
-      type: Object,
-      default: {}
-    },
-    col: {
-      type: Object,
-      default: {}
-    },
-    value: {
-      type: String,
-      default: ""
-    }
-  },
-  emits: ["update:value", "clickSelectTable"],
-  setup(props, {
-    attrs,
-    slots,
-    emit
-  }) {
-    const state = reactive({
-      value: props.value,
-      row: JSON.parse(JSON.stringify(props.row)),
-      page: 1,
-      pageCount: 0,
-      keyword: "",
-      data: [],
-      columns: JSON.parse(JSON.stringify(props.col.tableColumn)),
-      loading: false,
-      show: true
-    });
-    const selectTableFocus = () => {
-      state.show = true;
-      state.page = 1;
-      state.keyword = "";
-      state.pageCount = 0;
-      querySelectTableList();
-    };
-    const querySelectTableList = async () => {
-      state.loading = true;
-      const obj = {
-        page: state.page,
-        keyword: state.keyword
-      };
-      const {
-        data,
-        pageCount
-      } = await props.col.querySelectTableList(obj);
-      state.data = data;
-      state.pageCount = pageCount;
-      state.loading = false;
-    };
-    let selectTableSearch = (value) => {
-      state.keyword = value;
-      querySelectTableList();
-    };
-    selectTableSearch = XEUtils.debounce(selectTableSearch, 800);
-    selectTableSearch("");
-    const getSelectTableGrid = () => {
-      const config = {
-        border: "outer",
-        resizable: true,
-        autoResize: true,
-        showOverflow: true,
-        showHeaderOverflow: true,
-        highlightHoverRow: true,
-        highlightCurrentRow: true,
-        maxHeight: props.col.tableHeight || 200,
-        align: "center",
-        columns: state.columns,
-        data: state.data,
-        onCellClick
-      };
-      return createVNode(Grid, config, {
-        empty: () => createVNode(NEmpty, {
-          "description": "\u65E0\u6570\u636E"
-        }, null)
-      });
-    };
-    const onCellClick = (data) => {
-      const {
-        row
-      } = data;
-      emit("clickSelectTable", row);
-      state.show = false;
-    };
-    const getPagination = () => {
-      const pagination = () => {
-        return createVNode(NPagination, {
-          "page": state.page,
-          "onUpdate:page": ($event) => state.page = $event,
-          "pageCount": state.pageCount,
-          "onUpdatePage": (page) => querySelectTableList()
-        }, null);
-      };
-      return createVNode(NSpace, {
-        "justify": "space-between",
-        "align": "center",
-        "style": "margin-top: 5px"
-      }, {
-        default: () => [`\u5171${state.pageCount}\u6761`, pagination()]
-      });
-    };
-    return () => [createVNode(NSelect, {
-      "class": "form-select-table",
-      "placeholder": "\u8BF7\u9009\u62E9",
-      "options": [],
-      "consistentMenuWidth": false,
-      "clearable": true,
-      "filterable": true,
-      "to": false,
-      "show": state.show,
-      "loading": state.loading,
-      "onFocus": selectTableFocus,
-      "onBlur": () => state.show = false,
-      "onSearch": selectTableSearch
-    }, {
-      action: () => state.loading ? createVNode(NSpace, {
-        "justify": "center"
-      }, {
-        default: () => createVNode(NSpin, {
-          "style": {
-            margin: "80px auto"
-          },
-          "size": "small"
-        }, null)
-      }) : [getSelectTableGrid(), state.pageCount ? getPagination() : null]
-    })];
-  }
-});
-
-export { editSelectTable as default };