@fecp/mobile 1.0.24 → 1.0.26

package/lib/packages/mobile/src/components/form/fieldPicker/FieldPicker.vue.js

@@ -16,6 +16,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const index = require("../field/index.js");
 const index$2 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/picker/index.js");
+const index$3 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/icon/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: "FieldPicker",
@@ -57,6 +58,7 @@ const _sfc_main = {
       () => props.modelValue,
       (value) => {
         if (!value) {
+          fieldTextValue.value = "";
           return;
         }
         const optionItem = props.pickerOptions.find(
@@ -71,19 +73,20 @@ const _sfc_main = {
       showPicker.value = false;
     };
     return (_ctx, _cache) => {
+      const _component_van_icon = index$3.Icon;
       const _component_van_picker = index$2.Picker;
       const _component_van_popup = index$1.Popup;
       return vue.openBlock(), vue.createBlock(vue.unref(index.MobileField), vue.mergeProps(_ctx.$attrs, {
         modelValue: vue.unref(fieldTextValue),
-        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
         "is-link": "",
         readonly: "",
-        onClick: _cache[3] || (_cache[3] = ($event) => showPicker.value = true)
-      }), {
+        onClick: _cache[4] || (_cache[4] = ($event) => showPicker.value = true)
+      }), vue.createSlots({
         default: vue.withCtx(() => [
           vue.createVNode(_component_van_popup, {
             show: vue.unref(showPicker),
-            "onUpdate:show": _cache[1] || (_cache[1] = ($event) => vue.isRef(showPicker) ? showPicker.value = $event : null),
+            "onUpdate:show": _cache[2] || (_cache[2] = ($event) => vue.isRef(showPicker) ? showPicker.value = $event : null),
             "destroy-on-close": "",
             position: "bottom"
           }, {
@@ -94,14 +97,26 @@ const _sfc_main = {
                 "model-value": vue.unref(pickerValue),
                 readonly: false,
                 onConfirm,
-                onCancel: _cache[0] || (_cache[0] = ($event) => showPicker.value = false)
+                onCancel: _cache[1] || (_cache[1] = ($event) => showPicker.value = false)
               }), null, 16, ["columns", "columns-field-names", "model-value"])
             ]),
             _: 1
           }, 8, ["show"])
         ]),
-        _: 1
-      }, 16, ["modelValue"]);
+        _: 2
+      }, [
+        vue.unref(fieldTextValue) ? {
+          name: "right-icon",
+          fn: vue.withCtx(() => [
+            vue.createVNode(_component_van_icon, {
+              name: "clear",
+              class: "custom-close-icon",
+              onClick: _cache[0] || (_cache[0] = vue.withModifiers(($event) => pickerValue.value = null, ["stop"]))
+            })
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1040, ["modelValue"]);
     };
   }
 };

package/lib/packages/mobile/src/components/form/fieldRadio/FieldRadio.vue.js

@@ -6,7 +6,6 @@ const index$1 = require("../radioGroup/index.js");
 const _sfc_main = {
   __name: "FieldRadio",
   setup(__props) {
-    debugger;
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(index.MobileField), vue.normalizeProps(vue.guardReactiveProps(_ctx.$attrs)), {
         input: vue.withCtx(() => [

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

@@ -16,8 +16,10 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 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 dateUtil = require("../../../utils/dateUtil.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$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 index$3 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/icon/index.js");
 const _sfc_main = {
   __name: "FieldTimePicker",
   props: {
@@ -25,13 +27,18 @@ const _sfc_main = {
       type: String,
       default: ""
     },
-    textFormat: {
+    // textFormat: {
+    //   type: String,
+    //   default: "HH:mm:ss",
+    // },
+    // valueFormat: {
+    //   type: String,
+    //   default: "HH:mm:ss",
+    // },
+    timeTextFormat: {
+      //0:HH:mm:ss;1: HH时mm分ss秒
       type: String,
-      default: "HH:mm:ss"
-    },
-    valueFormat: {
-      type: String,
-      default: "HH:mm:ss"
+      default: "0"
     },
     timeColumnsType: {
       type: String,
@@ -47,27 +54,54 @@ const _sfc_main = {
     const fieldTextValue = vue.ref("");
     const showPicker = vue.ref(false);
     const emit = __emit;
+    let textFormat = dateUtil.parseTimeFormatter(
+      props.timeTextFormat,
+      props.timeColumnsType
+    );
+    let valueFormat = dateUtil.parseTimeFormatter("0", props.timeColumnsType);
     const pickerValue = vue.computed(() => {
+      let date;
       if (!props.modelValue) {
-        const date2 = moment.default();
-        return [date2.hours(), date2.minutes(), date2.seconds()];
+        date = moment.default();
+      } else {
+        date = moment.default(props.modelValue, props.valueFormat);
+      }
+      const hours = date.hours();
+      const minutes = date.minutes();
+      const seconds = date.seconds();
+      let value = [];
+      const columnsTypeArr = props.timeColumnsType.split(",");
+      if (columnsTypeArr.length == 1) {
+        value = [hours];
+      } else if (columnsTypeArr.length == 2) {
+        value = [hours, minutes];
+      } else if (columnsTypeArr.length == 3) {
+        value = [hours, minutes, seconds];
       }
-      const date = moment.default(props.modelValue, props.valueFormat);
-      const value = [date.hours(), date.minutes(), date.seconds()];
       return value;
     });
     const columnsType = vue.computed(() => {
-      return props.timeColumnsType.join(",");
+      return props.timeColumnsType.split(",");
     });
+    const formatter = (type, option) => {
+      console.log(type);
+      if (type === "hour") {
+        option.text += "时";
+      } else if (type === "minute") {
+        option.text += "分";
+      } else if (type === "second") {
+        option.text += "秒";
+      }
+      return option;
+    };
     vue.watch(
       () => props.modelValue,
       (value) => {
         if (!value) {
+          fieldTextValue.value = "";
           return;
         }
-        fieldTextValue.value = moment.default(value, props.valueFormat).format(
-          props.textFormat
-        );
+        fieldTextValue.value = moment.default(value, valueFormat).format(textFormat);
       },
       { immediate: true }
     );
@@ -75,42 +109,56 @@ const _sfc_main = {
       const val = moment.default(
         `${selectedValues[0]}${selectedValues[1]}${selectedValues[2]}`,
         "HH:mm:ss"
-      ).format(props.valueFormat);
+      ).format(valueFormat);
       emit("update:modelValue", val);
       showPicker.value = false;
     };
     return (_ctx, _cache) => {
+      const _component_van_icon = index$3.Icon;
       const _component_van_time_picker = index$2.TimePicker;
       const _component_van_popup = index$1.Popup;
       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),
+        "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
         "is-link": "",
         readonly: "",
-        onClick: _cache[4] || (_cache[4] = ($event) => showPicker.value = true)
-      }), {
+        onClick: _cache[5] || (_cache[5] = ($event) => showPicker.value = true)
+      }), vue.createSlots({
         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),
+            "onUpdate:show": _cache[3] || (_cache[3] = ($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),
+                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.isRef(pickerValue) ? pickerValue.value = $event : null),
                 readonly: false,
                 columnsType: vue.unref(columnsType),
+                formatter,
                 onConfirm,
-                onCancel: _cache[1] || (_cache[1] = ($event) => showPicker.value = false)
+                onCancel: _cache[2] || (_cache[2] = ($event) => showPicker.value = false)
               }), null, 16, ["modelValue", "columnsType"])
             ]),
             _: 1
           }, 8, ["show"])
         ]),
-        _: 1
-      }, 16, ["modelValue"]);
+        _: 2
+      }, [
+        vue.unref(fieldTextValue) ? {
+          name: "right-icon",
+          fn: vue.withCtx(() => [
+            vue.createVNode(_component_van_icon, {
+              name: "clear",
+              class: "custom-close-icon",
+              onClick: _cache[0] || (_cache[0] = vue.withModifiers(($event) => emit("update:modelValue", null), ["stop"]))
+            })
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1040, ["modelValue"]);
     };
   }
 };

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

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const parseDateFormatter = (textFormatType, columnsType) => {
+  const columnsTypeArr = columnsType.split(",");
+  if (columnsTypeArr.length == 1) {
+    if (textFormatType == "3") {
+      return "YYYY年";
+    }
+    return "YYYY";
+  } else if (columnsTypeArr.length == 2) {
+    if (textFormatType == "0") {
+      return "YYYYMM";
+    } else if (textFormatType == "1") {
+      return "YYYY-MM";
+    } else if (textFormatType == "2") {
+      return "YYYY/MM";
+    } else if (textFormatType == "3") {
+      return "YYYY年MM月";
+    }
+  } else if (columnsTypeArr.length == 3) {
+    if (textFormatType == "0") {
+      return "YYYYMMDD";
+    } else if (textFormatType == "1") {
+      return "YYYY-MM-DD";
+    } else if (textFormatType == "2") {
+      return "YYYY/MM/DD";
+    } else if (textFormatType == "3") {
+      return "YYYY年MM月DD日";
+    }
+  }
+};
+const parseTimeFormatter = (textFormatType, columnsType) => {
+  const columnsTypeArr = columnsType.split(",");
+  if (columnsTypeArr.length == 1) {
+    if (textFormatType == "1") {
+      return "HH时";
+    }
+    return "HH";
+  } else if (columnsTypeArr.length == 2) {
+    if (textFormatType == "0") {
+      return "HH:mm";
+    } else if (textFormatType == "1") {
+      return "HH时mm分";
+    }
+  } else if (columnsTypeArr.length == 3) {
+    if (textFormatType == "0") {
+      return "HH:mm:ss";
+    } else if (textFormatType == "1") {
+      return "HH时mm分ss秒";
+    }
+  }
+};
+exports.parseDateFormatter = parseDateFormatter;
+exports.parseTimeFormatter = parseTimeFormatter;

package/package.json

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