@fmdeui/fmui 1.0.98 → 1.0.100

package/es/components/fm-autocomplete/index.d.ts

@@ -65,13 +65,13 @@ export declare const FmAutocomplete: DefineComponent<ExtractPropTypes<{
         required: true;
     };
     id: {
-        type: PropType<Number>;
+        type: PropType<number>;
         required: true;
     };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     reset: (...args: any[]) => void;
     select: (...args: any[]) => void;
-    "update:id": (value: Number) => void;
+    "update:id": (value: number) => void;
     "update:name": (value: string) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<{
     placeholder: {
@@ -139,13 +139,13 @@ export declare const FmAutocomplete: DefineComponent<ExtractPropTypes<{
         required: true;
     };
     id: {
-        type: PropType<Number>;
+        type: PropType<number>;
         required: true;
     };
 }>> & Readonly<{
     onReset?: ((...args: any[]) => any) | undefined;
     onSelect?: ((...args: any[]) => any) | undefined;
-    "onUpdate:id"?: ((value: Number) => any) | undefined;
+    "onUpdate:id"?: ((value: number) => any) | undefined;
     "onUpdate:name"?: ((value: string) => any) | undefined;
 }>, {
     top: number;

package/es/components/fm-autocomplete/index.vue.d.ts

@@ -84,13 +84,13 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         required: true;
     };
     id: {
-        type: PropType<Number>;
+        type: PropType<number>;
         required: true;
     };
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     reset: (...args: any[]) => void;
     select: (...args: any[]) => void;
-    "update:id": (value: Number) => void;
+    "update:id": (value: number) => void;
     "update:name": (value: string) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<{
     placeholder: {
@@ -177,13 +177,13 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         required: true;
     };
     id: {
-        type: PropType<Number>;
+        type: PropType<number>;
         required: true;
     };
 }>> & Readonly<{
     onReset?: ((...args: any[]) => any) | undefined;
     onSelect?: ((...args: any[]) => any) | undefined;
-    "onUpdate:id"?: ((value: Number) => any) | undefined;
+    "onUpdate:id"?: ((value: number) => any) | undefined;
     "onUpdate:name"?: ((value: string) => any) | undefined;
 }>, {
     top: number;

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

@@ -82,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 () => {

package/es/packages/components/fm-inputdropdown/index.vue2.mjs

@@ -172,9 +172,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             style: normalizeStyle({ width: __props.inputWidth }),
             onChange: handelChange
           }, {
-            append: withCtx(() => [
+            suffix: withCtx(() => [
               createVNode(_component_el_icon, {
                 color: "#13c2c2",
+                size: 22,
                 onClick: handRestdata
               }, {
                 default: withCtx(() => [

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/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.98 */
+/*! fmdeui-fmui v1.0.100 */
 (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) :
@@ -26818,9 +26818,10 @@
 	            style: vue.normalizeStyle({ width: __props.inputWidth }),
 	            onChange: handelChange
 	          }, {
-	            append: vue.withCtx(() => [
+	            suffix: vue.withCtx(() => [
 	              vue.createVNode(_component_el_icon, {
 	                color: "#13c2c2",
+	                size: 22,
 	                onClick: handRestdata
 	              }, {
 	                default: vue.withCtx(() => [
@@ -27027,7 +27028,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 () => {
@@ -27713,7 +27718,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) => {