cnhis-design-vue 3.1.5-beta.16 → 3.1.5-beta.17

package/es/src/utils/vexutils.js

@@ -1,3 +1,80 @@
-export { formatReleaseTime, handleLabelColor } from './vexutils2.js';
+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";
+  let oldColorMap = {
+    blue: "#0000ff",
+    sky: "#87ceeb",
+    azure: "#f0ffff",
+    palegreen: "#98fb98",
+    yellow: "#ffff00",
+    darkorange: "#ff8c00",
+    magenta: "#ff00ff",
+    purple: "#800080",
+    maroon: "#800000",
+    orange: "#ffa500",
+    green: "#008000",
+    red: "#ff0000",
+    grey: "#808080"
+  };
+  if ((_a = item == null ? void 0 : item.color) == null ? void 0 : _a.includes("-")) {
+    let str = item.color.split("-")[1];
+    tempColor = oldColorMap[str] || "#5585f5";
+  } else {
+    tempColor = item.color || "#5585f5";
+  }
+  const tempRgba = XEUtils.hexToRGBA(tempColor) || {
+    r: 85,
+    g: 133,
+    b: 245,
+    a: 1
+  };
+  if (isSelect) {
+    return {
+      color: "#fff",
+      background: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`,
+      borderColor: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`
+    };
+  }
+  if (item.isSelect) {
+    return {
+      color: "#fff",
+      background: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`,
+      borderColor: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`
+    };
+  } else {
+    let isSys = !(item.isPublic && item.isPublic == 1);
+    let color = isSys ? "rgba(28, 28, 28, 1)" : "rgba(33, 33, 33, 0.6)";
+    return {
+      color,
+      background: "rgba(250, 250, 250, 1)",
+      borderColor: "rgba(213, 213, 213, 0.8)"
+    };
+  }
+}
+
+export { formatReleaseTime, handleLabelColor };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.5-beta.16",
+  "version": "3.1.5-beta.17",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -26,13 +26,12 @@
   },
   "peerDependencies": {
     "naive-ui": "^2.29.0",
-    "vue": ">=3.2.0"
+    "vue": "^3.2.0"
   },
   "dependencies": {
     "@formily/core": "^2.1.9",
     "@formily/vue": "^2.1.9",
     "@highlightjs/vue-plugin": "^2.1.0",
-    "@types/fabric": "^4.5.9",
     "@vicons/ionicons5": "^0.12.0",
     "@vueuse/core": "^8.6.0",
     "@vueuse/shared": "^8.6.0",
@@ -42,7 +41,6 @@
     "babel-preset-typescript": "7.0.0-alpha.19",
     "bpmn-js": "^9.2.2",
     "crypto-js": "^4.1.1",
-    "fabric": "^5.2.1",
     "highlight.js": "^11.5.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
@@ -63,7 +61,6 @@
     "xe-utils": "^3.5.4"
   },
   "devDependencies": {
-    "codesandbox": "^2.2.3",
     "@babel/cli": "^7.17.10",
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
@@ -91,6 +88,7 @@
     "axios": "^0.27.2",
     "bpmn-js": "^9.2.2",
     "chalk": "^5.0.1",
+    "codesandbox": "^2.2.3",
     "consola": "^2.15.3",
     "cross-env": "^7.0.3",
     "cssnano": "^5.1.7",

package/es/packages/big-table/index2.js

@@ -1,17 +0,0 @@
-import { COMPONENT_NAMESPACE } from '../../src/global/variable';
-import { safeComponentRegister } from '../../src/utils';
-import { loadVxeTable } from '../../src/utils/loadVxe';
-import { expandXEUtils } from '../../src/utils/utilExpand';
-import { CGrid } from '../../packages/index';
-import './src/BigTable2.js';
-import script from './src/BigTable.vue_vue_type_script_setup_true_lang.js';
-
-const BigTable = script;
-BigTable.install = function(app) {
-  safeComponentRegister(app, BigTable, COMPONENT_NAMESPACE + "BigTable");
-  safeComponentRegister(app, CGrid, COMPONENT_NAMESPACE + "Grid");
-  loadVxeTable(app);
-  expandXEUtils();
-};
-
-export { BigTable as default };

package/es/packages/big-table/src/BigTable2.js

@@ -1,4 +0,0 @@
-import script from './BigTable.vue_vue_type_script_setup_true_lang.js';
-export { default } from './BigTable.vue_vue_type_script_setup_true_lang.js';
-
-script.__file = "packages/big-table/src/BigTable.vue";

package/es/packages/big-table/src/bigTableEmits2.js

@@ -1,50 +0,0 @@
-const bigTableEmits = [
-  "refreshTable",
-  "selectionChangeAll",
-  "selectionChangeAllCancel",
-  "setGroupText",
-  "refreshOldTableData",
-  "setNestTableClick",
-  "rowdblclick",
-  "selectionChange",
-  "sortChange",
-  "pubTableRefresh",
-  "setBatchDynamicPropsCache",
-  "submitEditFormSuccess",
-  "submitEditFormSuccessBatch",
-  "submitEditFormError",
-  "submitEditFormErrorBatch",
-  "setWaitEditKeys",
-  "handleClickBtnByInline",
-  "initInlineEditFormConfig",
-  "handlePreView",
-  "SET_SAVE_ROW_STATUS",
-  "SET_CANCEL_ROW_STATUS",
-  "qrCodeEvent",
-  "setCurRowIndex",
-  "clickBtn",
-  "onSave",
-  "setNestTableClickSetting",
-  "showDrawer",
-  "linkDetail",
-  "hanldeCopyContent",
-  "triggerSpinning",
-  "resetInlineEditAll",
-  "resetBatchEditDoneStatus",
-  "setNestOriginTableMap",
-  "nestSetSelectRowObj",
-  "handlerClickRow",
-  "pubTableReload",
-  "scanMultiRemove",
-  "resetNestLastClickTable",
-  "setNestLastClickTable",
-  "selectionChangeLocal",
-  "switchBtnOnChange",
-  "asyncTableChange",
-  "formChange",
-  "scroll",
-  "keyboard",
-  "checkboxChange"
-];
-
-export { bigTableEmits as default };

package/es/packages/big-table/src/bigTableProps2.js

@@ -1,116 +0,0 @@
-const bigTableProps = {
-  data: { type: Array, default: () => [] },
-  maxCheckSize: { type: Number, default: 0 },
-  showFooter: Boolean,
-  sumData: { type: Object, default: () => ({}) },
-  avgData: { type: Object, default: () => ({}) },
-  columnConfig: {
-    type: Object,
-    default: () => {
-      return {};
-    }
-  },
-  refreshRow: {
-    type: Number,
-    default: 0
-  },
-  relatedItems: {
-    type: Object,
-    default: () => {
-      return {
-        triggerMethodPc: "",
-        triggerMethodField: ""
-      };
-    }
-  },
-  pageVO: {
-    type: Object,
-    default: () => {
-      return {
-        pageIndex: 1,
-        pageSize: 20,
-        total: 20
-      };
-    }
-  },
-  tableOptions: { type: Object, default: () => ({}) },
-  quickSearchConfig: { type: Array, default: () => [] },
-  primaryKey: { type: String, default: "" },
-  tableDataCache: { type: Array, default: () => [] },
-  oldtableData: { type: Array, default: () => [] },
-  tableName: String,
-  fieldListOriginal: { type: Array, default: () => [] },
-  tableParams: { type: Object, default: () => ({}) },
-  emptyItems: {
-    type: Object,
-    default: () => {
-      return {
-        noDataImg: "nodata",
-        noDataTip: ""
-      };
-    }
-  },
-  styleSetting: { type: Object, default: () => ({}) },
-  sysImageSize: { type: Array, default: () => [] },
-  height: String,
-  groupCountFields: { type: Array, default: () => [] },
-  groupCountMap: { type: Object, default: () => ({}) },
-  listFormUnionSetting: { type: Object, default: () => ({}) },
-  inlineEditFormConfig: { type: Object, default: () => ({}) },
-  clickRowData: { type: Object, default: () => ({}) },
-  btnList: { type: Array, default: () => [] },
-  spinning: Boolean,
-  rowGroupSetting: { type: Object, default: () => ({}) },
-  inlineEditFormSubmitDone: Boolean,
-  isInlineOperating: { type: Boolean, default: false },
-  inlineEditCurrentOperateBtnId: String,
-  tableRefreshCache: { type: Object, default: () => ({}) },
-  userInfo: { type: Object, default: () => ({}) },
-  isInlineEditing: Boolean,
-  isInlineAdding: Boolean,
-  isInlineSave: Boolean,
-  isInlineCancel: Boolean,
-  inlineError: Boolean,
-  resetInlineEdit: Function,
-  resetEditRowStatus: Function,
-  pageIndexOldtableData: {
-    type: Array,
-    default: () => []
-  },
-  submitForm: Function,
-  isMatchComponent: Boolean,
-  asyncCount: Boolean,
-  showSettings: { type: Object, default: () => ({}) },
-  inlineFormData: { type: Object, default: () => ({}) },
-  inlineOriginalTableRow: { type: Object, default: () => ({}) },
-  filterDomPortal: {
-    type: String,
-    default: "body"
-  },
-  filterTopOffset: {
-    type: Number,
-    default: 0
-  },
-  isNestTable: {
-    type: Boolean,
-    default: false
-  },
-  showNestTable: Boolean,
-  curNestColumnConfig: {
-    type: Object,
-    default: () => ({})
-  },
-  nestTableDataRequest: Function,
-  isBatchEditing: Boolean,
-  isEditAllRow: Boolean,
-  isBatchSave: Boolean,
-  isBatchCancel: Boolean,
-  batchDynamicPropsCache: { type: Object, default: () => ({}) },
-  batchEditDoneNumber: { type: Object, default: () => ({}) },
-  batchError: Boolean,
-  batchFormData: { type: Object, default: () => ({}) },
-  resetInlineBatchEdit: Function,
-  resetBatchEditRowStatus: Function
-};
-
-export { bigTableProps as default };

package/es/packages/big-table/src/bigTableState2.js

@@ -1,52 +0,0 @@
-const bigTableState = {
-  curAbleCheckedLen: 0,
-  showButtonTop: 0,
-  isTree: 0,
-  isShowEmpty: false,
-  currentPageSelectedLength: 0,
-  visibleCheckAllWrap: false,
-  visibleCheckAllWrapMore: false,
-  checkedRows: [],
-  filterFields: {},
-  visibleTreeCheck: false,
-  treeTableLength: 0,
-  checkWidth: {
-    "table-simple": "30",
-    "table-classics": "24"
-  },
-  lastPageIndex: 1,
-  selectType: "",
-  levelLazyLoadSetting: null,
-  openOnly: 0,
-  filterWidth: 280,
-  filterHeight: 120,
-  startX: 0,
-  distance: 0,
-  mask: "",
-  groupText: [],
-  currentClickBtnInfo: null,
-  columnLen: 0,
-  hasRefresh: false,
-  isExpand: 0,
-  btnIcons: {
-    copy: "copy",
-    pencil: "edit",
-    delete: "delete",
-    add: "plus-circle",
-    download: "download",
-    label: "tag",
-    queding: "check",
-    del: "close"
-  },
-  tableHeight: "100%",
-  cacheUniqueKey: {},
-  theUniqueKeyListObj: {},
-  editColumnMap: {},
-  fieldLength: 0,
-  originFormatList: [],
-  isSaveForm: false,
-  editConfig: { trigger: "manual", mode: "cell", autoClear: false, showIcon: false },
-  rowConfig: { height: 32 }
-};
-
-export { bigTableState as default };

package/es/packages/big-table/src/components/NoData2.js

@@ -1,4 +0,0 @@
-import script from './NoData.vue_vue_type_script_setup_true_lang.js';
-export { default } from './NoData.vue_vue_type_script_setup_true_lang.js';
-
-script.__file = "packages/big-table/src/components/NoData.vue";

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

@@ -1,114 +0,0 @@
-import { defineComponent, createVNode, mergeProps } from 'vue';
-import { NDatePicker } from 'naive-ui';
-
-var EditDate = defineComponent({
-  name: "EditDate",
-  inheritAttrs: false,
-  components: {
-    NDatePicker
-  },
-  props: {
-    col: {
-      type: Object,
-      default: () => ({})
-    },
-    row: {
-      type: Object,
-      default: () => ({})
-    },
-    index: {
-      type: [Number, Object],
-      default: 0
-    }
-  },
-  emits: ["formChange"],
-  setup(props, {
-    attrs,
-    slots,
-    emit
-  }) {
-    const onConfirm = (value) => {
-      emit("formChange", {
-        value,
-        row: props.row,
-        column: props.col,
-        index: props.index
-      });
-    };
-    const {
-      isStartDate = false,
-      isEndDate = false,
-      connectField
-    } = props.col;
-    const setDateDisabled = (cur, date) => {
-      if (isStartDate && connectField) {
-        return cur > date;
-      }
-      if (isEndDate && connectField) {
-        return cur < date;
-      }
-      return false;
-    };
-    const isDateDisabled = (ts) => {
-      if (!props.row[connectField])
-        return false;
-      return setDateDisabled(ts, isEndDate ? new Date(`${props.row[connectField].split(" ")[0]} 00:00:00`).getTime() : new Date(props.row[connectField]).getTime());
-    };
-    const isTimeDisabled = (ts) => {
-      const date = new Date(props.row[connectField]);
-      const d = new Date(ts);
-      const h = date.getHours();
-      const m = date.getMinutes();
-      const s = date.getSeconds();
-      const setDisabled = (t1, t2, d1, d2) => {
-        if (isEndDate && d1 > d2)
-          return false;
-        if (isStartDate && d1 < d2)
-          return false;
-        return setDateDisabled(t1, t2);
-      };
-      return {
-        isHourDisabled: (hour) => {
-          if (!props.row[connectField])
-            return false;
-          const d2 = new Date(`${props.row[connectField].split(" ")[0]} 00:00:00`).getTime();
-          const minute = d.getMinutes();
-          const second = d.getSeconds();
-          const d1 = ts - hour * 60 * 60 * 1e3 - minute * 60 * 1e3 - second * 1e3;
-          return setDisabled(hour, h, d1, d2);
-        },
-        isMinuteDisabled: (minute) => {
-          if (!props.row[connectField])
-            return false;
-          const d2 = new Date(`${props.row[connectField].split(" ")[0]} ${h}:00:00`).getTime();
-          const second = d.getSeconds();
-          const d1 = ts - minute * 60 * 1e3 - second * 1e3;
-          return setDisabled(minute, m, d1, d2);
-        },
-        isSecondDisabled: (second) => {
-          if (!props.row[connectField])
-            return false;
-          const d2 = new Date(`${props.row[connectField].split(" ")[0]} ${h}:${m}:00`).getTime();
-          const d1 = ts - second * 1e3;
-          return setDisabled(second, s, d1, d2);
-        }
-      };
-    };
-    const config = {
-      type: props.col.type || "datetime",
-      clearable: props.col.clearable || true,
-      disabled: props.col.disabled || false,
-      valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-      isDateDisabled: props.col.isDateDisabled || isDateDisabled,
-      placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9"
-    };
-    if (config.type.includes("time")) {
-      config.isTimeDisabled = props.col.isTimeDisabled || isTimeDisabled;
-    }
-    return () => createVNode(NDatePicker, mergeProps(attrs, config, {
-      "onUpdateFormattedValue": onConfirm
-    }), null);
-  }
-});
-
-export { EditDate as default };

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

@@ -1,54 +0,0 @@
-import { defineComponent, createVNode, mergeProps } from 'vue';
-import { NInput, NInputNumber } from 'naive-ui';
-
-var EditInput = defineComponent({
-  name: "EditInput",
-  inheritAttrs: false,
-  components: {
-    NInput,
-    NInputNumber
-  },
-  props: {
-    type: {
-      type: String,
-      default: "input"
-    },
-    col: {
-      type: Object,
-      default: () => ({})
-    },
-    row: {
-      type: Object,
-      default: () => ({})
-    },
-    index: {
-      type: [Number, Object],
-      default: 0
-    }
-  },
-  emits: ["formChange"],
-  setup(props, {
-    attrs,
-    slots,
-    emit
-  }) {
-    const onUpdateValue = (value) => {
-      emit("formChange", {
-        value,
-        row: props.row,
-        column: props.col,
-        index: props.index
-      });
-    };
-    const config = {
-      placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165"
-    };
-    return () => props.type === "input" ? createVNode(NInput, mergeProps(attrs, config, {
-      "onUpdateValue": onUpdateValue
-    }), null) : createVNode(NInputNumber, mergeProps(attrs, config, {
-      "onUpdateValue": onUpdateValue
-    }), null);
-  }
-});
-
-export { EditInput as default };

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

@@ -1,148 +0,0 @@
-import { defineComponent, reactive, createVNode } from 'vue';
-import { NSelect, NPagination, NEmpty, NSpin, NSpace } from 'naive-ui';
-import CGrid from '../../../../../packages/grid';
-import vexutils from '../../../../../src/utils/vexutils';
-
-var editSelectTable = defineComponent({
-  name: "EditSelectTable",
-  inheritAttrs: false,
-  components: {
-    NSelect,
-    CGrid,
-    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 = vexutils.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(CGrid, 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 };