@fecp/mobile 1.0.17 → 1.0.19

package/lib/packages/mobile/src/components/form/fieldTimePicker/FieldTimePicker.vue.js

@@ -13,12 +13,10 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                */
 ;/* empty css                                                                                                                   */
 ;/* empty css                                                                                                                         */
-;/* empty css                                                                                                                 */
-;/* empty css                                                                                                                  */
 const vue = require("vue");
+const index = require("../field/index.js");
 const moment = require("../../../../../../node_modules/.pnpm/moment@2.30.1/node_modules/moment/dist/moment.js");
 const index$2 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/time-picker/index.js");
-const index = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/field/index.js");
 const index$1 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/popup/index.js");
 const _sfc_main = {
   __name: "FieldTimePicker",
@@ -72,46 +70,36 @@ const _sfc_main = {
       showPicker.value = false;
     };
     return (_ctx, _cache) => {
-      const _component_van_field = index.Field;
       const _component_van_time_picker = index$2.TimePicker;
       const _component_van_popup = index$1.Popup;
-      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-        vue.createVNode(_component_van_field, vue.mergeProps(_ctx.$attrs, {
-          modelValue: vue.unref(fieldTextValue),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-          "is-link": "",
-          readonly: "",
-          name: "picker",
-          required: "auto",
-          onClick: _cache[1] || (_cache[1] = ($event) => showPicker.value = true)
-        }), vue.createSlots({ _: 2 }, [
-          vue.renderList(_ctx.$slots, (item, key) => {
-            return {
-              name: key,
-              fn: vue.withCtx(() => [
-                vue.renderSlot(_ctx.$slots, key)
-              ])
-            };
-          })
-        ]), 1040, ["modelValue"]),
-        vue.createVNode(_component_van_popup, {
-          show: vue.unref(showPicker),
-          "onUpdate:show": _cache[4] || (_cache[4] = ($event) => vue.isRef(showPicker) ? showPicker.value = $event : null),
-          "destroy-on-close": "",
-          position: "bottom"
-        }, {
-          default: vue.withCtx(() => [
-            vue.createVNode(_component_van_time_picker, vue.mergeProps(_ctx.$attrs, {
-              modelValue: vue.unref(pickerValue),
-              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.isRef(pickerValue) ? pickerValue.value = $event : null),
-              readonly: false,
-              onConfirm,
-              onCancel: _cache[3] || (_cache[3] = ($event) => showPicker.value = false)
-            }), null, 16, ["modelValue"])
-          ]),
-          _: 1
-        }, 8, ["show"])
-      ], 64);
+      return vue.openBlock(), vue.createBlock(vue.unref(index.MobileField), vue.mergeProps(_ctx.$attrs, {
+        modelValue: vue.unref(fieldTextValue),
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
+        "is-link": "",
+        readonly: "",
+        onClick: _cache[4] || (_cache[4] = ($event) => showPicker.value = true)
+      }), {
+        default: vue.withCtx(() => [
+          vue.createVNode(_component_van_popup, {
+            show: vue.unref(showPicker),
+            "onUpdate:show": _cache[2] || (_cache[2] = ($event) => vue.isRef(showPicker) ? showPicker.value = $event : null),
+            "destroy-on-close": "",
+            position: "bottom"
+          }, {
+            default: vue.withCtx(() => [
+              vue.createVNode(_component_van_time_picker, vue.mergeProps(_ctx.$attrs, {
+                modelValue: vue.unref(pickerValue),
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(pickerValue) ? pickerValue.value = $event : null),
+                readonly: false,
+                onConfirm,
+                onCancel: _cache[1] || (_cache[1] = ($event) => showPicker.value = false)
+              }), null, 16, ["modelValue"])
+            ]),
+            _: 1
+          }, 8, ["show"])
+        ]),
+        _: 1
+      }, 16, ["modelValue"]);
     };
   }
 };

package/lib/packages/mobile/src/components/form/radioGroup/RadioGroup.vue.js

@@ -2,22 +2,50 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 ;/* empty css                                                                                                                 */
 ;/* empty css                                                                                                                        */
+;/* empty css                                                                                                                  */
+;/* empty css                                                                                                                 */
+;/* empty css                                                                                                                     */
+;/* empty css                                                                                                                  */
 const vue = require("vue");
-const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/radio-group/index.js");
-const _sfc_main = {};
-function _sfc_render(_ctx, _cache) {
-  const _component_van_radio_group = index.RadioGroup;
-  return vue.openBlock(), vue.createBlock(_component_van_radio_group, vue.normalizeProps(vue.guardReactiveProps(_ctx.$attrs)), vue.createSlots({ _: 2 }, [
-    vue.renderList(_ctx.$slots, (item, key) => {
-      return {
-        name: key,
-        fn: vue.withCtx(() => [
-          vue.renderSlot(_ctx.$slots, key)
-        ])
-      };
-    })
-  ]), 1040);
-}
-const _RadioGroup = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["render", _sfc_render]]);
-exports.default = _RadioGroup;
+const index$1 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/radio/index.js");
+const _sfc_main = {
+  __name: "RadioGroup",
+  props: {
+    options: {
+      type: Array,
+      default: []
+    },
+    fieldNames: {
+      type: Object,
+      default: {
+        text: "text",
+        value: "value",
+        disabled: "disabled"
+      }
+    }
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      const _component_van_radio = index$1.Radio;
+      const _component_van_radio_group = index.RadioGroup;
+      return vue.openBlock(), vue.createBlock(_component_van_radio_group, vue.normalizeProps(vue.guardReactiveProps(_ctx.$attrs)), {
+        default: vue.withCtx(() => [
+          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.options, (item) => {
+            return vue.openBlock(), vue.createBlock(_component_van_radio, {
+              name: item[__props.fieldNames.value],
+              disabled: item[__props.fieldNames.disabled]
+            }, {
+              default: vue.withCtx(() => [
+                vue.createTextVNode(vue.toDisplayString(item[__props.fieldNames.text]), 1)
+              ]),
+              _: 2
+            }, 1032, ["name", "disabled"]);
+          }), 256))
+        ]),
+        _: 1
+      }, 16);
+    };
+  }
+};
+exports.default = _sfc_main;

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

@@ -5,18 +5,32 @@ const parseRule = ({ label, isRequired, ruleType }) => {
   if (isRequired) {
     ruleList.push({ required: true, message: `请填写${label}` });
   }
+  const errorMessage = `请填写正确的${label}`;
+  const validateEmpty = false;
   switch (ruleType) {
     case "email":
       var pattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "phone":
       var pattern = /^((\+?86)|(\(\+86\)))?(1[3-9]\d{9})$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "mobile":
       var pattern = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "mobilephone":
       let validatorMobilephone = function(value) {
@@ -25,10 +39,14 @@ const parseRule = ({ label, isRequired, ruleType }) => {
         if (isMob.test(value) || isPhone.test(value)) {
           return true;
         } else {
-          return `请填写正确的${label}`;
+          return false;
         }
       };
-      ruleList.push({ validator: validatorMobilephone });
+      ruleList.push({
+        validator: validatorMobilephone,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "idNo":
       let validatorIdNo = function(value) {
@@ -37,26 +55,46 @@ const parseRule = ({ label, isRequired, ruleType }) => {
         if (reg15.test(value) || reg18.test(value)) {
           return true;
         } else {
-          return `请填写正确的${label}`;
+          return false;
         }
       };
-      ruleList.push({ validator: validatorIdNo });
+      ruleList.push({
+        validator: validatorIdNo,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "usci":
       var pattern = /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "postcode":
       var pattern = /^[0-9]{6}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "fax":
       var pattern = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
     case "bankcard":
       var pattern = /^[1-9]\d{7,29}$/;
-      ruleList.push({ pattern, message: `请填写正确的${label}` });
+      ruleList.push({
+        pattern,
+        message: errorMessage,
+        validateEmpty
+      });
       break;
   }
   return ruleList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/mobile",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "main": "lib/packages/mobile/index.js",
   "module": "es/packages/mobile/index.mjs",
   "files": [