@uxda/appkit 4.1.23 → 4.1.25

package/dist/appkit.css

@@ -623,14 +623,14 @@ page {
   top: 11px;
   background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik00MSA0MUgxVjFINDFWNDFaIiBmaWxsPSIjRDhEOEQ4IiBzdHJva2U9ImJsYWNrIiBzdHJva2Utb3BhY2l0eT0iMC4wMSIvPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTIzLjM1NjEgMjAuOTk5OUwzMy45NjM3IDMxLjYwNzJDMzQuNjE0NiAzMi4yNTgxIDM0LjYxNDYgMzMuMzEzNCAzMy45NjM3IDMzLjk2NDJDMzMuMzQyNSAzNC41ODU1IDMyLjM1MjcgMzQuNjEzOCAzMS42OTc5IDM0LjA0ODlMMjAuOTk5NCAyMy4zNTY2TDEwLjM5MzUgMzMuOTY0MkM5Ljc0MjY1IDM0LjYxNTEgOC42ODczOCAzNC42MTUxIDguMDM2NSAzMy45NjQyQzcuNDE1MTkgMzMuMzQyOSA3LjM4Njk3IDMyLjM1MzIgNy45NTE3OSAzMS42OTg0TDE4LjY0MjggMjAuOTk5OUw4LjAzNjUgMTAuMzk0QzcuMzg1NjMgOS43NDMxNCA3LjM4NTYzIDguNjg3ODcgOC4wMzY1IDguMDM2OTlDOC42NTc3OSA3LjQxNTY4IDkuNjQ3NTQgNy4zODc0NiAxMC4zMDIzIDcuOTUyMjdMMjAuOTk5NCAxOC42NDMzTDMxLjYwNjcgOC4wMzY5OUMzMi4yNTc2IDcuMzg2MTIgMzMuMzEyOSA3LjM4NjEyIDMzLjk2MzcgOC4wMzY5OUMzNC41ODUgOC42NTgyOCAzNC42MTMzIDkuNjQ4MDMgMzQuMDQ4NSAxMC4zMDI4TDIzLjM1NjEgMjAuOTk5OVoiIGZpbGw9IiMxNzFBMUQiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS1vcGFjaXR5PSIwLjAxIi8+Cjwvc3ZnPgo=");
 }
-.appkit-date-filter {
+.consumption-date-filter {
   height: 100%;
   display: flex;
   flex-direction: column;
   width: 100%;
   position: relative;
 }
-.appkit-date-filter .date-filter-header {
+.consumption-date-filter .date-filter-header {
   text-align: center;
   height: 44px;
   line-height: 44px;
@@ -638,42 +638,42 @@ page {
   font-size: 17px;
   background-color: #f5f5f5;
 }
-.appkit-date-filter .content {
+.consumption-date-filter .content {
   flex: 1;
   margin: 15px;
   overflow-y: scroll;
   color: #353535;
   font-size: 13px;
 }
-.appkit-date-filter .content .title {
+.consumption-date-filter .content .title {
   opacity: 0.6;
   line-height: 18px;
 }
-.appkit-date-filter .content .info {
+.consumption-date-filter .content .info {
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
   grid-gap: 10px;
   margin: 10px 0;
 }
-.appkit-date-filter .content .info .item {
+.consumption-date-filter .content .info .item {
   height: 30px;
   line-height: 30px;
   border: 1px solid #ccc;
   border-radius: 6px;
   text-align: center;
 }
-.appkit-date-filter .content .info .current {
+.consumption-date-filter .content .info .current {
   border: 1px solid;
   border-image-source: linear-gradient(180deg, rgba(239, 208, 130, 0.8) 0%, rgba(255, 185, 120, 0.8) 100%);
   background: linear-gradient(180deg, rgba(239, 208, 130, 0.8) 0%, rgba(255, 185, 120, 0.8) 100%), linear-gradient(180deg, #fff7e3 0%, #fefde6 100%);
 }
-.appkit-date-filter .buttons {
-  margin: 32px 15px 0 15px;
+.consumption-date-filter .buttons {
+  margin: 0 15px;
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
-.appkit-date-filter .buttons .btn {
+.consumption-date-filter .buttons .btn {
   flex: 1;
   height: 40px;
   line-height: 40px;
@@ -684,22 +684,22 @@ page {
   font-size: 16px;
   border-radius: 6px;
 }
-.appkit-date-filter .buttons .confirm {
+.consumption-date-filter .buttons .confirm {
   margin-left: 11px;
   color: #000;
   border: none;
   background: linear-gradient(90deg, #ffebc1 0%, #ffd7a7 52.29%, #ffb875 100%);
 }
-.appkit-date-filter .time {
+.consumption-date-filter .time {
   display: flex;
   justify-content: flex-start;
   align-items: center;
   margin: 10px 0 30px 0;
 }
-.appkit-date-filter .time .line {
+.consumption-date-filter .time .line {
   margin: 0 8px;
 }
-.appkit-date-filter .time .item {
+.consumption-date-filter .time .item {
   height: 30px;
   line-height: 30px;
   padding: 0 15px;
@@ -710,16 +710,13 @@ page {
   background: rgba(245, 245, 245, 0.8);
   border-radius: 6px;
 }
-.appkit-date-filter .time .current {
+.consumption-date-filter .time .current {
   border: 1px solid #353535;
 }
-.appkit-date-filter .bottom {
+.consumption-date-filter .bottom {
   height: 32px;
   background: #fff;
 }
-.nut-overlay.date-filter-picker-overlay {
-  height: 100vh;
-}
 .consumption-rules .title {
   line-height: 16px;
   font-weight: 500;

package/dist/index.js

@@ -7,7 +7,7 @@ import '@nutui/nutui-taro/dist/packages/griditem/style/css';
 import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import { isIdentityCard, isMobilePhone } from 'validator';
-import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell } from '@uxda/nutshell/taro';
+import { NsForm, NsInput, NsButton, NsIcon, useNutshell } from '@uxda/nutshell/taro';
 import debounce from 'lodash/debounce';
 import '@nutui/nutui-taro/dist/packages/dialog/style/css';
 import '@nutui/nutui-taro/dist/packages/datepicker/style/css';
@@ -723,7 +723,6 @@ const appKitOptions = {
   tenant: () => "",
   token: () => "",
   tempToken: () => "",
-  tempAppcode: () => "",
   baseUrl: () => "",
   401() {
   },
@@ -1403,7 +1402,7 @@ var script$A = /* @__PURE__ */ defineComponent({
       state.selected = selected;
     };
     onMounted(() => {
-      const $http = useHttp$2({ Appcode: props.app, Tenant: props.tenant });
+      const $http = useHttp$2({ Appcode: props.app !== "cloudkitPro" ? props.app : "", Tenant: props.tenant });
       $http.get(endpoints.\u83B7\u53D6\u5145\u503C\u91D1\u989D\u5217\u8868, {
         app: props.app,
         tenant: props.tenant
@@ -2235,7 +2234,7 @@ var script$u = /* @__PURE__ */ defineComponent({
 
 script$u.__file = "src/balance/components/ConsumptionFilter.vue";
 
-const _hoisted_1$s = { class: "appkit-date-filter" };
+const _hoisted_1$s = { class: "consumption-date-filter" };
 const _hoisted_2$o = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "date-filter-header" },
@@ -2275,7 +2274,7 @@ var script$t = /* @__PURE__ */ defineComponent({
   emits: ["complete", "reset"],
   setup(__props, { emit: __emit }) {
     const props = __props;
-    const emit = __emit, state = usePopup();
+    const emit = __emit;
     watch(
       () => `${props.from}${props.to}`,
       () => {
@@ -2289,10 +2288,6 @@ var script$t = /* @__PURE__ */ defineComponent({
     const minDate = ref();
     const maxDate = ref(/* @__PURE__ */ new Date());
     const datePickerOpen = ref(false);
-    state.beforeClose = () => {
-      datePickerOpen.value = false;
-      return true;
-    };
     function reset() {
       emit("reset");
     }
@@ -2311,11 +2306,6 @@ var script$t = /* @__PURE__ */ defineComponent({
         result.to = time;
       }
       datePickerOpen.value = false;
-      state.couldClose = true;
-    }
-    function onDatePickerCancel() {
-      datePickerOpen.value = false;
-      state.couldClose = true;
     }
     function switchDateInput(shift) {
       if (shift === "from") {
@@ -2328,7 +2318,6 @@ var script$t = /* @__PURE__ */ defineComponent({
       focusedDate.value = new Date(result[shift]);
       focused.value = shift;
       datePickerOpen.value = true;
-      state.couldClose = false;
     }
     return (_ctx, _cache) => {
       const _component_nut_date_picker = DatePicker;
@@ -2374,10 +2363,8 @@ var script$t = /* @__PURE__ */ defineComponent({
         _hoisted_7$6,
         createVNode(_component_nut_popup, {
           visible: datePickerOpen.value,
-          "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => datePickerOpen.value = $event),
-          class: "appkit-date-filter-picker-popup",
-          position: "bottom",
-          "overlay-class": "appkit-date-filter-picker-overlay"
+          "onUpdate:visible": _cache[4] || (_cache[4] = ($event) => datePickerOpen.value = $event),
+          position: "bottom"
         }, {
           default: withCtx(() => [
             createVNode(_component_nut_date_picker, {
@@ -2387,7 +2374,7 @@ var script$t = /* @__PURE__ */ defineComponent({
               "max-date": maxDate.value,
               "is-show-chinese": false,
               "three-dimensional": false,
-              onCancel: onDatePickerCancel,
+              onCancel: _cache[3] || (_cache[3] = ($event) => datePickerOpen.value = false),
               onConfirm: onDatePickerComplete
             }, null, 8, ["modelValue", "min-date", "max-date"])
           ]),
@@ -3263,17 +3250,12 @@ var script$n = /* @__PURE__ */ defineComponent({
     const $n = useNutshell();
     const model = useModel(__props, "modelValue");
     const openDateRangePicker = () => {
-      const child = ref();
       $n.sheet({
         component: script$t,
-        ref: child,
         props: {
           from: model.value.from,
           to: model.value.to
         },
-        modal: true,
-        // 不允许点击 overlay 关闭弹窗
-        mask: true,
         onComplete(result) {
           model.value = {
             from: result.from,
@@ -7824,10 +7806,6 @@ const $app = {
     const appKitOptions = useAppKitOptions();
     appKitOptions.tempToken = token;
   },
-  setTempAppcode: (appcode) => {
-    const appKitOptions = useAppKitOptions();
-    appKitOptions.tempAppcode = appcode;
-  },
   requestPayment: (options) => {
   },
   invokeRecharge: (options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.1.23",
+  "version": "4.1.25",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",