cnhis-design-vue 2.1.56 → 2.1.58

package/packages/form-table/src/components/table-mixins/form-commom.js

@@ -1,98 +1,98 @@
-import vexutils from '@/utils/vexutils';
-export const formCommom = {
-  methods: {
-    hanldeSetFieldsValue(setObj = {}) {
-      const setVal = { ...setObj };
-      let item = this.item;
-      if (typeof setVal === "object") {
-        // let [[key, value]] = Object.entries(setVal || {});
-        let list = Object.entries(setVal || {});
-        list.forEach(f => {
-          let [key, value] = f;
-          if (!key) return;
-          if (this.handleCheckKeyInform(key)) {
-            this.row[key] = value;
-          } else {
-            if (item) {
-              this.defaultValue[item.name] = value;
-            } else {
-              if (this.row[key]) {
-                let name = this.row[key].name;
-                name && (this.defaultValue[name] = value);
-              }
-            }
-          }
-          this.row[key] = value;
-
-          // this.cacheForm.setFieldsValue({ [key]: value });
-        });
-      }
-    },
-    // 该表单是否已加载
-    handleCheckKeyInform(key) {
-      let baserFormKeys = this.row;
-      let keyList = Object.keys(baserFormKeys || {});
-
-      return keyList.includes(key);
-    },
-    //  获取分组
-    hanldeGetTargetList(t = {}) {
-      if (t.group) {
-        return this.defaultFieldList.filter(v => v.group == t.group);
-      }
-      return this.defaultFieldList || [];
-    },
-    transformStr(item) {
-      var def = this.defaultValue[item.name];
-      var propsDef = def || (def !== "" && def == 0) ? def : item.default_val;
-      let defVal = propsDef || propsDef == 0 ? propsDef : "";
-      defVal = String(defVal);
-      return defVal;
-    },
-    // 获取日期格式
-    handlerGetDateType(data) {
-      let dateType;
-      switch (data.html_type) {
-        case "DATETIME-INPUT":
-          dateType = "YYYY-MM-DD HH:mm:ss";
-          break;
-        case "DATE-INPUT":
-          dateType = "YYYY-MM-DD";
-          break;
-        case "TIME-INPUT":
-          dateType = "HH:mm:ss";
-          break;
-        case "DATE":
-          data.date_format = data.date_format && data.date_format.replace(/yyyy/gi, "YYYY");
-          dateType = (data.date_format || "YYYY-MM-DD")
-            .replace(/yyyy-MM-dd/gi, "YYYY-MM-DD")
-            .replace(/hh:mm:ss/gi, "HH:mm:ss")
-            .replace(/hh:mm/gi, "HH:mm");
-          break;
-        default:
-          dateType = data.date_format || "YYYY-MM-DD";
-          break;
-      }
-      return dateType;
-    },
-    handleGetJsonStr(str) {
-      // {objs:[],objstr:''}, {type: 'jsonb', value: "{objs:[],objstr:''}"}
-      let resObj = {};
-      if (vexutils.isJSON(str)) {
-        resObj = JSON.parse(str);
-      } else {
-        resObj = typeof str === "string" ? {} : str;
-      }
-      if (resObj && !resObj.objs && resObj.value) {
-        if (vexutils.isJSON(resObj.value)) {
-          resObj = JSON.parse(resObj.value);
-          // loop
-          if (resObj.type === "jsonb") {
-            resObj = this.handleGetJsonStr(resObj);
-          }
-        }
-      }
-      return resObj;
-    }
-  }
-};
+import vexutils from '@/utils/vexutils';
+export const formCommom = {
+  methods: {
+    hanldeSetFieldsValue(setObj = {}) {
+      const setVal = { ...setObj };
+      let item = this.item;
+      if (typeof setVal === "object") {
+        // let [[key, value]] = Object.entries(setVal || {});
+        let list = Object.entries(setVal || {});
+        list.forEach(f => {
+          let [key, value] = f;
+          if (!key) return;
+          if (this.handleCheckKeyInform(key)) {
+            this.row[key] = value;
+          } else {
+            if (item) {
+              this.defaultValue[item.name] = value;
+            } else {
+              if (this.row[key]) {
+                let name = this.row[key].name;
+                name && (this.defaultValue[name] = value);
+              }
+            }
+          }
+          this.row[key] = value;
+
+          // this.cacheForm.setFieldsValue({ [key]: value });
+        });
+      }
+    },
+    // 该表单是否已加载
+    handleCheckKeyInform(key) {
+      let baserFormKeys = this.row;
+      let keyList = Object.keys(baserFormKeys || {});
+
+      return keyList.includes(key);
+    },
+    //  获取分组
+    hanldeGetTargetList(t = {}) {
+      if (t.group) {
+        return this.defaultFieldList.filter(v => v.group == t.group);
+      }
+      return this.defaultFieldList || [];
+    },
+    transformStr(item) {
+      var def = this.defaultValue[item.name];
+      var propsDef = def || (def !== "" && def == 0) ? def : item.default_val;
+      let defVal = propsDef || propsDef == 0 ? propsDef : "";
+      defVal = String(defVal);
+      return defVal;
+    },
+    // 获取日期格式
+    handlerGetDateType(data) {
+      let dateType;
+      switch (data.html_type) {
+        case "DATETIME-INPUT":
+          dateType = "YYYY-MM-DD HH:mm:ss";
+          break;
+        case "DATE-INPUT":
+          dateType = "YYYY-MM-DD";
+          break;
+        case "TIME-INPUT":
+          dateType = "HH:mm:ss";
+          break;
+        case "DATE":
+          data.date_format = data.date_format && data.date_format.replace(/yyyy/gi, "YYYY");
+          dateType = (data.date_format || "YYYY-MM-DD")
+            .replace(/yyyy-MM-dd/gi, "YYYY-MM-DD")
+            .replace(/hh:mm:ss/gi, "HH:mm:ss")
+            .replace(/hh:mm/gi, "HH:mm");
+          break;
+        default:
+          dateType = data.date_format || "YYYY-MM-DD";
+          break;
+      }
+      return dateType;
+    },
+    handleGetJsonStr(str) {
+      // {objs:[],objstr:''}, {type: 'jsonb', value: "{objs:[],objstr:''}"}
+      let resObj = {};
+      if (vexutils.isJSON(str)) {
+        resObj = JSON.parse(str);
+      } else {
+        resObj = typeof str === "string" ? {} : str;
+      }
+      if (resObj && !resObj.objs && resObj.value) {
+        if (vexutils.isJSON(resObj.value)) {
+          resObj = JSON.parse(resObj.value);
+          // loop
+          if (resObj.type === "jsonb") {
+            resObj = this.handleGetJsonStr(resObj);
+          }
+        }
+      }
+      return resObj;
+    }
+  }
+};

package/packages/form-table/src/components/table-mixins/index.js

@@ -1,3 +1,3 @@
-import { formCommom } from "./form-commom";
-
-export { formCommom };
+import { formCommom } from "./form-commom";
+
+export { formCommom };

package/packages/form-table/src/components/table-utils/index.js

@@ -1,112 +1,112 @@
-/**
- * 表单常用函数
- */
-const formUtils = {
-  /**
-   * @deprecated: 生日 获取年龄 信息
-   * @param {string} str 'YYYY-MM-DD' 时间格式
-   * @returns {Object} {year, month, day}
-   */
-  getAgeInfo(str) {
-    let r = str.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})/);
-    if (r == null) return false;
-    let Y, M, D;
-    let d = new Date(r[1], r[3] - 1, r[4]);
-    let returnStr = "输入的日期格式错误！";
-
-    if (d.getFullYear() == r[1] && d.getMonth() + 1 == r[3] && d.getDate() == r[4]) {
-      let date = new Date();
-      let yearNow = date.getFullYear();
-      let monthNow = date.getMonth() + 1;
-      let dayNow = date.getDate();
-
-      let largeMonths = [1, 3, 5, 7, 8, 10, 12], // 大月， 用于计算天，只在年月都为零时，天数有效
-        lastMonth = monthNow - 1 > 0 ? monthNow - 1 : 12, // 上一个月的月份
-        isLeapYear = false, // 是否是闰年
-        daysOFMonth = 0; // 当前日期的上一个月多少天
-
-      if ((yearNow % 4 === 0 && yearNow % 100 !== 0) || yearNow % 400 === 0) {
-        // 是否闰年， 用于计算天，只在年月都为零时，天数有效
-        isLeapYear = true;
-      }
-
-      if (largeMonths.indexOf(lastMonth) > -1) {
-        daysOFMonth = 31;
-      } else if (lastMonth === 2) {
-        if (isLeapYear) {
-          daysOFMonth = 29;
-        } else {
-          daysOFMonth = 28;
-        }
-      } else {
-        daysOFMonth = 30;
-      }
-
-      Y = yearNow - parseInt(r[1]);
-      M = monthNow - parseInt(r[3]);
-      D = dayNow - parseInt(r[4]);
-      if (D < 0) {
-        D = D + daysOFMonth; // 借一个月
-        M--;
-      }
-      if (M < 0) {
-        // 借一年 12个月
-        Y--;
-        M = M + 12; //
-      }
-
-      if (Y < 0) {
-        returnStr = "出生日期有误！";
-        console.log(returnStr);
-        return { year: 0, month: 0, day: 0 };
-      } else if (Y === 0) {
-        if (M === 0) {
-          returnStr = D + "D";
-        } else {
-          returnStr = M + "M";
-        }
-      } else {
-        if (M === 0) {
-          returnStr = Y + "Y";
-        } else {
-          returnStr = Y + "Y" + M + "M";
-        }
-      }
-
-      // console.log(Y, M, D);
-    }
-
-    // return returnStr;
-    return { year: Y, month: M, day: D };
-  },
-
-  /**
-   * 兼容map
-   */
-  handleCompatibilityMap(map = {}) {
-    /**
-     * c_key_list
-     * 兼容处理，
-     * 兼容用户 输入 map.xx, sql.xx, result.xx 都可以解析到值
-     * 只要找个一个key有值，其他key 都附上同样的值
-     */
-    if (typeof map !== "object") return map;
-    let c_key_list = ["map", "sql", "result"];
-    let key_list = Object.keys(map || {});
-    let curKey = key_list.find(k => c_key_list.includes(k));
-    if (curKey) {
-      c_key_list.forEach(c => {
-        map[c] = map[curKey];
-      });
-    }
-    return map;
-  },
-
-  randomId(len) {
-    return Math.random()
-      .toString(36)
-      .substr(3, len);
-  }
-};
-
-export default formUtils;
+/**
+ * 表单常用函数
+ */
+const formUtils = {
+  /**
+   * @deprecated: 生日 获取年龄 信息
+   * @param {string} str 'YYYY-MM-DD' 时间格式
+   * @returns {Object} {year, month, day}
+   */
+  getAgeInfo(str) {
+    let r = str.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})/);
+    if (r == null) return false;
+    let Y, M, D;
+    let d = new Date(r[1], r[3] - 1, r[4]);
+    let returnStr = "输入的日期格式错误！";
+
+    if (d.getFullYear() == r[1] && d.getMonth() + 1 == r[3] && d.getDate() == r[4]) {
+      let date = new Date();
+      let yearNow = date.getFullYear();
+      let monthNow = date.getMonth() + 1;
+      let dayNow = date.getDate();
+
+      let largeMonths = [1, 3, 5, 7, 8, 10, 12], // 大月， 用于计算天，只在年月都为零时，天数有效
+        lastMonth = monthNow - 1 > 0 ? monthNow - 1 : 12, // 上一个月的月份
+        isLeapYear = false, // 是否是闰年
+        daysOFMonth = 0; // 当前日期的上一个月多少天
+
+      if ((yearNow % 4 === 0 && yearNow % 100 !== 0) || yearNow % 400 === 0) {
+        // 是否闰年， 用于计算天，只在年月都为零时，天数有效
+        isLeapYear = true;
+      }
+
+      if (largeMonths.indexOf(lastMonth) > -1) {
+        daysOFMonth = 31;
+      } else if (lastMonth === 2) {
+        if (isLeapYear) {
+          daysOFMonth = 29;
+        } else {
+          daysOFMonth = 28;
+        }
+      } else {
+        daysOFMonth = 30;
+      }
+
+      Y = yearNow - parseInt(r[1]);
+      M = monthNow - parseInt(r[3]);
+      D = dayNow - parseInt(r[4]);
+      if (D < 0) {
+        D = D + daysOFMonth; // 借一个月
+        M--;
+      }
+      if (M < 0) {
+        // 借一年 12个月
+        Y--;
+        M = M + 12; //
+      }
+
+      if (Y < 0) {
+        returnStr = "出生日期有误！";
+        console.log(returnStr);
+        return { year: 0, month: 0, day: 0 };
+      } else if (Y === 0) {
+        if (M === 0) {
+          returnStr = D + "D";
+        } else {
+          returnStr = M + "M";
+        }
+      } else {
+        if (M === 0) {
+          returnStr = Y + "Y";
+        } else {
+          returnStr = Y + "Y" + M + "M";
+        }
+      }
+
+      // console.log(Y, M, D);
+    }
+
+    // return returnStr;
+    return { year: Y, month: M, day: D };
+  },
+
+  /**
+   * 兼容map
+   */
+  handleCompatibilityMap(map = {}) {
+    /**
+     * c_key_list
+     * 兼容处理，
+     * 兼容用户 输入 map.xx, sql.xx, result.xx 都可以解析到值
+     * 只要找个一个key有值，其他key 都附上同样的值
+     */
+    if (typeof map !== "object") return map;
+    let c_key_list = ["map", "sql", "result"];
+    let key_list = Object.keys(map || {});
+    let curKey = key_list.find(k => c_key_list.includes(k));
+    if (curKey) {
+      c_key_list.forEach(c => {
+        map[c] = map[curKey];
+      });
+    }
+    return map;
+  },
+
+  randomId(len) {
+    return Math.random()
+      .toString(36)
+      .substr(3, len);
+  }
+};
+
+export default formUtils;

package/packages/form-table/src/disabledDetail.less

@@ -1,46 +1,46 @@
-.formTable-page-disabled--detail {
-  /deep/ .vxe-table {
-    .vxe-cell {
-      .form-table-item {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 31px;
-      }
-
-      .ant-select-disabled {
-        .ant-select-selection {
-          border: 0 !important;
-          background: transparent;
-        }
-
-        .ant-select-arrow {
-          display: none;
-        }
-
-        .ant-select-selection-selected-value {
-          color: #606266;
-        }
-      }
-
-      .DATE-container {
-        .ant-input {
-          padding: 0;
-          text-align: center;
-          border: 0 !important;
-          background-color: transparent;
-        }
-
-        .ant-calendar-picker-icon {
-          display: none;
-        }
-      }
-
-      .SELECT-container {
-        .ant-select-selection {
-          max-width: 100%;
-        }
-      }
-    }
-  }
-}
+.formTable-page-disabled--detail {
+  /deep/ .vxe-table {
+    .vxe-cell {
+      .form-table-item {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 31px;
+      }
+
+      .ant-select-disabled {
+        .ant-select-selection {
+          border: 0 !important;
+          background: transparent;
+        }
+
+        .ant-select-arrow {
+          display: none;
+        }
+
+        .ant-select-selection-selected-value {
+          color: #606266;
+        }
+      }
+
+      .DATE-container {
+        .ant-input {
+          padding: 0;
+          text-align: center;
+          border: 0 !important;
+          background-color: transparent;
+        }
+
+        .ant-calendar-picker-icon {
+          display: none;
+        }
+      }
+
+      .SELECT-container {
+        .ant-select-selection {
+          max-width: 100%;
+        }
+      }
+    }
+  }
+}

package/packages/grid/index.js

@@ -1,10 +1,10 @@
-// 导入组件
-import Grid from './src/grid.js'
-
-// 为组件提供 install 安装方法，供按需引入
-Grid.install = function (Vue) {
-    Vue.component(Grid.name, Grid)
-}
-
-// 默认导出组件
-export default Grid
+// 导入组件
+import Grid from './src/grid.js'
+
+// 为组件提供 install 安装方法，供按需引入
+Grid.install = function (Vue) {
+    Vue.component(Grid.name, Grid)
+}
+
+// 默认导出组件
+export default Grid

package/packages/grid/src/grid.js

@@ -1,28 +1,28 @@
-/**
- * @author ruanlin
- * @desc 继承于vxe-table
- * @time 2021-05-13
- */
-import Vue from 'vue';
-import 'xe-utils';
-import VXETable from 'vxe-table';
-import VXETablePluginAntd from 'vxe-table-plugin-antd'
-import Grid from 'vxe-table/lib/grid';
-import 'vxe-table/lib/style.css';
-import 'vxe-table-plugin-antd/dist/style.css'
-
-VXETable.use(VXETablePluginAntd);
-import create from '@/core/create';
-import tableMethods from '@/core/table-methods';
-
-export default create({
-  name: 'grid',
-  props: Object.assign({}, Grid.props),
-  mixins: [tableMethods()],
-  beforeCreate() {
-    Vue.use(VXETable);
-  },
-  render() {
-    return [<vxe-grid ref="xGrid" {...{ props: this.$props, scopedSlots: this.$scopedSlots, on: this.$listeners }} />];
-  }
-});
+/**
+ * @author ruanlin
+ * @desc 继承于vxe-table
+ * @time 2021-05-13
+ */
+import Vue from 'vue';
+import 'xe-utils';
+import VXETable from 'vxe-table';
+import VXETablePluginAntd from 'vxe-table-plugin-antd'
+import Grid from 'vxe-table/lib/grid';
+import 'vxe-table/lib/style.css';
+import 'vxe-table-plugin-antd/dist/style.css'
+
+VXETable.use(VXETablePluginAntd);
+import create from '@/core/create';
+import tableMethods from '@/core/table-methods';
+
+export default create({
+  name: 'grid',
+  props: Object.assign({}, Grid.props),
+  mixins: [tableMethods()],
+  beforeCreate() {
+    Vue.use(VXETable);
+  },
+  render() {
+    return [<vxe-grid ref="xGrid" {...{ props: this.$props, scopedSlots: this.$scopedSlots, on: this.$listeners }} />];
+  }
+});

package/packages/icon/index.js

@@ -1,10 +1,10 @@
-// 导入组件
-import Icon from './src/icon.js';
-
-// 为组件提供 install 安装方法，供按需引入
-Icon.install = function(Vue) {
-  Vue.component(Icon.name, Icon);
-};
-
-// 默认导出组件
-export default Icon;
+// 导入组件
+import Icon from './src/icon.js';
+
+// 为组件提供 install 安装方法，供按需引入
+Icon.install = function(Vue) {
+  Vue.component(Icon.name, Icon);
+};
+
+// 默认导出组件
+export default Icon;

package/packages/icon/src/icon.js

@@ -1,13 +1,13 @@
-/**
- * @author ruanlin
- * @desc 全继承antd组件，后期再扩展
- * @time 2021-05-13
- */
-import { Icon } from 'ant-design-vue';
-
-import create from '@/core/create';
-
-export default create({
-  name: 'icon',
-  extends: Icon
-});
+/**
+ * @author ruanlin
+ * @desc 全继承antd组件，后期再扩展
+ * @time 2021-05-13
+ */
+import { Icon } from 'ant-design-vue';
+
+import create from '@/core/create';
+
+export default create({
+  name: 'icon',
+  extends: Icon
+});