zhytech-ui-mobile 1.1.10 → 1.1.12

package/README.md

@@ -79,6 +79,16 @@ npm install --legacy-peer-deps
 
 > #### 版本更新清单：
 
+**V 1.1.12**
+```html
+1.修复动态表单结果返回时，复选框、单选框选值的itemSourceType取错问题
+```
+
+**V 1.1.11**
+```html
+1.调整动态接口设置画面，新增baseUrlFromProps参数，用于从props中获取baseUrl
+```
+
 **V 1.1.10**
 ```html
 1.修复人员组件多显示下拉框问题

package/dist/types/components/dynamicForm/types/httpSettingView.d.ts

@@ -6,6 +6,10 @@ export interface httpSettingView {
      * HTTP请求类型
      */
     eventType: string;
+    /**
+     * 是否从组件属性中获取基础URL
+     */
+    baseUrlFromProps: boolean;
     /**
      * HTTP基础URL
      */

package/dist/types/hooks/useUtils.d.ts

@@ -72,8 +72,9 @@ export declare function useUtils(): {
      * @description: 调用api
      * @param httpSetting 接口配置
      * @param datas 接口参数替换数据
+     * @param baseUrl 接口基础URL
      * @param autoDealResult 是否自动处理结果
      * @return
      */
-    callApi(httpSetting: httpSettingView, datas: Record<string, any>, autoDealResult?: boolean): Promise<any>;
+    callApi(httpSetting: httpSettingView, datas: Record<string, any>, baseUrl?: string, autoDealResult?: boolean): Promise<any>;
 };

package/dist/zhytech-ui-mobile.es.js

@@ -17006,16 +17006,26 @@ function useUtils() {
      * @description: 调用api
      * @param httpSetting 接口配置
      * @param datas 接口参数替换数据
+     * @param baseUrl 接口基础URL
      * @param autoDealResult 是否自动处理结果
      * @return
      */
-    async callApi(httpSetting, datas, autoDealResult) {
+    async callApi(httpSetting, datas, baseUrl, autoDealResult) {
       var _a2, _b2;
-      if (isEmpty(httpSetting) || !httpSetting.baseUrl || !httpSetting.functionUrl) {
-        return {};
+      let responseData = {};
+      if (isEmpty(httpSetting) || !httpSetting.functionUrl) {
+        return responseData;
+      }
+      let httpUrl = httpSetting.baseUrl;
+      if (httpSetting.baseUrlFromProps && baseUrl) {
+        httpUrl = baseUrl;
+      }
+      if (!httpUrl) {
+        showToast2("error", "动态获取数据的接口基础url为空，请检查模板配置！");
+        return responseData;
       }
-      const flag = httpSetting.baseUrl.endsWith("/") || httpSetting.functionUrl.startsWith("/");
-      const url = `${httpSetting.baseUrl}${flag ? "" : "/"}${httpSetting.functionUrl}`;
+      const flag = httpUrl.endsWith("/") || httpSetting.functionUrl.startsWith("/");
+      const url = `${httpUrl}${flag ? "" : "/"}${httpSetting.functionUrl}`;
       let params = {};
       if (!isEmpty(httpSetting.parameters)) {
         (_a2 = httpSetting.parameters) == null ? void 0 : _a2.forEach((item) => {
@@ -17026,7 +17036,7 @@ function useUtils() {
         });
       }
       try {
-        const responseData = await new Promise((resolve2, reject2) => {
+        responseData = await new Promise((resolve2, reject2) => {
           if (httpSetting.loading) {
             showLoading({ title: httpSetting.loadingText || "加载中...", mask: true });
           }
@@ -17046,7 +17056,7 @@ function useUtils() {
           });
         });
         if (responseData.code !== 1) {
-          showToast2("error", responseData.message || "接口调用失败");
+          showToast2("error", responseData.message);
           return responseData;
         }
         let data2 = formatDateTimeRecursively(responseData.data);
@@ -17117,6 +17127,7 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
     const props = __props;
     const formType = inject("formType");
     const everyItemDisplayAnalysisSwitch = inject("everyItemDisplayAnalysisSwitch");
+    const httpBaseUrl = inject("httpBaseUrl");
     const displayAnswerDescription = ref(false);
     const { datas, componentProps } = toRefs(props);
     const emits = __emit;
@@ -17134,7 +17145,7 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
       if (isEmpty(httpSetting)) {
         return;
       }
-      await callApi(httpSetting, datas.value, true);
+      await callApi(httpSetting, datas.value, httpBaseUrl, true);
     };
     return (_ctx, _cache) => {
       const _component_wd_icon = resolveEasycom(resolveDynamicComponent("wd-icon"), __easycom_0$5);
@@ -23084,6 +23095,7 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const formType = inject("formType");
+    const httpBaseUrl = inject("httpBaseUrl");
     const { datas, componentProps } = toRefs(props);
     const emits = __emit;
     watch(datas, (newValue) => emits("update:datas", newValue));
@@ -23133,7 +23145,7 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
       if (!httpSetting) {
         return;
       }
-      initEmployeeOptions.value = await callApi(httpSetting, datas.value, false) ?? [];
+      initEmployeeOptions.value = await callApi(httpSetting, datas.value, httpBaseUrl, false) ?? [];
       employeeOptions.value = initEmployeeOptions.value;
       componentProps.value.remoteFlag && await init4();
     };
@@ -23153,7 +23165,7 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
           newHttpSetting.parameters[index2].value = filterValue;
         }
       });
-      const options = await callApi(newHttpSetting, datas.value, false) ?? [];
+      const options = await callApi(newHttpSetting, datas.value, httpBaseUrl, false) ?? [];
       if (addFlag) {
         employeeOptions.value = [...employeeOptions.value, ...options];
       } else {
@@ -26514,6 +26526,13 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     showCorrectOrNot: {
       type: Boolean,
       default: false
+    },
+    /**
+     * 接口基础路径
+     */
+    httpBaseUrl: {
+      type: String,
+      default: ""
     }
   },
   emits: ["change", "switchPage"],
@@ -26524,14 +26543,15 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emits = __emit;
     const { formData, onePageItemFlag } = toRefs(props);
-    provide("realTimeDisplayAnswerMode", props.realTimeDisplayAnswerMode);
-    provide("everyItemDisplayAnalysisSwitch", props.everyItemDisplayAnalysisSwitch);
-    provide("uploadOptions", props.uploadOptions);
-    provide("formData", formData);
     provide(
       "formType",
       computed(() => formData.value.props.formType)
     );
+    provide("uploadOptions", props.uploadOptions);
+    provide("formData", formData);
+    provide("realTimeDisplayAnswerMode", props.realTimeDisplayAnswerMode);
+    provide("everyItemDisplayAnalysisSwitch", props.everyItemDisplayAnalysisSwitch);
+    provide("httpBaseUrl", props.httpBaseUrl);
     const theme2 = inject("theme", ref({}));
     const themeVars = ref({});
     watch(
@@ -26622,7 +26642,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         case "radio":
           const radioOption = (_b2 = (_a2 = component.props) == null ? void 0 : _a2.options) == null ? void 0 : _b2.find((option) => option.value === data2[componentID]);
           resultData.push({
-            sourceType: component.itemSourceType,
+            sourceType: radioOption.itemSourceType,
             pageID,
             groupID,
             parentID: componentID,
@@ -26637,7 +26657,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
             var _a3, _b3;
             const checkboxOption = (_b3 = (_a3 = component.props) == null ? void 0 : _a3.options) == null ? void 0 : _b3.find((option) => option.value === value);
             resultData.push({
-              sourceType: component.itemSourceType,
+              sourceType: checkboxOption.itemSourceType,
               pageID,
               groupID,
               parentID: componentID,