@indfnd/common 0.1.79 → 0.1.81

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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.81](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.80...v0.1.81) (2024-05-28)
+
+
+### Features
+
+* 改了一堆样式 ([2651c4d](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/2651c4dfa662a097c26f950b054ea11b1f9c1e54))
+* help-tree-modal ([241f20b](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/241f20b8a09eac1e8331eecdf4e6b16eeaa27f28))
+
+### [0.1.80](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.79...v0.1.80) (2024-05-25)
+
 ### [0.1.79](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.78...v0.1.79) (2024-05-24)
 
 ### [0.1.78](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.77...v0.1.78) (2024-05-24)

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, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, getLocalStorage, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.78";
+const version = "0.1.80";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -48555,7 +48555,7 @@ var FormImpl = {
   name: "FormImpl",
   data() {
     return {
-      showMorePosition: 3,
+      showMorePosition: window.innerWidth < 1700 ? 2 : 3,
       form: {},
       enumList: [],
       enumData: {},
@@ -48742,9 +48742,11 @@ var FormImpl = {
     let formItems = [];
     let showMorePosition = this.showMorePosition;
     let spanList;
+    let searchSpan = window.innerWidth < 1700 ? 8 : 6;
+    this.showMorePosition = window.innerWidth < 1700 ? 2 : this.showMorePosition;
     spanList = _.fill(
       _.range(this.fieldList.length),
-      this.formType == "search" ? 6 : this.defaultSpan
+      this.formType == "search" ? searchSpan : this.defaultSpan
     );
     _.forEach(this.fieldList, (d, idx) => {
       var _a, _b;
@@ -48752,14 +48754,8 @@ var FormImpl = {
         spanList[idx] = d.span;
       } else if (["textarea", "fileUpload", "imgUpload"].includes(d.type)) {
         spanList[idx] = 24;
-      } else if (d.type == "datepicker" && ((_b = (_a = d.props) == null ? void 0 : _a.type) == null ? void 0 : _b.includes("range"))) {
-        if (window.innerWidth < 1700) {
-          if (idx < 3) {
-            showMorePosition = showMorePosition - 1;
-          }
-          spanList[idx] = 12;
-        }
-      }
+      } else if (d.type == "datepicker" && ((_b = (_a = d.props) == null ? void 0 : _a.type) == null ? void 0 : _b.includes("range")))
+        ;
       let conditionFlag = d.condition instanceof Function ? d.condition(this.form) : d.condition !== false;
       if (!conditionFlag) {
         spanList[idx] = 0;
@@ -49177,7 +49173,7 @@ var FormImpl = {
         "Col",
         {
           props: {
-            span: 6
+            span: searchSpan
           }
         },
         [
@@ -49252,7 +49248,7 @@ var FormImpl = {
           "Col",
           {
             props: {
-              span: 6
+              span: searchSpan
             }
           },
           [h("FormItem", { props: { label: " " } }, "")]
@@ -49928,7 +49924,8 @@ const __vue2_script$1c = {
   props: {
     fieldList: Array,
     funId: String,
-    value: Object
+    value: Object,
+    openPreSetting: Boolean
   },
   components: {
     FormImpl,
@@ -52160,7 +52157,7 @@ var render$Y = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "lambo-grid-table", class: [_vm.fullSreen ? "fullscreen-fixed" : ""] }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], ref: "search", staticClass: "search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], ref: "tip", staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.important - _vm.tip, expression: "$slots.important - tip" }], ref: "important-tip", staticClass: "important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { ref: "buttons", staticClass: "other-button" }, [_c("Row", [[_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "flex": "1 1 0%" } }, [_c("IndButtonGroup", { attrs: { "split": "", "mb": "" } }, [_vm._t("buttons")], 2)], 1)], _c("i-col", { directives: [{ name: "show", rawName: "v-show", value: _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options, expression: "(showUnitSwitch && isShowUnitSwitch) || showTableOption || $slots.options" }], staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "var(--ivu-form-item-content-line-height)", "padding-bottom": "calc(var(--ind-table-button-padding) + 4px)", "margin-right": "10px" } }, [_vm._t("options")], 2), _vm.showZeroSwitch ? _c("IndZeroRadio", { staticStyle: { "margin-bottom": "var(--ind-unit-switch-bottom)", "line-height": "1" }, attrs: { "zeroTitle": _vm.switchZeroTitle }, model: { value: _vm.showZero, callback: function($$v) {
+  return _c("div", { staticClass: "lambo-grid-table", class: [_vm.fullSreen ? "fullscreen-fixed" : ""] }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], ref: "search", staticClass: "search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], ref: "tip", staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.important - _vm.tip, expression: "$slots.important - tip" }], ref: "important-tip", staticClass: "important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { ref: "buttons", staticClass: "other-button" }, [_c("Row", [[_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "flex": "1 1 0%" } }, [_c("IndButtonGroup", { attrs: { "split": "", "mb": "" } }, [_vm._t("buttons")], 2)], 1)], _c("i-col", { directives: [{ name: "show", rawName: "v-show", value: _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options, expression: "(showUnitSwitch && isShowUnitSwitch) || showTableOption || $slots.options" }], staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "var(--ivu-form-item-content-line-height)", "padding-bottom": "calc(var(--ind-table-button-padding) + 2px)", "margin-right": "10px" } }, [_vm._t("options")], 2), _vm.showZeroSwitch ? _c("IndZeroRadio", { staticStyle: { "margin-bottom": "var(--ind-unit-switch-bottom)", "line-height": "1" }, attrs: { "zeroTitle": _vm.switchZeroTitle }, model: { value: _vm.showZero, callback: function($$v) {
     _vm.showZero = $$v;
   }, expression: "showZero" } }) : _vm._e(), _vm.showUnitSwitch && _vm.isShowUnitSwitch ? _c("IndUnitRadio", { staticStyle: { "margin-bottom": "var(--ind-unit-switch-bottom)", "line-height": "1" }, attrs: { "isShowWX": _vm.isShowWX, "isShowJ": _vm.isShowJ }, model: { value: _vm.unitType, callback: function($$v) {
     _vm.unitType = $$v;
@@ -55025,8 +55022,9 @@ const __vue2_script$U = {
     title: { type: String, default: "\u5E2E\u52A9\u6846" },
     width: { type: Number, default: 520 },
     height: { type: Number, default: 350 },
-    helpTreeBoxSearchParams: { type: Object, default: () => null },
+    helpBoxSearchParams: { type: Object, default: () => null },
     showCheckbox: Boolean,
+    selectLeafOnly: { type: Boolean, default: true },
     isShowSearch: { type: Boolean, default: true },
     isShowHeader: Boolean
   },
@@ -55052,10 +55050,14 @@ const __vue2_script$U = {
   methods: {
     onOk() {
       let nodes = [];
-      let nodes1 = this.$refs.tree.getCheckedAndIndeterminateNodes();
-      let nodes2 = this.$refs.tree.getSelectedNodes();
-      nodes = nodes1.length > nodes2.length ? nodes1 : nodes2;
-      this.$emit("onTreeOk", nodes);
+      if (this.showCheckbox && this.selectLeafOnly) {
+        nodes = this.getCheckedNodes(true);
+      } else if (this.showCheckbox) {
+        nodes = this.getCheckedNodes(false);
+      } else {
+        nodes = this.getSelectedNodes();
+      }
+      this.$emit("onOk", nodes);
       this.$emit("input", false);
       this.boxShow = false;
     },
@@ -55074,8 +55076,6 @@ const __vue2_script$U = {
     },
     onSelectChange(nodes) {
       this.updateSelectedTitles(nodes);
-      this.getCheckedNodes();
-      this.getCheckedAndIndeterminateNodes();
       this.visible = false;
     },
     clearSelected() {
@@ -55088,39 +55088,19 @@ const __vue2_script$U = {
       this.searchNum = data;
     },
     updateSelectedTitles() {
-      let noAdd = [];
-      let tempNodes = [];
-      let nodes = [];
-      let nodes1 = this.$refs.tree.getCheckedAndIndeterminateNodes();
-      let nodes2 = this.$refs.tree.getSelectedNodes();
-      nodes = nodes1.length > nodes2.length ? nodes1 : nodes2;
-      nodes.forEach((e) => {
-        if (!e.indeterminate && e.children.length > 0 && !noAdd.includes(e.parentId)) {
-          tempNodes.push(e);
-          noAdd.push(e.id);
-        } else if (!noAdd.includes(e.parentId) && e.children.length < 1) {
-          tempNodes.push(e);
-        } else if (noAdd.includes(e.parentId) && e.children.length > 0) {
-          noAdd.push(e.id);
-        }
-      });
-      this.selectedTitles = tempNodes.map((item2) => {
-        return item2.title;
-      }).join(",");
-      console.log("this.selectedTitles", this.selectedTitles);
+      let tempNodes = this.getCheckedNodes(true);
+      if (!tempNodes.length) {
+        tempNodes = this.getSelectedNodes();
+      }
+      this.selectedTitles = _.join(_.map(tempNodes || [], "title"), ",");
     },
     getSelectedNodes() {
       return this.$refs.tree.getSelectedNodes();
     },
-    getCheckedNodes() {
-      console.log("getCheckedNodes", this.$refs.tree.getCheckedNodes());
-      return this.$refs.tree.getCheckedNodes();
+    getCheckedNodes(onlyLeaf = false) {
+      return this.$refs.tree.getCheckedNodes(onlyLeaf);
     },
     getCheckedAndIndeterminateNodes() {
-      console.log(
-        "getCheckedAndIndeterminateNodes",
-        this.$refs.tree.getCheckedAndIndeterminateNodes()
-      );
       return this.$refs.tree.getCheckedAndIndeterminateNodes();
     },
     updateNodeStatus(id, statusData) {