From a1f34f14ecef8185bea48e50429855133c673e9a Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Fri, 8 Sep 2023 19:53:38 +0800
Subject: [PATCH] Revert "feat: add import object demo"

This reverts commit b853da18b920d653e318b994b355b683fcaf4c44.

Revert "feat(uniCloud): remove duplicated showModal"

This reverts commit 57d4202df3f79dbcdcaf2dfbfcfbda06c4edcf07.
---
 pages.json                                    |   6 --
 pages/API/call-function/call-function.uvue    |   2 +-
 pages/API/import-object/import-object.uvue    | 100 ------------------
 pages/tabBar/API.uvue                         |   4 -
 .../cloudfunctions/todo/index.obj.js          |  39 -------
 .../cloudfunctions/todo/package.json          |   6 --
 6 files changed, 1 insertion(+), 156 deletions(-)
 delete mode 100644 pages/API/import-object/import-object.uvue
 delete mode 100644 uniCloud-aliyun/cloudfunctions/todo/index.obj.js
 delete mode 100644 uniCloud-aliyun/cloudfunctions/todo/package.json

diff --git a/pages.json b/pages.json
index cd4197ef..910a1da3 100644
--- a/pages.json
+++ b/pages.json
@@ -672,12 +672,6 @@
         "navigationBarTitleText": ""
       }
     },
-    {
-      "path": "pages/API/import-object/import-object",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
     {
       "path": "pages/API/get-system-info/get-system-info",
       "style": {
diff --git a/pages/API/call-function/call-function.uvue b/pages/API/call-function/call-function.uvue
index c40f6ab2..3756652e 100644
--- a/pages/API/call-function/call-function.uvue
+++ b/pages/API/call-function/call-function.uvue
@@ -18,7 +18,7 @@
   export default {
     data() {
       return {
-        title: '请求云函数'
+        title: 'uniCloud.callFunction'
       }
     },
     onLoad() {
diff --git a/pages/API/import-object/import-object.uvue b/pages/API/import-object/import-object.uvue
deleted file mode 100644
index 0b1d307a..00000000
--- a/pages/API/import-object/import-object.uvue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-  <!-- #ifdef APP -->
-  <scroll-view style="flex:1">
-    <!-- #endif -->
-    <view>
-      <page-head :title="title"></page-head>
-      <view class="uni-padding-wrap uni-common-mt">
-        <view class="uni-btn-v uni-common-mt">
-          <button type="primary" @tap="addTodo">添加Todo</button>
-        </view>
-        <view class="uni-btn-v uni-common-mt">
-          <button type="primary" @tap="randomFail">随机触发失败重试</button>
-        </view>
-        <view class="uni-btn-v uni-common-mt">
-          <button type="primary" @tap="fail">云对象失败调用</button>
-        </view>
-        <view class="uni-btn-v uni-common-mt">
-          <button type="primary" @tap="success">云对象成功调用</button>
-        </view>
-      </view>
-    </view>
-    <!-- #ifdef APP -->
-  </scroll-view>
-  <!-- #endif -->
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        title: '请求云对象'
-      }
-    },
-    methods: {
-      addTodo() {
-        const todo = uniCloud.importObject('todo')
-        const title = '学习编程'
-        const content = '熟悉uts语法'
-        todo.add(title, content).then<void>((res: UTSJSONObject) : void => {
-          uni.showModal({
-            title: '错误',
-            content: res['showMessage'] as string,
-            showCancel: false
-          })
-        }).catch<void>((err : any | null) : void => {
-          const error = err as UniCloudError
-          console.error(error)
-        })
-      },
-      randomFail() {
-        const todoObj = uniCloud.importObject('todo', {
-          errorOptions: {
-            retry: true
-          }
-        })
-        todoObj.randomFail().then<void>((res: UTSJSONObject) : void => {
-          uni.showModal({
-            title: '错误',
-            content: res['showMessage'] as string,
-            showCancel: false
-          })
-        }).catch<void>((err : any | null) : void => {
-          const error = err as UniCloudError
-          console.error(error)
-        })
-      },
-      fail() {
-        const todo = uniCloud.importObject('todo')
-        todo.fail().then<void>((res: UTSJSONObject) : void => {
-          uni.showModal({
-            title: '错误',
-            content: 'todo.fail应调用失败，此处错误的触发了成功回调',
-            showCancel: false
-          })
-          console.log('todo.fail: ', res);
-        }).catch<void>((err : any | null) : void => {
-          const error = err as UniCloudError
-          console.error(error)
-        })
-      },
-      success() {
-        const todo = uniCloud.importObject('todo')
-        todo.success().then<void>((res: UTSJSONObject) : void => {
-          uni.showModal({
-            title: '错误',
-            content: res['showMessage'] as string,
-            showCancel: false
-          })
-        }).catch<void>((err : any | null) : void => {
-          const error = err as UniCloudError
-          console.error(error)
-        })
-      }
-    }
-  }
-</script>
-
-<style>
-
-</style>
diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue
index 57869cfc..e3f45999 100644
--- a/pages/tabBar/API.uvue
+++ b/pages/tabBar/API.uvue
@@ -385,10 +385,6 @@
                 name: '云函数',
                 url: 'call-function',
               },
-              {
-                name: '云对象',
-                url: 'import-object',
-              },
             ] as Page[],
           },
           /* {
diff --git a/uniCloud-aliyun/cloudfunctions/todo/index.obj.js b/uniCloud-aliyun/cloudfunctions/todo/index.obj.js
deleted file mode 100644
index 0f33ab3d..00000000
--- a/uniCloud-aliyun/cloudfunctions/todo/index.obj.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// 云对象教程: https://uniapp.dcloud.net.cn/uniCloud/cloud-obj
-// jsdoc语法提示教程：https://ask.dcloud.net.cn/docs/#//ask.dcloud.net.cn/article/129
-module.exports = {
-  async add(title, content) {
-    console.log(title, content)
-    return {
-      showMessage: `Todo added, title: ${title}, content: ${content}`
-    }
-  },
-  async randomFail() {
-    const random = Math.random()
-    console.log(random);
-    if (random > 0.5) {
-      return {
-        errCode: 'RANDOM_FAIL',
-        errMsg: 'todo.randomFail failed'
-      }
-    } else {
-      return {
-        errCode: 0,
-        errMsg: '',
-        showMessage: 'todo.randomFail successed'
-      }
-    }
-  },
-  async fail() {
-    return {
-      errCode: 'TEST_ERROR_CODE',
-      errMsg: 'todo.fail failed',
-    }
-  },
-  async success() {
-    return {
-      errCode: 0,
-      errMsg: '',
-      showMessage: 'todo.success successed'
-    }
-  }
-}
diff --git a/uniCloud-aliyun/cloudfunctions/todo/package.json b/uniCloud-aliyun/cloudfunctions/todo/package.json
deleted file mode 100644
index 217bc85c..00000000
--- a/uniCloud-aliyun/cloudfunctions/todo/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "todo",
-  "dependencies": {},
-  "extensions": {
-  }
-}
\ No newline at end of file
-- 
GitLab