Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/biz/attr/index.vue

src/router/modules/biz.ts

@@ -25,7 +25,7 @@ const routes: RouteRecordRaw[] = [
         },
       },
       {
-        path: '/attr/:bizId/:objectId',
+        path: 'attr/:bizId/:objectId',
         name: 'bizObjectEdit',
         component: () => import('@/views/biz/attr/index.vue'),
         meta: {

src/views/biz/attr/index.vue

@@ -163,10 +163,10 @@ function onCancel() {
 // 返回列表页
 function goBack() {
   if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.mergeTabsBy !== 'activeMenu') {
-    tabbar.close({ name: 'model' })
+    tabbar.close({ name: 'biz_object_index' })
   }
   else {
-    router.push({ name: 'model' })
+    router.push({ name: 'biz_object_index' })
   }
 }
 </script>
@@ -302,18 +302,16 @@ function goBack() {
                 />
               </template>
             </el-table-column>
-
-            <el-table-column label="小数位数" width="130">
+            <el-table-column label="长度" width="130">
               <template #default="scope">
                 <el-input-number
                   v-model="scope.row.attrDecimals" style="width:100px"
-                  :min="1"
+                  :min="0"
                   controls-position="right"
                   size="large"
                 />
               </template>
             </el-table-column>
-
             <el-table-column label="是否为空" width="90">
               <template #default="scope">
                 <el-checkbox v-model="scope.row.isNotNull" :true-label="1" :false-label="0">

src/views/biz/object/components/Biz.vue

@@ -88,15 +88,15 @@ defineExpose({
 
 <template>
   <div>
-    <el-dialog v-biz="state.dialogVisible" :title="state.title" width="600px" :close-on-click-modal="false" append-to-body destroy-on-close>
+    <el-dialog v-model="state.dialogVisible" :title="state.title" width="600px" :close-on-click-modal="false" append-to-body destroy-on-close>
       <div v-loading="state.loading">
-        <el-form ref="formRef" :biz="state.formData" :rules="formRules" label-width="120px" label-suffix="：">
+        <el-form ref="formRef" :model="state.formData" :rules="formRules" label-width="120px" label-suffix="：">
           <el-form-item label="业务名称" prop="bizTitle">
-            <el-input v-biz="state.formData.bizTitle" placeholder="请输入标题" />
+            <el-input v-model="state.formData.bizTitle" placeholder="请输入标题" />
           </el-form-item>
 
           <el-form-item label="简要说明" prop="bizDesc">
-            <el-input v-biz="state.formData.bizDesc" type="textarea" rows="10" placeholder="请输入标题" />
+            <el-input v-model="state.formData.bizDesc" type="textarea" rows="10" placeholder="请输入标题" />
           </el-form-item>
         </el-form>
       </div>

src/views/biz/object/index.vue

@@ -48,7 +48,7 @@ const getObjectData = async () => {
   const curBizId = state.curBizId
   if (curBizId > 0) {
     state.loading = true
-    const { data } = await getObjectByList({ modelId: curBizId })
+    const { data } = await getObjectByList({ bizId: curBizId })
     state.objectList = data
     state.loading = false
   }
@@ -223,7 +223,7 @@ const onObjectDelete = (row: any) => {
       <LayoutContainer left-side-width="300px" hide-left-side-toggle>
         <template #leftSide>
           <el-scrollbar class="tree">
-            <ElTree ref="leftTreeRef" :data="state.treeData" default-expand-all node-key="modelId" @node-click="onTreeNodeClick">
+            <ElTree ref="leftTreeRef" :data="state.treeData" default-expand-all node-key="bizId" @node-click="onTreeNodeClick">
               <template #default="{ node, data }">
                 <div class="custom-tree-node">
                   <div class="label" :title="node.label">

src/views/model/attr/index.vue

@@ -311,7 +311,7 @@ function goBack() {
               <template #default="scope">
                 <el-input-number
                   v-model="scope.row.attrDecimals" style="width:100px"
-                  :min="1"
+                  :min="0"
                   controls-position="right"
                   size="large"
                 />