@indfnd/common 0.1.6 → 0.1.8

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.8](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.7...v0.1.8) (2024-03-29)
+
+
+### Features
+
+* 查询表单支持查询条件通行；报表组件完善入库 ([9640832](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/96408327b005bc2beeb5dd64697307dd0d0d90a0))
+
+### [0.1.7](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.6...v0.1.7) (2024-03-29)
+
 ### [0.1.6](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.5...v0.1.6) (2024-03-28)
 
 

package/dist/ind-common.es.js

@@ -2,7 +2,7 @@ import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Draw
 import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.5";
+const version = "0.1.7";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -48386,6 +48386,7 @@ var FormImpl = {
           };
           if (d.validate) {
             validateTmp.validator = d.validate;
+            validateTmp.message = null;
           }
           if (["number"].includes(d.type)) {
             validateTmp.type = "number";
@@ -48524,21 +48525,22 @@ var FormImpl = {
   render(h) {
     let formItems = [];
     let spanList;
-    if (this.formType == "search") {
-      spanList = _.fill(_.range(Math.max(4, this.fieldList.length)), 6);
-    } else {
-      spanList = _.fill(_.range(this.fieldList.length), this.defaultSpan);
-      _.forEach(this.fieldList, (d, idx) => {
-        if (d.span) {
-          spanList[idx] = d.span;
-        } else if (["textarea", "fileUpload", "imgUpload"].includes(d.type)) {
-          spanList[idx] = 24;
-        }
-        let conditionFlag = d.condition instanceof Function ? d.condition(this.form) : d.condition !== false;
-        if (!conditionFlag) {
-          spanList[idx] = 0;
-        }
-      });
+    spanList = _.fill(
+      _.range(this.fieldList.length),
+      this.formType == "search" ? 6 : this.defaultSpan
+    );
+    _.forEach(this.fieldList, (d, idx) => {
+      if (d.span) {
+        spanList[idx] = d.span;
+      } else if (["textarea", "fileUpload", "imgUpload"].includes(d.type)) {
+        spanList[idx] = 24;
+      }
+      let conditionFlag = d.condition instanceof Function ? d.condition(this.form) : d.condition !== false;
+      if (!conditionFlag) {
+        spanList[idx] = 0;
+      }
+    });
+    if (this.formType !== "search") {
       let spanCount = 0;
       _.forEach(spanList, (d, idx) => {
         if (spanCount != 0 && d != this.defaultSpan && d !== 0) {
@@ -51861,7 +51863,7 @@ var render$U = function() {
     _vm.checkAllGroup = $$v;
   }, expression: "checkAllGroup" } }, [_vm._l(_vm.columns, function(item2) {
     return [item2.title ? _c("Checkbox", { key: item2.field, attrs: { "label": item2.title } }, [_vm._v(_vm._s(item2.title))]) : _vm._e()];
-  }), _c("br"), _c("br"), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnSave } }, [_vm._v("\u4FDD \u5B58")]), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnClear } }, [_vm._v("\u6E05 \u9664")])], 2)] : _vm._e(), _vm.btnSel != "1" ? _c("Button", { staticStyle: { "position": "absolute", "top": "10px", "right": "10px" }, attrs: { "type": "primary", "icon": "md-close", "size": "small", "title": "\u5173\u95ED" }, on: { "click": _vm.closeTableSettingDropdown } }) : _vm._e()], 2)], 1) : _vm._e()], 1)]) : _vm._e()], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": true, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight || null, "getRowHeight": _vm.getRowHeight, "rowData": _vm.tableData, "suppressRowClickSelection": _vm.isEditTable || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClass, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
+  }), _c("br"), _c("br"), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnSave } }, [_vm._v("\u4FDD \u5B58")]), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnClear } }, [_vm._v("\u6E05 \u9664")])], 2)] : _vm._e(), _vm.btnSel != "1" ? _c("Button", { staticStyle: { "position": "absolute", "top": "10px", "right": "10px" }, attrs: { "type": "primary", "icon": "md-close", "size": "small", "title": "\u5173\u95ED" }, on: { "click": _vm.closeTableSettingDropdown } }) : _vm._e()], 2)], 1) : _vm._e()], 1)]) : _vm._e()], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": true, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "getRowHeight": _vm.getRowHeight, "rowData": _vm.tableData, "suppressRowClickSelection": _vm.isEditTable || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClass, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
 };
 var staticRenderFns$U = [];
 function suppressNavigation(params) {
@@ -60298,7 +60300,6 @@ function deepEach$1(parentNode, list, callback) {
   }
 }
 function generateNodeWithPath(dimension, nodes) {
-  console.log("dimension is", dimension, "nodes is", nodes);
   let nodeClone = _.cloneDeep(nodes);
   deepEach$1(dimension, nodeClone, (d, p, idx) => {
     let pPath = p.path ? _.cloneDeep(p.path) : [{ id: p.id, title: p.title }];
@@ -60324,7 +60325,6 @@ function concatNodes(choosedNodes, newNodes, options) {
       let newPathArr = oldPathStr.split("_");
       newPathArr.splice(1, 1, dd.id);
       let newPathStr = newPathArr.join("_");
-      console.log("newPathStr is", newPathStr);
       if (_.findIndex(choosedNodesClone, { pathStr: newPathStr }) == -1) {
         let pathTmp = _.cloneDeep(d.path);
         pathTmp.splice(1, 0, { id: dd.id, title: dd.title });
@@ -60340,9 +60340,34 @@ function concatNodes(choosedNodes, newNodes, options) {
   });
   return choosedNodesClone;
 }
+function generateChoosedNodesByInit(options) {
+  let rlt = [];
+  _.forEach(options, (option) => {
+    let checkedOptions = _.filter(option.options, { checked: true });
+    let checkedIndex = [];
+    let indexListTmp = generateNodeWithPath(option, [
+      {
+        id: "ALL",
+        title: "\u5168\u9009",
+        children: option.indexList
+      }
+    ]);
+    deepEach$1({}, indexListTmp, (d) => {
+      if (!d.children || !d.children.length) {
+        if (d.checked === true) {
+          checkedIndex.push(d);
+        }
+      }
+    });
+    if (checkedOptions.length && checkedIndex.length) {
+      rlt = concatNodes(rlt, checkedIndex, checkedOptions);
+    }
+  });
+  console.log("generateChoosedNodesByInit rlt is", rlt);
+  return rlt;
+}
 function addNodeToTree(tree, node) {
   function addNodeToTreeInner(subTree, path2) {
-    console.log(subTree, "path is", path2);
     if (!(path2 == null ? void 0 : path2.length)) {
       return;
     }
@@ -60351,7 +60376,7 @@ function addNodeToTree(tree, node) {
     if (!midNode) {
       midNode = {
         pathStr: path2.length == 0 ? node.pathStr : "",
-        id: midPathNode == null ? void 0 : midPathNode.id,
+        id: path2.length == 0 ? node.pathStr : midPathNode == null ? void 0 : midPathNode.id,
         title: midPathNode == null ? void 0 : midPathNode.title,
         children: []
       };
@@ -60365,6 +60390,13 @@ function addNodeToTree(tree, node) {
 function generateTreeByNodes(nodes) {
   let rlt = [];
   nodes.forEach((d) => addNodeToTree(rlt, d));
+  rlt = _.orderBy(rlt, ["seq"], ["asc"]);
+  deepEach$1({}, rlt, (d) => {
+    var _a;
+    if ((_a = d.children) == null ? void 0 : _a.length) {
+      d.children = _.orderBy(d.children, ["seq"], ["asc"]);
+    }
+  });
   return rlt;
 }
 function generateColumnsByTreeNodes(treeNodes) {
@@ -60380,6 +60412,15 @@ function generateColumnsByTreeNodes(treeNodes) {
   });
   return rlt;
 }
+function generateOptionsByTreeNodes(treeNodes) {
+  let columnsClone = _.cloneDeep(treeNodes);
+  let rlt = {};
+  columnsClone.forEach((d) => {
+    var _a;
+    rlt[d.id] = (_a = d.children) == null ? void 0 : _a.map((dd) => dd.id);
+  });
+  return rlt;
+}
 function getFilterColumnsByParams(options, columns) {
   let columnsClone = _.cloneDeep(columns);
   let itemIdx = _.findIndex(columnsClone, { field: "item" });
@@ -60408,17 +60449,17 @@ var render$d = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("Modal", { attrs: { "value": _vm.show, "title": _vm.title, "mask-closable": false, "width": _vm.width, "transfer": "" }, on: { "input": function($event) {
+  return _c("Modal", { attrs: { "lazyRender": false, "value": _vm.show, "title": _vm.title, "mask-closable": false, "width": _vm.width, "transfer": "" }, on: { "input": function($event) {
     return _vm.$emit("update:show", $event);
   }, "on-cancel": _vm.onCancel } }, [_c("div", { staticClass: "report-index-model-panel ind-flex" }, [_c("div", { staticClass: "left-panel ind-flex ind-flex-grow" }, [_c("div", { staticClass: "report-index-dimension1-panel ind-flex-no-shrink ind-flex-column" }, _vm._l(_vm.indexesSouce, function(dimensionItem1, idx) {
     return _c("div", { key: "dimension1" + idx, staticClass: "report-index-dimension1", class: [dimensionItem1.id == _vm.dimension1.id ? "selected" : ""], on: { "click": function($event) {
       return _vm.chooseDimension1(dimensionItem1);
     } } }, [_vm._v(" " + _vm._s(dimensionItem1.title) + " ")]);
-  }), 0), _c("div", { staticClass: "report-index-index-panel ind-flex-column ind-flex-grow" }, [_c("div", { staticClass: "report-index-options" }, [_vm.dimension1.options.length == 1 ? [_vm._v(" " + _vm._s(_vm.options[0].title || "") + " ")] : [_c("Select", { attrs: { "multiple": "" }, model: { value: _vm.optionsData, callback: function($$v) {
+  }), 0), _c("div", { staticClass: "report-index-index-panel ind-flex-column ind-flex-grow" }, [_c("div", { staticClass: "report-index-options" }, [_vm.dimension1.options.length == 1 ? [_vm._v(" " + _vm._s(_vm.options[0].title || "") + " ")] : [_c("Select", { attrs: { "multiple": "" }, on: { "on-change": _vm.setDisabled1 }, model: { value: _vm.optionsData, callback: function($$v) {
     _vm.optionsData = $$v;
   }, expression: "optionsData" } }, _vm._l(_vm.dimension1.options, function(item2) {
     return _c("Option", { key: item2.id, attrs: { "value": item2.id } }, [_vm._v(_vm._s(item2.title))]);
-  }), 1)]], 2), _c("div", { staticClass: "report-index-index" }, [_c("Tree", { ref: "tree1", attrs: { "height": "500px", "expandAll": "", "show-checkbox": "", "data": _vm.indexListSrc, "isShowHeader": false, "is-show-search": true, "check-directly": "" } })], 1)])]), _c("div", { staticClass: "opt-panel ind-flex-no-shrink ind-flex-column" }, [_c("Button", { attrs: { "type": "default", "icon": "md-arrow-back" }, on: { "click": _vm.removeIndex } }), _c("Button", { staticStyle: { "margin-top": "10px" }, attrs: { "type": "default", "icon": "md-arrow-forward" }, on: { "click": _vm.addIndex } })], 1), _c("div", { staticClass: "right-panel ind-flex-grow" }, [_c("Tree", { ref: "tree2", attrs: { "height": "600px", "expandAll": "", "show-checkbox": "", "data": _vm.choosedIndexTree, "isShowHeader": false, "is-show-search": true, "check-directly": "" } })], 1)]), _c("div", { attrs: { "slot": "footer" }, slot: "footer" }, [_c("IndButtonGroup", { attrs: { "right": "", "split": "" } }, [_c("IndButton", { attrs: { "bizType": "cancel" }, on: { "click": _vm.onCancel } }, [_vm._v("\u53D6\u6D88")]), _c("IndButton", { attrs: { "bizType": "confirm" }, on: { "click": _vm.onOk } }, [_vm._v("\u786E\u5B9A")])], 1)], 1)]);
+  }), 1)]], 2), _c("div", { staticClass: "report-index-index" }, [_c("Tree", { ref: "tree1", attrs: { "height": "500px", "expandAll": "", "show-checkbox": "", "data": _vm.indexListSrc, "isShowHeader": false, "is-show-search": true, "check-directly": "" }, on: { "on-check-change": _vm.setDisabled1 } })], 1)])]), _c("div", { staticClass: "opt-panel ind-flex-no-shrink ind-flex-column" }, [_c("Button", { attrs: { "disabled": _vm.addDisabled, "type": "default", "icon": "md-arrow-forward" }, on: { "click": _vm.addIndex } }), _c("Button", { staticStyle: { "margin-top": "10px" }, attrs: { "type": "default", "disabled": _vm.removeDisabled, "icon": "md-arrow-back" }, on: { "click": _vm.removeIndex } })], 1), _c("div", { staticClass: "right-panel ind-flex-grow" }, [_c("Tree", { ref: "tree2", attrs: { "height": "600px", "expandAll": "", "show-checkbox": "", "data": _vm.choosedIndexTree, "isShowHeader": false, "is-show-search": true, "check-directly": "" }, on: { "on-check-change": _vm.setDisabled2 } })], 1)]), _c("div", { attrs: { "slot": "footer" }, slot: "footer" }, [_c("IndButtonGroup", { attrs: { "right": "", "split": "" } }, [_c("IndButton", { attrs: { "bizType": "cancel" }, on: { "click": _vm.onCancel } }, [_vm._v("\u53D6\u6D88")]), _c("IndButton", { attrs: { "bizType": "confirm" }, on: { "click": _vm.onOk } }, [_vm._v("\u786E\u5B9A")])], 1)], 1)]);
 };
 var staticRenderFns$d = [];
 const __vue2_script$d = {
@@ -60451,13 +60492,32 @@ const __vue2_script$d = {
       indexListSrc: [],
       indexList: [],
       choosedIndexList: [],
-      choosedIndexTree: []
+      choosedIndexTree: [],
+      addDisabled: true,
+      removeDisabled: true
     };
   },
   created() {
     this.initSrc();
   },
+  watch: {
+    options: {
+      hanlder: function() {
+        this.initSrc();
+      },
+      deep: true
+    }
+  },
   methods: {
+    setDisabled1() {
+      var _a;
+      let indexList1 = this.$refs.tree1.getCheckedNodes(true);
+      this.addDisabled = !((indexList1 == null ? void 0 : indexList1.length) && ((_a = this.optionsData) == null ? void 0 : _a.length));
+    },
+    setDisabled2() {
+      let indexList2 = this.$refs.tree2.getCheckedNodes(true);
+      this.removeDisabled = !(indexList2 == null ? void 0 : indexList2.length);
+    },
     async initSrc() {
       if (this.dataApi) {
         const { data } = await this.dataApi(this.searchParams);
@@ -60475,6 +60535,14 @@ const __vue2_script$d = {
         }
       ]);
       this.indexList = [];
+      this.initIndexByDefault();
+    },
+    initIndexByDefault() {
+      this.choosedIndexList = generateChoosedNodesByInit(this.indexesSouce) || [];
+      this.choosedIndexTree = generateTreeByNodes(this.choosedIndexList);
+      this.$nextTick(() => {
+        this.onOk();
+      });
     },
     chooseDimension1(dimension1) {
       this.dimension1 = dimension1;
@@ -60500,7 +60568,7 @@ const __vue2_script$d = {
     },
     removeIndex() {
       let choosedIndexListClone = _.cloneDeep(this.choosedIndexList);
-      let indexes = this.$refs.tree1.getCheckedNodes(true);
+      let indexes = this.$refs.tree2.getCheckedNodes(true);
       _.remove(choosedIndexListClone, (d) => {
         return _.some(indexes, (dd) => {
           return dd.pathStr === d.pathStr;
@@ -60513,9 +60581,11 @@ const __vue2_script$d = {
       this.$emit("update:show", false);
     },
     onOk() {
+      let columns = generateColumnsByTreeNodes(this.choosedIndexTree);
+      let options = generateOptionsByTreeNodes(this.choosedIndexTree);
       this.$emit("update:show", false);
-      this.$emit("input", generateColumnsByTreeNodes(this.choosedIndexTree));
-      this.$emit("confirm");
+      this.$emit("input", columns);
+      this.$emit("confirm", { options, columns });
     },
     getFilterColumnsByParams(options) {
       let columns = generateColumnsByTreeNodes(this.choosedIndexTree);