hrsass-components 2.3.7 → 2.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
65
65
  var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
66
66
  var saveSvgAsPng = require('save-svg-as-png');
67
67
 
68
- var version = "2.3.7";
68
+ var version = "2.3.9";
69
69
 
70
70
  /**
71
71
  * 版本号
@@ -3666,7 +3666,7 @@ var HrAppendix = {
3666
3666
  this.$emit("save", dataSource);
3667
3667
  $appendix = h("div", {
3668
3668
  "class": "hr-appendix hr-appendix-table hr-appendix-".concat(this.imageSize)
3669
- }, [(!disabled || btn) && h("header", [h("a-upload", _objectSpread$6(_objectSpread$6({}, options), {}, {
3669
+ }, [(!disabled || btn) && (this.readOnly || h("header", [h("a-upload", _objectSpread$6(_objectSpread$6({}, options), {}, {
3670
3670
  props: _objectSpread$6(_objectSpread$6({}, options.props), {}, {
3671
3671
  showUploadList: false
3672
3672
  })
@@ -3683,7 +3683,7 @@ var HrAppendix = {
3683
3683
  return _this7.capture(dataUrl, prefix);
3684
3684
  }
3685
3685
  }
3686
- })])]), h("a-table", {
3686
+ })])])), h("a-table", {
3687
3687
  attrs: {
3688
3688
  size: "small",
3689
3689
  bordered: true,
@@ -4898,7 +4898,8 @@ var TableProps = {
4898
4898
  normalizeConfig: VuePropTypes.func,
4899
4899
  normalizeData: VuePropTypes.func,
4900
4900
  selectedRowsList: VuePropTypes.array,
4901
- keepSelected: VuePropTypes.bool
4901
+ keepSelected: VuePropTypes.bool,
4902
+ showFile: VuePropTypes.bool
4902
4903
  // dataSource: PropTypes.array,
4903
4904
  };
4904
4905
  var FilterProps = {
@@ -7080,8 +7081,6 @@ var Filter = {
7080
7081
  var _excluded$2 = ["rules"];
7081
7082
  function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
7082
7083
  function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
7083
- // import './style/index'
7084
-
7085
7084
  var TABLE_COLUMN_GROUP_NAME = "hr-table-column-group";
7086
7085
  var TABLE_COLUMN_NAME = "hr-table-column";
7087
7086
  var HR_BUTTON = "hr-button";
@@ -7118,7 +7117,8 @@ var HrTableBase = {
7118
7117
  schemeList: VuePropTypes.array,
7119
7118
  defaultShowCount: VuePropTypes.number,
7120
7119
  selectedSchemeId: VuePropTypes.any,
7121
- selectedUpdateRows: VuePropTypes.array
7120
+ selectedUpdateRows: VuePropTypes.array,
7121
+ showFile: VuePropTypes.bool
7122
7122
  }, {
7123
7123
  prefixCls: "hr-table-base",
7124
7124
  multiple: true,
@@ -7155,7 +7155,9 @@ var HrTableBase = {
7155
7155
  //搜索条件默认显示数
7156
7156
  selectedSchemeId: null,
7157
7157
  //选择的方案Id
7158
- selectedUpdateRows: [] //选中行列表
7158
+ selectedUpdateRows: [],
7159
+ //选中行列表
7160
+ showFile: false //是否显示文件列
7159
7161
  }),
7160
7162
  data: function data() {
7161
7163
  return {
@@ -7575,12 +7577,23 @@ var HrTableBase = {
7575
7577
  }
7576
7578
  });
7577
7579
  },
7580
+ _renderCellFile: function _renderCellFile(item, v, record) {
7581
+ var h = this.$createElement;
7582
+ return h(HrAppendix, {
7583
+ attrs: {
7584
+ "read-only": true,
7585
+ multiple: ['MUTIFILE', 'MUTIIMG'].indexOf(item.controlType) !== -1,
7586
+ value: v
7587
+ }
7588
+ });
7589
+ },
7578
7590
  _renderColumns: function _renderColumns(columnList) {
7579
7591
  var _this8 = this;
7580
7592
  var h = this.$createElement;
7581
7593
  var _getOptionProps6 = getOptionProps(this),
7582
7594
  editable = _getOptionProps6.editable,
7583
- maxWidth = _getOptionProps6.maxWidth;
7595
+ maxWidth = _getOptionProps6.maxWidth,
7596
+ showFile = _getOptionProps6.showFile;
7584
7597
  return columnList.map(function (item) {
7585
7598
  if (item.children && item.children.length > 0) {
7586
7599
  var checkedLen = item.children.filter(function (o) {
@@ -7601,6 +7614,8 @@ var HrTableBase = {
7601
7614
  r = function r(v, record) {
7602
7615
  if (editable && item.isEdit) {
7603
7616
  return _this8._renderCellComp(item, v, record);
7617
+ } else if (['IMG', 'SINGLEFILE', 'MUTIFILE', 'MUTIIMG'].indexOf(item.controlType) >= 0 && showFile) {
7618
+ return _this8._renderCellFile(item, v, record);
7604
7619
  } else {
7605
7620
  return _this8._renderCellText(item, v, record);
7606
7621
  }
@@ -8135,7 +8150,9 @@ var index = {
8135
8150
  normalizeData: function normalizeData(data) {
8136
8151
  return data;
8137
8152
  },
8138
- keepSelected: false //是否保持跨页选中
8153
+ keepSelected: false,
8154
+ //是否保持跨页选中
8155
+ showFile: false //是否显示文件列
8139
8156
  }),
8140
8157
  data: function data() {
8141
8158
  return {
@@ -8522,8 +8539,23 @@ var index = {
8522
8539
  var _conditionList = conditionList.filter(function (item) {
8523
8540
  return item.value || item.controlType === "SWITCH";
8524
8541
  });
8542
+ _conditionList = _conditionList.concat(tempConditionListByScheme, conditionListByScheme);
8543
+ var conditonListDeepClone = _.cloneDeep(_conditionList);
8544
+ var fitlerOtehrConditionListDeepClone = conditonListDeepClone.filter(function (item) {
8545
+ return item.codeType !== "org_organize_dept_tree_all" && item.controlType !== "DATERANGE";
8546
+ });
8547
+ console.log('toolbar conditionListDeepClone', fitlerOtehrConditionListDeepClone);
8548
+ var fitlerConditionListDeepClone = conditonListDeepClone.filter(function (item) {
8549
+ return (item.codeType === "org_organize_dept_tree_all" && item.controlType === "SELECTOR" || item.controlType === "DATERANGE") && _.isArray(item.value) && item.value.length > 0 && !item.value.every(function (val) {
8550
+ return typeof val === 'string' && val.trim() === '';
8551
+ });
8552
+ }).map(function (sub) {
8553
+ return _objectSpread$d(_objectSpread$d({}, sub), {}, {
8554
+ value: sub.value.join(",")
8555
+ });
8556
+ });
8525
8557
  var opts = {
8526
- condition: _conditionList.concat(tempConditionListByScheme, conditionListByScheme),
8558
+ condition: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone)),
8527
8559
  columns: columns
8528
8560
  };
8529
8561
  this.$axios.post("platform/imp/downloadGridData.search?code=".concat(code), opts).then(function (res) {
@@ -8709,7 +8741,8 @@ var index = {
8709
8741
  rowKey = _getOptionProps6.rowKey,
8710
8742
  showDownload = _getOptionProps6.showDownload,
8711
8743
  showFilter = _getOptionProps6.showFilter,
8712
- code = _getOptionProps6.code;
8744
+ code = _getOptionProps6.code,
8745
+ showFile = _getOptionProps6.showFile;
8713
8746
  return h("div", {
8714
8747
  "class": classNames(prefixCls, cls)
8715
8748
  }, [h(HrTableBase, {
@@ -8722,6 +8755,7 @@ var index = {
8722
8755
  columns: columnList,
8723
8756
  code: code,
8724
8757
  multiple: multiple,
8758
+ showFile: showFile,
8725
8759
  rowKey: rowKey,
8726
8760
  selection: selection,
8727
8761
  dataSource: dataSource,