@fmdeui/fmui 1.0.97 → 1.0.99

package/es/components/fm-autocomplete/component/userSelectDialog.vue.d.ts

@@ -26,7 +26,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
     orgparas: {
         type: ObjectConstructor;
-        default: () => void;
+        default: null;
     };
     userService: {
         type: StringConstructor;
@@ -70,7 +70,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
     orgparas: {
         type: ObjectConstructor;
-        default: () => void;
+        default: null;
     };
     userService: {
         type: StringConstructor;

package/es/packages/components/fm-autocomplete/component/userSelectDialog.vue2.mjs

@@ -36,8 +36,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     orgparas: {
       type: Object,
-      default: () => {
-      }
+      default: null
     },
     userService: {
       type: String,
@@ -83,7 +82,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       handleQuery();
     };
     const handleNodeChange = async (node) => {
+      var _a, _b, _c;
       state.queryParams.orgId = node.id;
+      state.queryParams.cmpId = (_a = node.cmpId) != null ? _a : 0;
+      state.queryParams.deptId = (_b = node.deptId) != null ? _b : 0;
+      state.queryParams.groupId = (_c = node.groupId) != null ? _c : 0;
       await handleQuery();
     };
     const getUserList = async () => {
@@ -197,10 +200,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                     apiService: __props.orgService,
                     apiAction: __props.orgAction,
                     isPost: __props.orgPost,
-                    apiparas: __props.orgparas,
+                    paras: __props.orgparas,
                     onNodeClick: handleNodeChange,
                     style: { "height": "calc(100% - 40px)", "overflow-y": "scroll", "overflow-x": "hidden" }
-                  }, null, 8, ["apiService", "apiAction", "isPost", "apiparas"])
+                  }, null, 8, ["apiService", "apiAction", "isPost", "paras"])
                 ]),
                 _: 1
                 /* STABLE */

package/es/packages/components/fmtree/index.vue2.mjs

@@ -166,7 +166,25 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const nodeClick = (node) => {
       const reldata = findNode(node.id);
       modeValue.value = { id: node.id, name: node.name, code: reldata ? reldata.code : "" };
-      emit("node-click", { id: node.id, name: node.name, code: reldata ? reldata.code : "", data: reldata });
+      let cmpId = 0;
+      let deptId = 0;
+      let groupId = 0;
+      if (reldata) {
+        cmpId = reldata.id;
+        if (reldata.level == 2) {
+          deptId = reldata.id;
+          cmpId = reldata.pid;
+          groupId = 0;
+        } else if (reldata.level == 3) {
+          groupId = reldata.id;
+          deptId = reldata.pid;
+          const fitem = findNode(reldata.pid);
+          if (fitem && fitem.pid > 0) {
+            cmpId = fitem.pid;
+          }
+        }
+      }
+      emit("node-click", { id: node.id, name: node.name, code: reldata ? reldata.code : "", data: reldata, cmpId, deptId, groupId });
     };
     const findNode = (id) => {
       const search = (nodes) => {

package/es/packages/locale/index.mjs

@@ -1,23 +1,23 @@
 import { createI18n } from 'vue-i18n';
 import '../api/index.mjs';
-import de_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/de.mjs';
-import en_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/en.mjs';
-import es_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/es.mjs';
-import fi_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fi.mjs';
-import fr_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fr.mjs';
-import it_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/it.mjs';
-import ja_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ja.mjs';
-import ko_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ko.mjs';
-import no_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/no.mjs';
-import pl_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pl.mjs';
-import pt_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pt.mjs';
-import ru_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ru.mjs';
-import zh_cn_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-cn.mjs';
-import zh_tw_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-tw.mjs';
-import th_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/th.mjs';
-import id_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/id.mjs';
-import ms_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ms.mjs';
-import vi_default from '../../node_modules/.pnpm/element-plus@2.14.0_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/vi.mjs';
+import de_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/de.mjs';
+import en_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/en.mjs';
+import es_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/es.mjs';
+import fi_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fi.mjs';
+import fr_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fr.mjs';
+import it_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/it.mjs';
+import ja_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ja.mjs';
+import ko_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ko.mjs';
+import no_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/no.mjs';
+import pl_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pl.mjs';
+import pt_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pt.mjs';
+import ru_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ru.mjs';
+import zh_cn_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-cn.mjs';
+import zh_tw_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-tw.mjs';
+import th_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/th.mjs';
+import id_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/id.mjs';
+import ms_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ms.mjs';
+import vi_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/vi.mjs';
 import msMY from '../../_virtual/en-US.mjs';
 import deDE from '../../_virtual/de-DE.mjs';
 import esES from '../../_virtual/es-ES.mjs';

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.97 */
+/*! fmdeui-fmui v1.0.99 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -26981,8 +26981,7 @@
 	    },
 	    orgparas: {
 	      type: Object,
-	      default: () => {
-	      }
+	      default: null
 	    },
 	    userService: {
 	      type: String,
@@ -27028,7 +27027,11 @@
 	      handleQuery();
 	    };
 	    const handleNodeChange = async (node) => {
+	      var _a, _b, _c;
 	      state.queryParams.orgId = node.id;
+	      state.queryParams.cmpId = (_a = node.cmpId) != null ? _a : 0;
+	      state.queryParams.deptId = (_b = node.deptId) != null ? _b : 0;
+	      state.queryParams.groupId = (_c = node.groupId) != null ? _c : 0;
 	      await handleQuery();
 	    };
 	    const getUserList = async () => {
@@ -27142,10 +27145,10 @@
 	                    apiService: __props.orgService,
 	                    apiAction: __props.orgAction,
 	                    isPost: __props.orgPost,
-	                    apiparas: __props.orgparas,
+	                    paras: __props.orgparas,
 	                    onNodeClick: handleNodeChange,
 	                    style: { "height": "calc(100% - 40px)", "overflow-y": "scroll", "overflow-x": "hidden" }
-	                  }, null, 8, ["apiService", "apiAction", "isPost", "apiparas"])
+	                  }, null, 8, ["apiService", "apiAction", "isPost", "paras"])
 	                ]),
 	                _: 1
 	                /* STABLE */
@@ -27714,7 +27717,25 @@
 	    const nodeClick = (node) => {
 	      const reldata = findNode(node.id);
 	      modeValue.value = { id: node.id, name: node.name, code: reldata ? reldata.code : "" };
-	      emit("node-click", { id: node.id, name: node.name, code: reldata ? reldata.code : "", data: reldata });
+	      let cmpId = 0;
+	      let deptId = 0;
+	      let groupId = 0;
+	      if (reldata) {
+	        cmpId = reldata.id;
+	        if (reldata.level == 2) {
+	          deptId = reldata.id;
+	          cmpId = reldata.pid;
+	          groupId = 0;
+	        } else if (reldata.level == 3) {
+	          groupId = reldata.id;
+	          deptId = reldata.pid;
+	          const fitem = findNode(reldata.pid);
+	          if (fitem && fitem.pid > 0) {
+	            cmpId = fitem.pid;
+	          }
+	        }
+	      }
+	      emit("node-click", { id: node.id, name: node.name, code: reldata ? reldata.code : "", data: reldata, cmpId, deptId, groupId });
 	    };
 	    const findNode = (id) => {
 	      const search = (nodes) => {