@uxda/appkit 1.2.36 → 1.2.40

package/package.json

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

package/src/components/dd-notice-bar/index.vue

@@ -1,76 +1,78 @@
-<script setup lang="ts">
-const props = defineProps<{
-  text: string
-  style?: {} | string
-  showClose?: boolean
-}>()
-
-const emit = defineEmits(['close', 'txtClick'])
-function close() {
-  emit('close')
-}
-function txtClick() {
-  emit('txtClick')
-}
-</script>
-
-<template>
-  <div class="dd-notice-bar" :class="{ close: showClose }" :style="style">
-    <div class="dd-notice-bar__txt" name="text" @click="txtClick">
-      <span v-if="text">{{ text }}</span>
-      <slot></slot>
-    </div>
-    <div v-if="showClose" class="dd-notice-bar__close" @click="close">
-      <img
-        src="https://cdn.ddjf.com/static/images/wechat-yunservice/close-icon.png"
-        class="dd-notice-bar__close-img"
-      />
-    </div>
-  </div>
-</template>
-
-<style lang="scss">
-.dd-notice-bar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 10;
-  font-size: 13px;
-  color: #ea5959;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  min-height: 30px;
-  line-height: 18px;
-  padding: 6px 18px;
-  background: #ffe8d8;
-  box-sizing: border-box;
-  &__close {
-    width: 22px;
-    height: 22px;
-    display: flex;
-    margin-right: -6px;
-    margin-left: 6px;
-    justify-content: center;
-    align-items: center;
-    &-img {
-      width: 10px;
-      height: 10px;
-    }
-  }
-  &.close {
-    justify-content: space-between;
-    color: #fb970c;
-    background: #fff2d8;
-    .dd-notice-bar__txt {
-      text-align: left;
-    }
-  }
-  &__txt {
-    flex: 1;
-    text-align: center;
-    opacity: 0.8;
-  }
-}
-</style>
+<script setup lang="ts">
+const props = defineProps<{
+  text?: string
+  style?: {} | string
+  showClose?: boolean
+}>()
+
+const emit = defineEmits(['close', 'txtClick'])
+function close() {
+  emit('close')
+}
+function txtClick() {
+  emit('txtClick')
+}
+</script>
+
+<template>
+  <div class="dd-notice-bar" :class="{ close: showClose }" :style="style">
+    <div class="dd-notice-bar__txt" name="text" @click="txtClick">
+      <span v-if="text">{{ text }}</span>
+      <slot></slot>
+    </div>
+    <div v-if="showClose" class="dd-notice-bar__close" @click="close">
+      <img
+        src="https://cdn.ddjf.com/static/images/wechat-yunservice/close-icon.png"
+        class="dd-notice-bar__close-img"
+      />
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+.dd-notice-bar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  font-size: 13px;
+  color: #ea5959;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  min-height: 30px;
+  line-height: 18px;
+  padding: 6px 18px;
+  background: #ffe8d8;
+  box-sizing: border-box;
+  &__close {
+    width: 22px;
+    height: 22px;
+    display: flex;
+    margin-right: -6px;
+    margin-left: 6px;
+    justify-content: center;
+    align-items: center;
+    &-img {
+      width: 10px;
+      height: 10px;
+    }
+  }
+  &.close {
+    justify-content: space-between;
+    color: #fb970c;
+    background: #fff2d8;
+    .dd-notice-bar__txt {
+      text-align: left;
+    }
+  }
+  &__txt {
+    flex: 1;
+    text-align: center;
+    opacity: 0.8;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

package/src/components/dd-search/doc.md

@@ -0,0 +1,34 @@
+# ddSearch 搜索框
+
+#
+## 使用
+
+``` javascript
+import ddSearch from '~/components/ddSearch/index.vue'
+```
+``` html
+<dd-search
+  :bordered="false"
+  :inNavbar="true"
+  :value="searchStr"
+  placeholder="输入客户姓名"
+  @search="onSearch"
+  @focus="onSearchFocus" />
+```
+
+## Prop
+
+| 字段       | 说明        | 类型    | 默认值   |
+|-----------|-------------|---------|----------|
+| disabled   | 是否禁用    | boolean | false    |
+| placeholder | 输入框placeholder  | string  | '请输入'   |
+| value    | 绑定值    | string  | ''     |
+| bordered   | 是否显示底部边框   | boolean  | true     |
+| inNavbar   | 是否在导航栏中   | boolean  | false     |
+
+## Events
+
+| 事件名    | 说明           | 回调参数            |
+|----------|----------------|--------------------|
+| search   | 点击搜索时    |   value, 搜索参数     |
+| focus    | 输入框focus   |   event             |

package/src/components/dd-search/index.vue

@@ -0,0 +1,172 @@
+<script setup lang="ts">
+import { computed, ref, watchPostEffect } from 'vue'
+
+interface SearchType {
+  disabled?: boolean
+  placeholder?: string
+  value?: string
+  bordered?: boolean
+  inNavbar?: boolean
+  focus?: boolean
+}
+const props = withDefaults(defineProps<SearchType>(), {
+  disabled: false,
+  placeholder: '',
+  bordered: true,
+  inNavbar: false,
+  focus: true,
+})
+
+watchPostEffect(() => {
+  key.value = props.value ?? ''
+})
+
+const emit = defineEmits(['search', 'focus', 'clear'])
+
+const ph = computed(() => {
+  return props.placeholder || '请输入'
+})
+
+const key = ref('')
+const showClear = computed(() => {
+  return !!key.value.trim()
+})
+function onClear() {
+  key.value = ''
+  emit('clear', '')
+}
+function onConfirm() {
+  if (props.disabled) return
+  // if (key.value.trim()) {
+  key.value = key.value.trim()
+  emit('search', key.value)
+  // }
+}
+function onFoucs(e) {
+  isFoucs.value = true
+  emit('focus', e)
+}
+function onBlur() {
+  isFoucs.value = false
+}
+const isFoucs = ref(props.focus)
+</script>
+
+<template>
+  <div
+    class="dd-search"
+    :class="{
+      disabled: props.disabled,
+      bordered: props.bordered,
+      inNavbar: props.inNavbar,
+      focus: !props.disabled && isFoucs,
+    }"
+  >
+    <div class="dd-search__form">
+      <div class="dd-search__prefix">
+        <image
+          class="full-img"
+          src="https://cdn.ddjf.com/static/images/wx-yunservice/search-icon.png"
+        />
+      </div>
+      <div class="dd-search__control">
+        <input
+          class="dd-search__input"
+          type="text"
+          :disabled="props.disabled"
+          :placeholder="ph"
+          v-model="key"
+          :focus="props.focus"
+          placeholder-class="dd-search__placeholder"
+          cursor-spacing="50"
+          confirm-type="search"
+          @confirm="onConfirm"
+          @focus="onFoucs"
+          @blur="onBlur"
+        />
+      </div>
+      <div class="dd-search__suffix" v-show="showClear" @tap="onClear">
+        <image
+          class="full-img"
+          src="https://cdn.ddjf.com/static/images/wx-yunservice/clear-icon.png"
+        />
+      </div>
+    </div>
+    <div v-if="!props.inNavbar" class="dd-search__btn" @click.stop="onConfirm">搜索</div>
+  </div>
+</template>
+
+<style lang="scss">
+.dd-search {
+  padding: 8px 12px;
+  display: flex;
+  align-items: center;
+  background: #fefefe;
+  &.bordered {
+    border-bottom: 1px solid #ddd;
+  }
+  &.inNavbar {
+    padding: 0;
+    width: 235px;
+    z-index: 10;
+    position: absolute;
+    left: 40px;
+    background: transparent;
+    .dd-search__form {
+      background: $bg-default;
+      border-color: transparent;
+    }
+  }
+  &.focus {
+    .dd-search__form {
+      border-color: $primary-color;
+    }
+  }
+  &__placeholder {
+    color: #b4b4b4;
+  }
+  &__form {
+    flex: 1;
+    box-sizing: border-box;
+    height: 36px;
+    //border: 1px solid rgba(180, 180, 180, 0.2);
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+    padding: 0 10px;
+    background-color: #f1f3f5;
+  }
+  &__control {
+    font-size: 13px;
+    flex: 1;
+  }
+  &__input {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 10px;
+    caret-color: var(--second-color);
+  }
+  &__prefix,
+  &__suffix {
+    width: 15px !important;
+    height: 15px !important;
+  }
+  &__btn {
+    height: 33px;
+    line-height: 33px;
+    padding: 0 10px;
+    font-size: var(--primary-size);
+    color: var(--second-color);
+  }
+  &.disabled &__suffix {
+    display: none;
+  }
+  //&.disabled &__btn {
+  //  display: none;
+  //}
+  &.disabled &__control {
+    flex: 1;
+    width: fit-content;
+  }
+}
+</style>

package/src/index.ts

@@ -1,20 +1,19 @@
 import { App } from 'vue'
 import { components as paymentComponents } from './payment/components'
 import { services as paymentServices } from './payment'
-import {
-  // Grid,
-  // GridItem,
-  // Button,
-  // Checkbox,
-  // Popup,
-  // OverLay,
-  // DatePicker,
-  // Form,
-  // FormItem,
-  // Cell,
-  // CellGroup,
-  // Dialog
-} from '@nutui/nutui-taro'
+import // Grid,
+// GridItem,
+// Button,
+// Checkbox,
+// Popup,
+// OverLay,
+// DatePicker,
+// Form,
+// FormItem,
+// Cell,
+// CellGroup,
+// Dialog
+'@nutui/nutui-taro'
 import { type AppKitOptions, useAppKitOptions, DollarApp } from './Appkit'
 import { PaymentParams, RechargeParams } from './payment/types'
 import './main.scss'
@@ -85,4 +84,5 @@ export * from './payment'
 export * from './balance'
 export * from './shared'
 export * from './register'
+export * from './notice'
 export { type AppKitOptions }

package/src/notice/api/endpoints.ts

@@ -0,0 +1,17 @@
+import { HttpEndpoints } from '../../shared/http'
+
+const endpointsList: HttpEndpoints = {}
+
+const endpoints = Object.fromEntries(
+  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
+)
+
+const translates = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
+)
+
+const transforms = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
+)
+
+export { endpoints, translates, transforms }

package/src/notice/api/index.ts

@@ -0,0 +1,82 @@
+import Taro from '@tarojs/taro'
+import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
+import { translates, transforms } from './endpoints'
+import { useAppKitOptions } from '../../Appkit'
+
+/**
+ * 小程序端 Http
+ * 使用 Taro.request 实现
+ */
+const vendor = {
+  async request<T>(config: HttpRequestConfig) {
+    return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      Taro.request({
+        url: config.url,
+        method: config.method,
+        header: config.headers,
+        data: config.data,
+      })
+        .then(({ data }) => {
+          resolve({
+            status: +data.code,
+            message: data.msg,
+            data: data.result as T,
+          })
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
+    })
+  },
+}
+
+function useHttp() {
+  const appkitOptions = useAppKitOptions()
+  const headers = {
+    Token: appkitOptions.tempToken() || appkitOptions.token(),
+    Appcode: appkitOptions.app(),
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
+  }
+  /**
+   * 传入配置获取 Http instanse
+   */
+  const $http = createHttp({
+    vendor,
+    baseUrl: appkitOptions.baseUrl(),
+    headers,
+    interceptors: [
+      (raw) => {
+        if (raw.status == 401) {
+          appkitOptions[401]()
+          return true
+        }
+        return false
+      },
+      (raw) => {
+        if (raw.status > 500 && raw.status != 51014) {
+          return true
+        }
+        return false
+      },
+    ],
+    paging: {
+      translate: (params: PagingParams) => ({
+        pageNum: params.page,
+        pageSize: params.pageSize,
+      }),
+      transform(data: any): PagingData {
+        return {
+          totalPages: data.pages,
+        }
+      },
+    },
+    translates,
+    transforms,
+  })
+  return $http
+}
+
+export { useHttp }
+
+export * from './endpoints'

package/src/notice/components/LoginSetting.vue

@@ -0,0 +1,116 @@
+<template>
+  <div class="login-setting" :style="style" v-if="show && showLoginRule">
+    <img
+      class="login-setting-img"
+      src="https://cdn.ddjf.com/static/images/nutshell/empty-permission.png"
+    />
+    <div class="login-setting-text">
+      仅可在工作日{{ loginRule.startTime }}-{{ loginRule.endTime }}进行业务操作
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue'
+import { useHttp } from '../api'
+import { useAppKitOptions } from '../../Appkit'
+import { useSafeArea } from '../../shared/composables'
+
+const props = withDefaults(
+  defineProps<{
+    app: string
+    withTabbar?: boolean
+    withNavbar?: boolean
+    show?: boolean
+  }>(),
+  {
+    app: '',
+    withTabbar: false,
+    withNavbar: false,
+    show: true,
+  }
+)
+
+const safeArea = useSafeArea()
+const loginRule = ref<any>({})
+const showLoginRule = ref<boolean>(false)
+
+const style = computed(() => {
+  let str = ''
+  if (props.withTabbar) {
+    str += `bottom: ${safeArea.menuRect.bottom + 5}px;`
+  }
+  if (props.withNavbar) {
+    str += `top: ${safeArea.nav + safeArea.status + 5}px;`
+  }
+  return str
+})
+
+onMounted(() => {
+  checkLoginTimeRule()
+})
+
+// 检验登录时间
+async function checkLoginTimeRule() {
+  const appkitOptions = useAppKitOptions()
+
+  const $http = useHttp()
+  $http
+    .post('/cas/sysUser/checkLoginTimeRule', {
+      appCode: props.app || appkitOptions.app(),
+      tenantId: appkitOptions.tenant(),
+    })
+    .then((result: any) => {
+      if (result === true) return
+
+      getLoginRule()
+      showLoginRule.value = true
+    })
+}
+
+// 查询当前租户登录规则
+async function getLoginRule() {
+  const appkitOptions = useAppKitOptions()
+
+  const $http = useHttp()
+  $http
+    .get('/cas/sysUser/getLoginRule', {
+      appCode: props.app || appkitOptions.app(),
+    })
+    .then((result) => {
+      loginRule.value = result
+
+      emits('show', { startTime: loginRule.value.startTime, endTime: loginRule.value.endTime })
+    })
+}
+
+// 父组件事件
+const emits = defineEmits(['show'])
+</script>
+
+<style lang="scss">
+.login-setting {
+  position: fixed;
+  z-index: 4;
+  left: 12px;
+  top: 10px;
+  bottom: 10px;
+  align-items: center;
+  justify-content: center;
+  width: calc(100% - 24px);
+  background: #ffffff;
+  border-radius: 5px;
+  display: flex;
+  flex-direction: column;
+  &-img {
+    height: 111px;
+    width: 198px;
+  }
+  &-text {
+    margin-top: 10px;
+    color: #353535;
+    opacity: 0.4;
+    font-size: 12px;
+  }
+}
+</style>