@newview/file-ui 1.1.42 → 1.1.44

package/README.md

@@ -1,3 +1,6 @@
+## 1.1.43
+1、ComFormUp 修改构件选择相关配置
+
 ## 1.1.38
 1. UploadFile 上传方式变更
 2. UploadFile 增加文件名称显示

package/dist/file-ui.js

@@ -18722,6 +18722,11 @@ const propDefine$2 = {
     type: Boolean,
     default: true
   },
+  businessId: {
+    // 创建机构id
+    type: Number,
+    default: 0
+  },
   dataValue: {
     // 值
     type: Array || Number,
@@ -18785,7 +18790,7 @@ class StructureSelectInstance extends BaseInstance {
       this.activeUnitName = this.unitData.value.find((e) => e["Id"] == value).NodeName;
       this.StructureInstanceLoading.value = true;
       this.StructureInstanceData.value = [];
-      let res = this.utilities.parseApiResult(await this.structureInstanceApi.getEntities(new QueryWrapper().select(["Id", "NodeTypeName", "NodeType", "NodeName"]).eq("PId", value)));
+      let res = this.utilities.parseApiResult(await this.structureInstanceApi.getEntities(new QueryWrapper().select(["Id", "NodeTypeName", "NodeType", "NodeName", "PlatformId", "CreateUnitId"]).eq("PId", value)));
       this.StructureInstanceData.value = res.map((e) => {
         e.title = e.NodeName;
         e.UnitName = this.activeUnitName;
@@ -18803,7 +18808,7 @@ class StructureSelectInstance extends BaseInstance {
      * @returns 
      */
     __publicField(this, "loadStructureInstance", async (item, callback) => {
-      let res = this.utilities.parseApiResult(await this.structureInstanceApi.getEntities(new QueryWrapper().select(["Id", "NodeTypeName", "NodeType", "NodeName"]).eq("PId", item.Id)));
+      let res = this.utilities.parseApiResult(await this.structureInstanceApi.getEntities(new QueryWrapper().select(["Id", "NodeTypeName", "NodeType", "NodeName", "PlatformId", "CreateUnitId"]).eq("PId", item.Id)));
       if (res.length == 0) {
         item.children = void 0;
         callback([]);
@@ -18859,7 +18864,11 @@ class StructureSelectInstance extends BaseInstance {
    */
   async loadNodeTypeAndUnitData() {
     var _a, _b;
-    let res = this.utilities.parseApiResult(await this.structureInstanceApi.getEntities(new QueryWrapper().select(["Id", "NodeTypeName", "NodeType", "NodeName", "RootId", "PlatformId"]).eq("PId", 0).eq("PlatformId", (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id)));
+    let filter = new QueryWrapper().select(["Id", "NodeTypeName", "NodeType", "NodeName", "RootId", "PlatformId", "CreateUnitId"]).eq("PId", 0).eq("PlatformId", (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id);
+    if (this.props.businessId) {
+      filter.eq("CreateUnitId", this.props.businessId);
+    }
+    let res = this.utilities.parseApiResult(await this.structureInstanceApi.getEntities(filter));
     this.TypeGroupData.value = Enumerable.from(res).groupBy((e) => e["NodeTypeName"]).select((e) => {
       return {
         NodeTypeName: e.key(),
@@ -18908,14 +18917,32 @@ class StructureSelectInstance extends BaseInstance {
    */
   doSelectedAfterFun() {
     if (this.props.selType == 1) {
-      this.ctx.emit("on-change", this.UnitValue.value);
+      try {
+        let unitData = [];
+        this.TypeGroupData.value.map((e) => {
+          e.UnitData.map((x) => {
+            if (Array.isArray(this.UnitValue.value)) {
+              if (this.UnitValue.value.includes(x.Id)) {
+                unitData.push(x);
+              }
+            } else {
+              if (this.UnitValue.value == x.Id) {
+                unitData = [x];
+              }
+            }
+          });
+        });
+        this.ctx.emit("on-change", { Ids: this.UnitValue.value, data: unitData });
+      } catch (error) {
+        this.ctx.emit("on-change", { Ids: this.UnitValue.value, data: [] });
+      }
     } else {
-      this.ctx.emit("on-change", this.StructureInstanceCheckData.value.map((e) => e["Id"]));
+      this.ctx.emit("on-change", { Ids: this.StructureInstanceCheckData.value.map((e) => e["Id"]), data: this.StructureInstanceCheckData.value });
     }
   }
 }
-const NvStructureSelect_vue_vue_type_style_index_0_scoped_fbbaca53_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-fbbaca53"), n = n(), popScopeId(), n);
+const NvStructureSelect_vue_vue_type_style_index_0_scoped_99c5b0ad_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-99c5b0ad"), n = n(), popScopeId(), n);
 const _hoisted_1$1 = { key: 1 };
 const _hoisted_2$1 = { class: "nv-pos-r" };
 const _hoisted_3$1 = { class: "nv-c-p structure-sel-box" };
@@ -18997,7 +19024,8 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     createVNode(_component_Poptip, {
       placement: "bottom-start",
       width: 700,
-      transfer: ""
+      transfer: "",
+      disabled: _ctx.readonly
     }, {
       content: withCtx(() => [
         _ctx.TypeGroupData.length > 1 ? (openBlock(), createElementBlock("div", _hoisted_9, [
@@ -19074,7 +19102,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ]),
       _: 1
-    }),
+    }, 8, ["disabled"]),
     _ctx.multiple ? (openBlock(), createElementBlock("div", _hoisted_15, [
       (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.StructureInstanceCheckData, (item, index) => {
         return openBlock(), createElementBlock("div", {
@@ -19099,7 +19127,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]));
 }
-const NvStructureSelect = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-fbbaca53"]]);
+const NvStructureSelect = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-99c5b0ad"]]);
 const propDefine$1 = {
   linkParam: {
     // 带入的参数
@@ -19913,8 +19941,10 @@ class ComFormInstance extends BaseInstance {
      * @param item 
      * @param data 
      */
-    __publicField(this, "StructureOnChange", (item, data) => {
-      this.props.formModel[item.model] = data;
+    __publicField(this, "StructureOnChange", (item, { Ids, data }) => {
+      var _a;
+      this.props.formModel[item.model] = Ids;
+      (_a = item.structureProp) == null ? void 0 : _a.onChange(Ids, data);
     });
     /**
      * 获取属性值
@@ -20017,8 +20047,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         dataValue: _ctx.formModel[item.model],
         multiple: _ctx.getPropValue(item.structureProp, "multiple"),
         selType: _ctx.getPropValue(item.structureProp, "selType"),
+        businessId: _ctx.getPropValue(item.structureProp, "businessId"),
         onOnChange: ($event) => _ctx.StructureOnChange(item, $event)
-      }, null, 8, ["readonly", "dataValue", "multiple", "selType", "onOnChange"])) : createCommentVNode("", true),
+      }, null, 8, ["readonly", "dataValue", "multiple", "selType", "businessId", "onOnChange"])) : createCommentVNode("", true),
       item.type === "UploadFileList" ? (openBlock(), createBlock(_component_UploadFileList, {
         key: 5,
         style: normalizeStyle(_ctx.uploadFileListStyle(item)),