af-mobile-client-vue3 1.2.57 → 1.3.1

package/src/locales/zh-CN.json

@@ -1,29 +1,46 @@
 {
-  "menus": {
-    "home": "主页",
-    "profile": "个人中心",
-    "darkMode": "🌗 暗黑模式",
-    "mockGuide": "💿 Mock 指南",
-    "language": "📚 语言",
-    "echartsDemo": "📊 Echarts 演示",
-    "persistPiniaState": "🍍 持久化 Pinia 状态",
-    "404Demo": "🙅 404页 演示",
-    "unocssExample": "🎨 Unocss 示例",
-    "keepAlive": "🧡 KeepAlive 演示",
-    "scrollCache": "📜 滚动缓存 演示",
-    "login": "🔒 用户登录",
-    "register": "用户注册",
+  "navbar": {
+    "Home": "主页",
+    "Profile": "我的",
+    "Mock": "🗂️ Mock",
+    "Charts": "📊 图表",
+    "UnoCSS": "⚡ UnoCSS",
+    "Counter": "🍍 状态持久化",
+    "KeepAlive": "♻️ 页面缓存",
+    "ScrollCache": "📍 滚动缓存",
+    "Login": "🧑‍💻 登录",
+    "Register": "🧑‍💻 注册",
+    "ForgotPassword": "❓ 忘记密码",
+    "Settings": "⚙️ 设置",
+    "404": "⚠️ 404 页面",
+    "Undefined": "🤷 未定义标题"
+  },
+
+  "tabbar": {
+    "home": "首页",
+    "profile": "我的"
+  },
+
+  "home": {
+    "darkMode": "🌗 深色模式",
+    "language": "📚 多语言",
+    "settings": "设置",
+    "examples": "示例"
+  },
+
+  "profile": {
+    "login": "登录",
     "settings": "设置",
-    "basicSettings": "基本设置",
-    "exampleComponents": "示例组件",
-    "forgot-password": "忘记密码"
+    "docs": "文档"
   },
+
   "mock": {
     "fromAsyncData": "来自异步请求的数据",
+    "noData": "暂无数据",
     "pull": "请求",
-    "reset": "清空",
-    "noData": "暂无数据"
+    "reset": "清空"
   },
+
   "charts": {
     "January": "1月",
     "February": "2月",
@@ -32,39 +49,44 @@
     "May": "5月",
     "June": "6月"
   },
-  "layouts": {
-    "home": "首页",
-    "profile": "我的"
+
+  "counter": {
+    "description": "该计数器的状态通过 Pinia 持久化。刷新页面试试看！"
   },
-  "profile": {
-    "login": "登录",
-    "settings": "设置",
-    "docs": "文档"
+
+  "unocss": {
+    "title": "你好, Unocss!",
+    "description": "这是一个简单的 Unocss 使用示例。",
+    "button": "按钮"
   },
+
   "keepAlive": {
     "label": "当前组件将会被缓存"
   },
+
   "scrollCache": {
     "sectionTitle": "段落标题",
     "sectionText": "段落内容段落内容段落内容段落内容段落内容段落内容",
     "finished": "已经到底啦 ~",
     "loading": "加载中..."
   },
+
   "login": {
     "login": "登录",
-    "logout": "退出",
+    "logout": "退出登录",
     "email": "邮箱",
     "password": "密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterPassword": "请输入密码",
-    "sign-up": "还没有账号？点击注册",
-    "forgot-password": "忘记密码？"
+    "signUp": "还没有账号？点击注册",
+    "forgotPassword": "忘记密码？"
   },
-  "forgot-password": {
+
+  "forgotPassword": {
     "email": "邮箱",
     "code": "验证码",
     "password": "密码",
-    "comfirmPassword": "再次输入密码",
+    "confirmPassword": "再次输入密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterCode": "请输入验证码",
     "pleaseEnterPassword": "请输入密码",
@@ -77,12 +99,13 @@
     "sendCodeSuccess": "已发送，验证码为",
     "passwordResetSuccess": "密码重置成功"
   },
+
   "register": {
     "email": "邮箱",
     "code": "验证码",
     "nickname": "昵称",
     "password": "密码",
-    "comfirmPassword": "再次输入密码",
+    "confirmPassword": "再次输入密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterCode": "请输入验证码",
     "pleaseEnterNickname": "请输入昵称",
@@ -96,9 +119,10 @@
     "sendCodeSuccess": "已发送，验证码为",
     "registerSuccess": "注册成功"
   },
+
   "settings": {
     "logout": "退出登录",
     "currentVersion": "当前版本",
-    "comfirmTitle": "确认退出？"
+    "confirmTitle": "确认退出？"
   }
 }

package/src/main.ts

@@ -10,8 +10,6 @@ import 'virtual:uno.css'
 import '@af-mobile-client-vue3/styles/app.less'
 import '@af-mobile-client-vue3/styles/var.less'
 
-// svg icon
-import 'virtual:svg-icons-register'
 // Vant 桌面端适配
 import '@vant/touch-emulator'
 

package/src/router/types.ts

@@ -2,8 +2,6 @@ import type { RouteLocationNormalized } from 'vue-router'
 
 export type EnhancedRouteLocation = RouteLocationNormalized & {
   meta: {
-    level?: number | unknown
-    name?: string
     keepAlive?: boolean
   }
 }

package/src/types/vue-router.d.ts

@@ -2,8 +2,6 @@ declare module 'vue-router' {
   interface RouteMeta {
     /** page title */
     title?: string
-    /** i18n key */
-    i18n?: string
     /** keepalive */
     keepAlive?: boolean
   }

package/src/utils/mobileUtil.ts

@@ -21,9 +21,9 @@ export class mobileUtil {
   static execute(locationParam: Param): any {
     locationParam.callBackMethodName = `mobile_func_${Math.random().toString(36).substring(7)}`
     if (window.__MICRO_APP_ENVIRONMENT__) {
-      console.warn('我在微前端环境中')
+      console.warn('我在微前端环境中');
       // 微前端应用中需要绑定函数到真实的window中
-      window.rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
+      (window as any).rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
     }
     else {
       console.warn('我不在微前端环境中')

package/src/utils/set-page-title.ts

@@ -1,7 +1,5 @@
-import { pageDefaultTitle } from '@af-mobile-client-vue3/types/settings'
+import { appName } from '../constants'
 
-export default function setPageTitle(routerTitle?: any): void {
-  window.document.title = routerTitle
-    ? `${routerTitle} | ${pageDefaultTitle}`
-    : `${pageDefaultTitle}`
+export default function setPageTitle(title?: string): void {
+  window.document.title = title ? `${title} - ${appName}` : appName
 }

package/src/views/common/LoadError.vue

@@ -1,11 +1,10 @@
 <script setup>
-import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 </script>
 
 <template>
   <div class="load_error_main">
     <div class="container">
-      <SvgIcon name="loadError" class="loadError" />
+      <div class="loadError i-svg:loadError" />
     </div>
     <div class="text">
       似乎出了点问题，下拉再试试

package/src/views/common/NotFound.vue

@@ -1,18 +1,17 @@
 <script setup>
-import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 import { Button as VanButton } from 'vant'
 </script>
 
 <template>
   <div class="not_found_main">
     <div class="container">
-      <SvgIcon name="notFound" class="notFound" />
+      <div class="notFound i-svg:notFound" />
     </div>
     <div class="text">
       本来无一物，何处惹尘埃
     </div>
     <div class="button_group">
-      <VanButton type="primary" size="small" @click="$router.replace('/home')">
+      <VanButton type="primary" size="small" @click="$router.replace('/')">
         返回首页
       </VanButton>
     </div>

package/src/views/component/XCellListView/index.vue

@@ -1,147 +1,108 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import { defineOptions, onActivated, onMounted, ref } from 'vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
-defineOptions({ name: 'XCellListView' })
-const configName = ref('ApplyMobileProcessCRUD')
-const serviceName = ref('af-apply')
+// 定义事件
+const emit = defineEmits(['deleteRow'])
+// 访问路由
 const router = useRouter()
-// 删除功能
-function phone(result) {
-  // todo 调用真机进行通话
-}
-// 跳转流程处理
-function action(row) {
-  router.push({ name: 'XFormGroupView', query: { workflowId: row.ab_f_workflow_id, stepId: row.ws_f_step_id } })
+// 获取默认值
+const idKey = ref('o_id')
+
+// 简易crud表单测试
+const configName = ref('lngChargeAuditMobileCRUD')
+const serviceName = ref('af-gaslink')
+
+// 资源权限测试
+// const configName = ref('crud_sources_test')
+// const serviceName = ref('af-system')
+
+// 实际业务测试
+// const configName = ref('lngChargeAuditMobileCRUD')
+// const serviceName = ref('af-gaslink')
+
+// 跳转到详情页面
+// function toDetail(item) {
+//   router.push({
+//     name: 'XCellDetailView',
+//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
+//     query: {
+//       operName: item[operNameKey.value],
+//       method:item[methodKey.value],
+//       requestMethod:item[requestMethodKey.value],
+//       operatorType:item[operatorTypeKey.value],
+//       operUrl:item[operUrlKey.value],
+//       operIp:item[operIpKey.value],
+//       costTime:item[costTimeKey.value],
+//       operTime:item[operTimeKey.value],
+//
+//       title: item[titleKey.value],
+//       businessType: item[businessTypeKey.value],
+//       status:item[statusKey.value]
+//     }
+//   })
+// }
+
+// 跳转到表单——以表单组来渲染纯表单
+function toDetail(item) {
+  router.push({
+    name: 'XFormGroupView',
+    query: {
+      id: item[idKey.value],
+      // id: item.rr_id,
+      // o_id: item.o_id,
+    },
+  })
 }
-// 工作日志
-function worklog(row) {
-  router.push({ name: 'worklog', query: { workflowid: row.ab_f_workflow_id, defname: row.ws_f_name } })
+
+// 新增功能
+// function addOption(totalCount) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: totalCount, openid: totalCount },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '新增',
+//     },
+//   })
+// }
+
+// 修改功能
+// function updateRow(result) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: result.o_id, openid: result.o_id },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '修改',
+//     },
+//   })
+// }
+
+// 删除功能
+function deleteRow(result) {
+  emit('deleteRow', result.o_id)
 }
-onMounted(() => {
-  console.log('初始化页面===')
-})
-onActivated(() => {
-  // 每次回到页面都会触发
-  console.log('activated: 每次回到页面都会触发')
-})
 </script>
 
 <template>
-  <XCellList
-    :config-name="configName"
-    :service-name="serviceName"
-    @phone="phone"
-    @action="action"
-    @worklog="worklog"
-  />
+  <NormalDataLayout id="XCellListView" title="工作计划">
+    <template #layout_content>
+      <XCellList
+        :config-name="configName"
+        :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
+        :id-key="idKey"
+        @to-detail="toDetail"
+        @delete-row="deleteRow"
+      />
+    </template>
+  </NormalDataLayout>
 </template>
 
 <style scoped lang="less">
-.cell-search-after {
-  padding: 0 12px 12px 12px;
-  background-color: #fff;
-  .van-row:first-child {
-    align-items: center;
-    margin-bottom: 8px;
-    padding: 0 2px;
-    h4 {
-      font-size: 1.08rem;
-      font-weight: 600;
-      margin: 0;
-      color: #222;
-      letter-spacing: 1px;
-    }
-    .stat-date-range {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      font-size: 0.92rem;
-      color: #b0b3b8;
-      font-weight: 400;
-      span {
-        margin-left: 4px;
-        font-size: 0.92rem;
-        color: #b0b3b8;
-      }
-      .van-icon {
-        font-size: 1rem;
-        color: #b0b3b8;
-        margin-right: 2px;
-      }
-    }
-  }
-  .van-row:nth-child(2) {
-    margin-top: 8px;
-    // 统计卡片间距由gutter控制
-    .van-col {
-      // 让卡片宽度自适应
-      .stat-card {
-        width: 100%;
-      }
-    }
-  }
-  .stat-card {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-radius: 12px;
-    padding: 6px 0 4px 0; // 压缩高度
-    min-height: 44px; // 压缩高度
-    position: relative;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
-    background: #f7f8fa;
-    .stat-num {
-      font-size: 1.08rem; // 缩小字体
-      font-weight: 600;
-      margin-bottom: 2px;
-    }
-    .stat-label {
-      font-size: 0.82rem; // 缩小字体
-      margin-bottom: 2px;
-    }
-    .stat-icon {
-      position: absolute;
-      top: 6px;
-      right: 8px;
-      font-size: 1rem;
-      opacity: 0.4;
-    }
-  }
-  .stat-total {
-    background: #f0f5ff;
-    color: #2f54eb;
-    .stat-num,
-    .stat-label {
-      color: #2f54eb;
-    }
-    .stat-icon {
-      color: #2f54eb;
-    }
-  }
-  .stat-done {
-    background: #e6fffb;
-    color: #13c2c2;
-    .stat-num,
-    .stat-label {
-      color: #13c2c2;
-    }
-    .stat-icon {
-      color: #13c2c2;
-    }
-  }
-  .stat-processing {
-    background: #f9f0ff;
-    color: #b37feb;
-    .stat-num,
-    .stat-label {
-      color: #b37feb;
-    }
-    .stat-icon {
-      color: #b37feb;
-    }
-  }
-}
 </style>

package/src/views/component/XFormGroupView/index.vue

@@ -1,14 +1,13 @@
 <script setup lang="ts">
 import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
 // 纯表单
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
+const configName = ref('form_check_test')
+const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
@@ -22,15 +21,11 @@ const formGroup = ref(null)
 const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
-  showDialog({ message: '提交成功' })
-  history.back()
-}
-const myXForm = ref([])
-function setRef(value: any) {
-  console.log('myXForm', myXForm)
-  formGroup.value.setRef(myXForm.value)
-  console.log(formGroup)
+  showDialog({ message: '提交成功' }).then(() => {
+    history.back()
+  })
 }
+
 // 表单组——数据
 // function initComponents () {
 //   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
@@ -73,11 +68,7 @@ function setRef(value: any) {
         :group-form-data="formData"
         mode="新增"
         @submit="submit"
-      >
-<!--        <template #device="{ setRef, removeRef, item, formData }">
-          <XFormView :setRef="setRef" :formGroupName="'myXForm'"/>
-        </template>-->
-      </XFormGroup>
+      />
     </template>
   </NormalDataLayout>
 </template>

package/src/views/component/XFormView/index.vue

@@ -1,105 +1,25 @@
 <script setup lang="ts">
-// 组件顶部功能说明：本组件为表单视图，支持通过 setRef 注册自身到父组件
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import { post } from '@af-mobile-client-vue3/services/restTools'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import dayjs from 'dayjs/esm/index'
-import { showFailToast, showToast } from 'vant'
-import {computed, defineExpose, defineProps, onMounted, onUnmounted, ref} from 'vue'
-import { useRoute } from 'vue-router'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { ref } from 'vue'
 
-const props = withDefaults(defineProps<{
-  setRef?: (refValue: any) => void
-  removeRef?: (refValue: any) => void
-  formGroupName?: string
-}>(), {
-  setRef: () => {},
-  removeRef: () => {},
-  formGroupName: '',
-})
-const configName = ref('mobile_OtherChargeCancelForm')
-const serviceName = ref('af-apply')
-const route = useRoute()
-const userInfo = useUserStore().getUserInfo()
-const workflowId = computed(() => route.query.workflowid)
-const formData = ref({
-  f_cancel_reason: '1111',
-})
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
 
-const xFormRef = ref()
-const aaa = ref({})
-function submit(res: any) {
-  if (Number(res.charge_money) > Number(res.surplus_money)) {
-    showFailToast('收费金额不能大于未结金额！！')
-    return
-  }
-  const saveData = {
-    f_payment_type: res.payment_type,
-    f_charge_money: res.charge_money,
-    f_amount_words: res.amount_words,
-    f_payment_method: res.payment_method,
-    f_actual_date: res.actual_date,
-    f_charge_status: '有效',
-    f_workflow_id: workflowId.value,
-    f_charge_collectors: userInfo.f_operator,
-    f_charge_collectors_id: userInfo.f_operatorid,
-    f_charge_date: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    f_filialeid: userInfo.f_orgid,
-    f_filiale: userInfo.f_orgname,
-  }
-  post('api/af-apply/entity/save/t_charge_record', saveData).then((_res) => {
-    showToast('提交成功！')
-    history.back()
-  })
-}
-function init() {
-  // runLogic('getApplyBusinessrecode', { f_workflow_id: 854 }, 'af-apply').then((res) => {
-  //   // formData.value = res
-  //   console.log('res==', res)
-  // }).catch((err) => {
-  //
-  // })
-  setTimeout(() => {
-    Object.assign(formData.value, { f_cancel_reason: '2222222' })
-  }, 5000)
-}
-function validate() {
-  // 调用 XForm 的 validate 方法
-  return xFormRef.value?.validate?.() ?? Promise.resolve()
-}
-function getFormData() {
-  console.log('自定义表单=====', xFormRef.value.getFormData())
-  // 获取 XForm 的表单数据
-  return xFormRef.value?.getFormData?.() ?? {}
-}
-onMounted(() => {
-  init()
-})
-const exposeObj = { validate, getFormData, init, formGroupName: props.formGroupName }
-defineExpose(exposeObj)
-onMounted(() => {
-  props.setRef && props.setRef(exposeObj)
-})
-onUnmounted(() => {
-  props.removeRef && props.removeRef(exposeObj)
-})
-// watch(() => props.formData, (newVal) => {
-//   console.log('变更了===', newVal)
-//   if (newVal) {
-//     Object.assign(form, newVal)
-//   }
-// })
+const formGroupAddConstruction = ref(null)
 </script>
 
 <template>
-  <XForm
-    ref="xFormRef"
-    mode="新增"
-    :config-name="configName"
-    :service-name="serviceName"
-    :form-data="formData"
-    @on-submit="submit"
-  />
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <XForm
+        ref="formGroupAddConstruction"
+        mode="新增"
+        :config-name="configName"
+        :service-name="serviceName"
+      />
+    </template>
+  </NormalDataLayout>
 </template>
 
 <style scoped lang="less">

package/src/views/user/login/LoginForm.vue

@@ -268,7 +268,7 @@ onMounted(() => {
     })
   }
   catch (e) {
-    console.debug('读取本地缓存失败', e)
+    console.warn('读取本地缓存失败', e)
     // 未拿到跳过
   }
 })
@@ -317,9 +317,9 @@ onMounted(() => {
             <span>记住密码</span>
           </div>
         </VanCol>
-        <VanCol>
+        <!--        <VanCol>
           <a class="extra_setting_for_reset_password" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">忘记密码?</a>
-        </VanCol>
+        </VanCol> -->
       </VanRow>
       <VanButton class="login_btn btn" type="primary" block native-type="submit" :loading="loading">
         登 录