@fecp/designer 5.5.5 → 5.5.6

package/lib/packages/mobile/src/utils/datasource.js

@@ -0,0 +1,354 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const vue = require("vue");
+const parseRouteParams = require("./parseRouteParams.js");
+require("../../../../node_modules/element-plus/es/index.js");
+;/* empty css                                                          */
+;/* empty css                                                                */
+;/* empty css                                                              */
+;/* empty css                                                                */
+const index = require("../../../../node_modules/element-plus/es/components/loading/index.js");
+const index$1 = require("../../../../node_modules/element-plus/es/components/message/index.js");
+class DataSourceManager {
+  constructor(options = {}) {
+    this.templateId = options.templateId;
+    this.http = options.http;
+    this.params = options.params || {};
+    this.initSearchData = options.initSearchData || {};
+    this.dataSources = options.dataSources || [];
+    this.currentDataSourceId = options.currentDataSourceId;
+    this.pagination = options.pagination || false;
+    this.sortRules = vue.reactive(options.sortRules || []);
+    this.originalSortRules = JSON.parse(
+      JSON.stringify(options.sortRules || [])
+    );
+    this.showSuccessMessage = options.showSuccessMessage || false;
+    this.loading = false;
+    this.error = null;
+    this.data = vue.reactive({});
+    this.contextData = options.data || null;
+    this.fields = options.fields || [];
+    this.events = {
+      loaded: [],
+      error: []
+    };
+    this.LoadingInstance = {
+      target: null,
+      // 保存Loading实例
+      count: 0
+    };
+  }
+  /**
+   * 获取当前数据源配置
+   */
+  getCurrentDataSource() {
+    if (!this.currentDataSourceId || !this.dataSources.length) return null;
+    return this.dataSources.find((ds) => ds.id == this.currentDataSourceId);
+  }
+  /**
+   * 构建请求参数
+   */
+  buildRequestParams(extraParams = {}) {
+    const currentDs = this.getCurrentDataSource();
+    if (!currentDs) return {};
+    const params = { ...this.params };
+    if (this.templateId) {
+      params.tableId = this.templateId;
+    }
+    if (currentDs.params && Array.isArray(currentDs.params)) {
+      const parsedParams = parseRouteParams.parseRouteParams(
+        currentDs.params,
+        this.contextData,
+        this.fields
+      );
+      Object.assign(params, parsedParams);
+    }
+    if (this.pagination) {
+      params.pageNo = this.pagination.pageNo;
+      params.pageSize = this.pagination.pageSize;
+    }
+    if (this.sortRules && this.sortRules.length > 0) {
+      params.sortRules = JSON.stringify(this.sortRules);
+    }
+    return { ...this.initSearchData, ...params, ...extraParams };
+  }
+  /**
+   * 根据内容类型处理请求数据
+   */
+  prepareRequestData(params, contentType) {
+    switch (contentType) {
+      case "formData":
+        const formData = new FormData();
+        Object.keys(params).forEach((key) => {
+          formData.append(key, params[key]);
+        });
+        return formData;
+      case "formUrlencoded":
+        const urlencoded = new URLSearchParams();
+        Object.keys(params).forEach((key) => {
+          urlencoded.append(key, params[key]);
+        });
+        return urlencoded;
+      case "json":
+      default:
+        return JSON.stringify(params);
+    }
+  }
+  /**
+   * 获取请求配置
+   */
+  getRequestConfig() {
+    const currentDs = this.getCurrentDataSource();
+    if (!currentDs) return {};
+    const config = {
+      url: `/${currentDs.serverName}${currentDs.url}`,
+      method: currentDs.method
+    };
+    if (currentDs.contentType === "formData") {
+      config.headers = {
+        "Content-Type": "multipart/form-data"
+      };
+    } else if (currentDs.contentType === "formUrlencoded") {
+      config.headers = {
+        "Content-Type": "application/x-www-form-urlencoded"
+      };
+    } else {
+      config.headers = {
+        "Content-Type": "application/json"
+      };
+    }
+    return config;
+  }
+  /**
+   * 发起请求
+   */
+  async fetch(extraParams = {}) {
+    const currentDs = this.getCurrentDataSource();
+    if (!currentDs) {
+      console.warn("未找到当前数据源配置");
+      return;
+    }
+    if (!this.http) {
+      console.warn("未配置 HTTP 实例");
+      return;
+    }
+    this.loading = true;
+    this.error = null;
+    this.LoadingInstance.count++;
+    if (this.LoadingInstance.count === 1) {
+      this.LoadingInstance.target = index.ElLoading.service({
+        fullscreen: true,
+        lock: true,
+        text: "拼命加载中",
+        // spinner: loadingSvg,
+        background: "rgba(0, 0, 0, 0)",
+        customClass: "h-loading"
+      });
+    }
+    try {
+      const params = this.buildRequestParams(extraParams);
+      const requestConfig = this.getRequestConfig();
+      let response;
+      const { url, method } = requestConfig;
+      switch (method.toLowerCase()) {
+        case "get":
+          response = await this.http.get(url, { params });
+          break;
+        case "post":
+          if (currentDs.contentType === "formData") {
+            response = await this.http.postForm(url, params, requestConfig);
+          } else if (currentDs.contentType === "download") {
+            await this.http.download(url, params, requestConfig);
+          } else if (currentDs.contentType === "upload") {
+            response = await this.http.upload(url, params, requestConfig);
+          } else {
+            response = await this.http.post(url, params, requestConfig);
+          }
+          break;
+        case "put":
+          if (currentDs.contentType === "formData") {
+            response = await this.http.putForm(url, params, requestConfig);
+          } else {
+            response = await this.http.put(url, params, requestConfig);
+          }
+          break;
+        case "delete":
+          response = await this.http.delete(url, { params });
+          break;
+        default:
+          response = await this.http.get(url, { params });
+      }
+      if (response && typeof response === "object" && "code" in response) {
+        if (response.code == 0) {
+          const responseData = response.data;
+          const responseMessage = response.message;
+          if (this.pagination) {
+            this.data.list = (responseData == null ? void 0 : responseData.records) || responseData;
+            this.data.total = (responseData == null ? void 0 : responseData.total) || (responseData == null ? void 0 : responseData.length);
+          } else {
+            this.data = responseData;
+          }
+          this.emit("loaded", this.data);
+          if (this.showSuccessMessage && responseMessage) {
+            index$1.ElMessage.success(responseMessage);
+          }
+          return this.data;
+        } else {
+          this.error = response.message || "请求失败";
+          this.emit("error", this.error);
+          throw new Error(this.error);
+        }
+      } else {
+        const responseData = response;
+        if (this.pagination) {
+          this.data.list = (responseData == null ? void 0 : responseData.records) || responseData;
+          this.data.total = (responseData == null ? void 0 : responseData.total) || (responseData == null ? void 0 : responseData.length);
+        } else {
+          this.data = responseData;
+        }
+        this.emit("loaded", this.data);
+        return this.data;
+      }
+    } catch (err) {
+      this.error = err.message || "请求失败";
+      this.emit("error", err);
+      throw err;
+    } finally {
+      this.closeLoading();
+    }
+  }
+  /**
+   * 事件监听
+   */
+  on(event, callback) {
+    if (this.events[event]) {
+      this.events[event].push(callback);
+    }
+  }
+  /**
+   * 移除事件监听
+   */
+  off(event, callback) {
+    if (this.events[event]) {
+      const index2 = this.events[event].indexOf(callback);
+      if (index2 > -1) {
+        this.events[event].splice(index2, 1);
+      }
+    }
+  }
+  /**
+   * 触发事件
+   */
+  emit(event, data) {
+    if (this.events[event]) {
+      this.events[event].forEach((callback) => {
+        callback(data);
+      });
+    }
+  }
+  /**
+   * 更新分页
+   */
+  updatePagination(pageNo, pageSize) {
+    this.pagination.pageNo = pageNo;
+    this.pagination.pageSize = pageSize;
+  }
+  /**
+   * 更新排序
+   */
+  updateSort(field, order) {
+    const existingIndex = this.sortRules.findIndex((rule) => rule.field === field);
+    if (!order) {
+      if (existingIndex > -1) {
+        this.sortRules.splice(existingIndex, 1);
+      }
+    } else {
+      if (existingIndex > -1) {
+        this.sortRules.splice(existingIndex, 1);
+      }
+      this.sortRules.unshift({ field, order });
+    }
+  }
+  /**
+   * 清空排序规则 - 重置为原始配置
+   */
+  clearSort() {
+    this.sortRules.splice(0, this.sortRules.length);
+    this.originalSortRules.forEach((rule) => {
+      this.sortRules.push({ ...rule });
+    });
+  }
+  /**
+   * 切换数据源
+   */
+  switchDataSource(dataSourceId) {
+    this.currentDataSourceId = dataSourceId;
+  }
+  /**
+   * 获取当前数据
+   */
+  getData() {
+    return this.data;
+  }
+  /**
+   * 获取加载状态
+   */
+  getLoading() {
+    return this.loading;
+  }
+  closeLoading() {
+    if (this.LoadingInstance.count > 0) {
+      this.LoadingInstance.count--;
+    }
+    if (this.LoadingInstance.count === 0 && this.LoadingInstance.target) {
+      this.LoadingInstance.target.close();
+      this.LoadingInstance.target = null;
+    }
+  }
+  /**
+   * 获取错误信息
+   */
+  getError() {
+    return this.error;
+  }
+  /**
+   * 获取分页信息
+   */
+  getPagination() {
+    return this.pagination;
+  }
+  /**
+   * 获取当前请求参数
+   */
+  getParams() {
+    return this.params;
+  }
+  /**
+   * 更新请求参数
+   */
+  updateParams(newParams) {
+    this.params = { ...this.params, ...newParams };
+  }
+  updateInitSearchData(newParams) {
+    this.initSearchData = newParams;
+  }
+  /**
+   * 清空请求参数
+   */
+  clearParams() {
+    this.params = {};
+  }
+  /**
+   * 销毁
+   */
+  destroy() {
+    this.events.loaded = [];
+    this.events.error = [];
+  }
+}
+function createDataSource(options = {}) {
+  return new DataSourceManager(options);
+}
+exports.DataSourceManager = DataSourceManager;
+exports.createDataSource = createDataSource;
+exports.default = DataSourceManager;

package/lib/packages/mobile/src/utils/optionUtil.js

@@ -1,56 +1,79 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const index = require("../axios/index.js");
-const dataSourceUtil = require("./dataSourceUtil.js");
+const datasource = require("./datasource.js");
 const env = require("./env.js");
 const baseUrl = env.default.api_base_url;
 const getOptions = ({
-  optionType,
-  dicKey,
-  dicList,
-  dataSource,
-  dataSourceParams,
-  staticOptions,
-  optionsFieldNames
+  ctx,
+  dataSources,
+  formData = [],
+  fields = [],
+  optionSource,
+  options: staticOptions,
+  dataSourceValue,
+  displayField,
+  valueField,
+  dictionaryValue
 }) => {
-  return new Promise((resolve, reject) => {
-    switch (optionType) {
-      case "static":
+  return new Promise(async (resolve, reject) => {
+    var _a, _b;
+    switch (optionSource) {
+      case "custom":
         resolve(staticOptions);
         break;
-      case "dic":
-        let dicListToOption = function(dicList2) {
-          return dicList2.map((item) => {
-            return {
-              text: item.optName,
-              value: item.optCode
-            };
-          });
-        };
-        if (dicList) {
-          resolve(dicListToOption(dicList));
+      case "dictionary":
+        if (!dictionaryValue) {
+          resolve([]);
+          break;
+        }
+        const response = await ctx.$http.postForm(
+          "/base-server/parm/sysParmDic/getDicListByKey",
+          {
+            keyName: dictionaryValue
+          },
+          false
+        );
+        const dictionaryData = response;
+        const dictItems = dictionaryData[dictionaryValue];
+        if (dictItems) {
+          const labelField2 = "optName";
+          const keyField2 = "optCode";
+          const options2 = dictItems.map((item) => ({
+            label: item[labelField2],
+            value: item[keyField2],
+            disabled: item.disabled || false
+          }));
+          resolve(options2);
         } else {
-          getParmDicMapByKeys(dicKey).then((data) => {
-            const option = dicListToOption(data[dicKey]);
-            resolve(option);
-          });
+          resolve([]);
         }
         break;
-      case "library":
-        const dataSourceRef = dataSourceUtil.useDataSource(dataSource);
-        dataSourceRef == null ? void 0 : dataSourceRef.load(dataSourceParams || {}).then((res) => {
-          var _a;
-          const data = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.records) || (res == null ? void 0 : res.data) || res || [];
-          const option = data.map((item) => {
-            return {
-              text: item[optionsFieldNames.text],
-              value: item[optionsFieldNames.value] + ""
-            };
-          });
-          resolve(option);
-        }).catch((err) => {
-          console.error(err);
+      case "dataSource":
+        const dsManager = datasource.createDataSource({
+          http: ctx.$http,
+          dataSources,
+          currentDataSourceId: dataSourceValue,
+          data: formData,
+          // fields: [...fieldsData.value, ...hiddenFields.value],
+          fields
         });
+        const data = await dsManager.fetch();
+        let options = [];
+        if (Array.isArray(data)) {
+          options = data;
+        } else if (typeof data === "object") {
+          options = Array.isArray(data.data) ? data.data : ((_a = data.data) == null ? void 0 : _a.records) || ((_b = data.data) == null ? void 0 : _b.list) || [];
+        }
+        const labelField = displayField || "label";
+        const keyField = valueField || "value";
+        options = options.map((item) => ({
+          label: item[labelField],
+          value: item[keyField],
+          disabled: item.disabled || false,
+          ...item
+        }));
+        resolve(options);
         break;
     }
   });
@@ -67,7 +90,7 @@ const getTreeOptions = ({
       case "static":
         resolve(staticOptions);
       case "library":
-        const dataSourceRef = dataSourceUtil.useDataSource(dataSource);
+        const dataSourceRef = useDataSource(dataSource);
         dataSourceRef == null ? void 0 : dataSourceRef.load(dataSourceParams || {}).then((res) => {
           var _a;
           const data = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.records) || (res == null ? void 0 : res.data) || res || [];

package/lib/packages/mobile/src/utils/parseRouteParams.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("./common.js");
+function parseSingleParamValue(value, data, fields) {
+  if (typeof value !== "object" || value === null) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => parseSingleParamValue(item, data, fields));
+  }
+  const type = value.type;
+  if (type === "field") {
+    const field = fields.find((f) => f.id == value.value);
+    if (field) {
+      return data[field.fieldName];
+    }
+    return null;
+  } else if (type === "userInfo") {
+    console.warn("[parseRouteParams] userInfo 类型暂未实现");
+    return {};
+  } else if (type === "urlParam") {
+    const urlParams = new URLSearchParams(window.location.search);
+    return urlParams.get(value.value) || null;
+  } else {
+    return value.value !== void 0 ? value.value : value;
+  }
+}
+function parseRouteParams(routeParams, data, fields) {
+  if (!routeParams || !Array.isArray(routeParams)) {
+    return {};
+  }
+  const params = {};
+  routeParams.forEach((param) => {
+    const key = param.key;
+    if (!key) return;
+    params[key] = parseSingleParamValue(param.value, data, fields);
+  });
+  return common.removeEmptyValues(params);
+}
+exports.parseRouteParams = parseRouteParams;
+exports.parseSingleParamValue = parseSingleParamValue;

package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js

@@ -9,9 +9,9 @@ const vue = require("vue");
 const parseRouteParams = require("../../utils/parseRouteParams.js");
 const calculate = require("../../utils/formulajs/calculate.js");
 const eventFlowHandler = require("../../utils/eventFlow/eventFlowHandler.js");
-;/* empty css                                                                   */
 ;/* empty css                                                                 */
 ;/* empty css                                                                   */
+;/* empty css                                                                   */
 const common = require("../../utils/common.js");
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");

package/lib/packages/vue/src/components/forms/text/Text.vue.js

@@ -5,9 +5,9 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                    */
 ;/* empty css                                                                     */
 const vue = require("vue");
-;/* empty css                                                                      */
 ;/* empty css                                                                    */
 ;/* empty css                                                                      */
+;/* empty css                                                                      */
 const index$3 = require("../../dialog/index.js");
 ;/* empty css                                                     */
 ;/* empty css                                                           */

package/lib/packages/vue/src/components/table/TableColumn.vue.js

@@ -9,10 +9,10 @@ require("../../../../../node_modules/vxe-table/es/components.js");
 const index$3 = require("../../../../../node_modules/@element-plus/icons-vue/dist/index.js");
 const parseFilterConfig = require("../../utils/parseFilterConfig.js");
 const common = require("../../utils/common.js");
-;/* empty css                                                                   */
 ;/* empty css                                                                 */
 ;/* empty css                                                                   */
 ;/* empty css                                                                   */
+;/* empty css                                                                   */
 ;/* empty css                                                                  */
 require("../../utils/formulajs/functionCore.js");
 const eventFlowHandler = require("../../utils/eventFlow/eventFlowHandler.js");

package/lib/packages/vue/src/composables/usePageEvents.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 ;/* empty css                                                          */
-;/* empty css                                                                */
 ;/* empty css                                                              */
 ;/* empty css                                                                */
 ;/* empty css                                                                */
+;/* empty css                                                                */
 ;/* empty css                                                               */
 ;/* empty css                                                               */
 require("../utils/formulajs/functionCore.js");

package/lib/packages/vue/src/utils/datasource.js

@@ -4,9 +4,9 @@ const vue = require("vue");
 const parseRouteParams = require("./parseRouteParams.js");
 require("../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                          */
-;/* empty css                                                                */
 ;/* empty css                                                              */
 ;/* empty css                                                                */
+;/* empty css                                                                */
 const index = require("../../../../node_modules/element-plus/es/components/loading/index.js");
 const index$1 = require("../../../../node_modules/element-plus/es/components/message/index.js");
 class DataSourceManager {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.5.5",
+  "version": "5.5.6",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [